浏览代码

fix 低电量报警改为电量耗尽

18339543638 3 年之前
父节点
当前提交
3f6d8dd96c

+ 6 - 2
nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -203,6 +203,9 @@ public class DeviceInfoListener implements IIotMsgHandler {
             if(DeviceTypeEnum.intelligent.equals(device.getType())
                     &&FlowStatusEnum.None==device.getWarnFlow()
                     && Boolean.FALSE.equals(device.isNewInfusion())){
+                boolean flowLimit = deviceOperator.isFlowLimit();
+                //同一输注过程中,只有减档才能够消除加档受限
+
                 BigDecimal lastContinueDose = deviceOperator.getContinueDose();
                 if(lastContinueDose!=null){
                     if(CompareUtil.compare(device.getContinueDose(),lastContinueDose)>0){
@@ -211,10 +214,11 @@ public class DeviceInfoListener implements IIotMsgHandler {
                     }else if(CompareUtil.compare(device.getContinueDose(),lastContinueDose)<0){
                         log.info("消息【{}】,设备【{}】,当前流速【{}】,上一状态流速【{}】,减档",device.getMsgId(),device.getDeviceId(),device.getContinueDose(),lastContinueDose);
                         device.setWarnFlow(FlowStatusEnum.Down);
-                    }else {
-                        device.setWarnFlow(FlowStatusEnum.None);
                     }
                 }
+                if(!FlowStatusEnum.Down.equals(device.getWarnFlow())){
+                    device.setWarnFlow(flowLimit?FlowStatusEnum.Limited:device.getWarnFlow());
+                }
             }
             cacheOperation.add(()->{
                 deviceOperator.setContinueDose(device.getContinueDose());