新添加泵列表bug修复

pump-web/src/main/java/com/tuoren/web/layer/service/impl/BusPumpServiceImpl.java

@@ -3,6 +3,7 @@ package com.tuoren.web.layer.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -199,25 +200,31 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
         //特殊处理报警
         // 输液结束 未装药盒 堵塞 极限 电量耗尽  气泡 输注总量 电机失控 机械故障
         String[] alarmList = {"输液结束","未装药盒", "堵塞", "极限", "电量耗尽", "气泡", "输注总量", "电机失控", "机械故障"};
-        if(Boolean.TRUE.equals(pumpParam.getAlarm())){
-            pumpParam.setAlarmList(Arrays.asList(alarmList));
-        }else if(Boolean.FALSE.equals(pumpParam.getAlarm())){
-            pumpParam.setAlarmList(Arrays.asList(alarmList));
-        }
+         if(ObjectUtil.isNotEmpty(pumpParam.getAlarm())){
+             if(Boolean.TRUE.equals(pumpParam.getAlarm())){
+                 pumpParam.setAlarmList(Arrays.asList(alarmList));
+             }else if(Boolean.FALSE.equals(pumpParam.getAlarm())){
+                 pumpParam.setAlarmList(Arrays.asList(alarmList));
+             }
+         }
         //特殊处理提示
         //镇痛不足
         String[] tipList = {"镇痛不足"};
-        if(Boolean.TRUE.equals(pumpParam.getTip())){
-            pumpParam.setTipList(Arrays.asList(tipList));
-        }else if(Boolean.FALSE.equals(pumpParam.getTip())){
-            pumpParam.setTipList(Arrays.asList(tipList));
+        if(ObjectUtil.isNotEmpty(pumpParam.getTip())){
+            if(Boolean.TRUE.equals(pumpParam.getTip())){
+                pumpParam.setTipList(Arrays.asList(tipList));
+            }else if(Boolean.FALSE.equals(pumpParam.getTip())){
+                pumpParam.setTipList(Arrays.asList(tipList));
+            }
         }
         //特殊处理是否在服务区
-        if(pumpParam.getRunStatus() == 5){
-            pumpParam.setRunStatus(null);
-            pumpParam.setNoSignal(true);
-        }else{
-            pumpParam.setNoSignal(false);
+        if(ObjectUtil.isNotEmpty(pumpParam.getRunStatus())){
+            if(pumpParam.getRunStatus() == 5){
+                pumpParam.setRunStatus(null);
+                pumpParam.setNoSignal(true);
+            }else{
+                pumpParam.setNoSignal(false);
+            }
         }
         IPage<PumpVo> iPage = new Page<>(pumpParam.getPageNo(), pumpParam.getPageSize());
         List<PumpVo> pumpVos = this.getBaseMapper().queryPumpInfoNew(

pump-web/src/main/java/com/tuoren/web/layer/vo/PumpNewParam.java

@@ -81,6 +81,9 @@ public class PumpNewParam {
     @ApiModelProperty(value = "提示",hidden = true)
     private List<String> tipList;
 
+    @ApiModelProperty(value = "是否在服务区",hidden = true)
+    private Boolean noSignal;
+
     public void setTimeRange(List<String> timeRange) {
         this.timeRange = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(timeRange)) {