add 消息类型 文件

nb-service/iot-service/src/main/java/com/nb/mq/entity/PcPumpEntity.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author fanfan
@@ -50,8 +50,8 @@ public class PcPumpEntity implements Serializable {
     @ApiModelProperty(value = "自控量")
     private BigDecimal SelfQuantity;
 
-    @ApiModelProperty(value = "锁定时间")
-    private Integer LockTime;
+    @ApiModelProperty(value = "锁定时间，即自控锁时")
+    private BigDecimal LockTime;
 
     @ApiModelProperty(value = "已输入量")
     private BigDecimal InputQuantity;
@@ -117,7 +117,7 @@ public class PcPumpEntity implements Serializable {
     @ApiModelProperty(value = "镇痛泵状态BUF")
     private Integer BUFState5;
 
-    @ApiModelProperty(value = "镇痛泵状态BUF")
+    @ApiModelProperty(value = "电量")
     private Integer BUFState6;
 
     @ApiModelProperty(value = "镇痛泵状态BUF")
@@ -162,6 +162,20 @@ public class PcPumpEntity implements Serializable {
 
     public BusDeviceRunningEntity toDevice(){
         BusDeviceRunningEntity result = new BusDeviceRunningEntity();
+        DeviceTypeEnum deviceType=DeviceTypeEnum.other;
+        switch ( this.getSysProduct_ID()){
+            case "1":
+                deviceType=DeviceTypeEnum.continuous;
+                break;
+            case "2":
+                deviceType=DeviceTypeEnum.pulse;
+                break;
+            case "3":
+                deviceType=DeviceTypeEnum.intelligent;
+                break;
+            default:break;
+        }
+
         result.setUploadTime(new Date());
         result.setDeviceId(this.getPumpCode());
         //todo
@@ -177,18 +191,15 @@ public class PcPumpEntity implements Serializable {
         result.setFirstDose(this.getFirstQuantity());
         result.setMaxDose(this.getMaxQuantity());
         result.setAppendDose(this.getSingleQuantity());
-        //todo 自控锁时
-//        result.setSelfControlLockTime(this.getFirstLockTime());
+        result.setElectricQuantity(this.getBUFState6());
+        result.setSelfControlLockTime(this.getLockTime());
         result.setContinueDose(this.getContinueQuantity());
-        //todo
-        result.setType(DeviceTypeEnum.other);
+        result.setType(deviceType);
 
         result.setPcaInvalidCount(this.getFalseNum());
         result.setPcaValidCount(this.getTrueNum());
         result.setPcaTotalCount(this.getAllCount());
-
-//        result.setElectricQuantity();
-//        result.setRunState();
+        //        result.setRunState();
 //        result.setAlarm();
         return result;