Merge remote-tracking branch 'origin/dev' into dev

coffee-system/src/main/java/com/coffee/aliyun/AliyunConsumerGroupService.java

@@ -147,7 +147,7 @@ public class AliyunConsumerGroupService {
                 // 设备属性集合
                 Items items = new Items(content.getJSONObject("items"));
                 BusDeviceRunningEntity deviceRunning = new BusDeviceRunningEntity();
-                deviceRunning.setFiledsByItems(deviceName,items);
+                deviceRunning.updateFieldsByItems(deviceName,items);
                 // 发布事件
                 SpringUtil.publishEvent(new DeviceInfoEvent(this,deviceRunning,deviceName));
 

coffee-system/src/main/java/com/coffee/aliyun/utils/DeviceAlarmUtils.java

@@ -11,26 +11,37 @@ import com.coffee.bus.enums.DeviceAlarmEnum;
 public class DeviceAlarmUtils {
     public static DeviceAlarmEnum getAlarm(Integer i){
         if (i == 0){
+            // 无报警
             return DeviceAlarmEnum.None;
         }else if (i == 1){
+            // 气泡无液报警
             return DeviceAlarmEnum.Bubble;
         }else if (i == 2){
+            // 堵塞
             return DeviceAlarmEnum.Jam;
         }else if (i == 3){
-            return DeviceAlarmEnum.NotBox;
-        }else if (i == 4){
+            // 输入总量
             return DeviceAlarmEnum.InfusionMax;
-        }else if (i == 5){
+        }else if (i == 4){
+            // 极限量
             return DeviceAlarmEnum.Limit;
+        }else if (i == 5){
+            // 电量耗尽
+            return DeviceAlarmEnum.LowBattery;
         }else if (i == 6){
+            // 输液结束
             return DeviceAlarmEnum.Finished;
         }else if (i == 7){
-            return DeviceAlarmEnum.LowBattery;
-        }else if (i == 8){
+            // 电机失控
             return DeviceAlarmEnum.OutOfControl;
-        }else if (i == 9){
+        }else if (i == 8){
+            // 机械故障
             return DeviceAlarmEnum.Machine;
+        }else if (i == 9){
+            // 未装药盒
+            return DeviceAlarmEnum.NotBox;
         }else {
+
             return DeviceAlarmEnum.Finished;
         }
     }

coffee-system/src/main/java/com/coffee/aliyun/utils/Items.java

@@ -37,4 +37,8 @@ public class Items {
         return items.getJSONObject(param.getParam()).getBigDecimal(VALUE);
     }
 
+    public Boolean getBoolean(PumpParams param){
+        return items.getJSONObject(param.getParam()).getBoolean(VALUE);
+    }
+
 }

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceRunningEntity.java

@@ -105,7 +105,7 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
      * @param deviceName
      * @param items
      */
-    public void setFiledsByItems(String deviceName, Items items) {
+    public void updateFieldsByItems(String deviceName, Items items) {
         // 属性上传时间
         this.setUploadTime(items.getDate());
 
@@ -131,6 +131,12 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
         this.setRunState(DeviceRunStatusUtils.getRunStatus(items.getInteger(PumpParams.runStatus)));
         this.setAlarm(DeviceAlarmUtils.getAlarm(items.getInteger(PumpParams.alarmStatus)));
         // 预报
+        // 镇痛不足预报
+        this.setWarnAnalgesicPoor(items.getBoolean(PumpParams.warnAnalgesicPoor));
+        // 电量偏低预报
+        this.setWarnLowBattery(items.getBoolean(PumpParams.warnLowBattery));
+        // 输液将结束预报
+        this.setWarnWillFinished(items.getBoolean(PumpParams.warnWillFinished));
     }
 
     /**