泵列表不在服务区特殊处理

pump-web/src/main/java/com/tuoren/web/layer/controller/BusPumpController.java

@@ -1,34 +1,29 @@
 package com.tuoren.web.layer.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.tuoren.common.api.CommonResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
+import com.tuoren.common.api.CommonResult;
 import com.tuoren.web.layer.d0.PumpRemoveRequestDTO;
-import com.tuoren.web.layer.vo.InfusionListParam;
-import com.tuoren.web.layer.vo.PumpNewParam;
-import com.tuoren.web.layer.vo.PumpParam;
+import com.tuoren.web.layer.d0.PumpVo;
 import com.tuoren.web.layer.entity.BusPatientEntity;
+import com.tuoren.web.layer.entity.BusPumpEntity;
 import com.tuoren.web.layer.entity.SysUserEntity;
 import com.tuoren.web.layer.service.IBusPatientService;
+import com.tuoren.web.layer.service.IBusPumpService;
 import com.tuoren.web.layer.service.ISysUserService;
-import com.tuoren.web.layer.d0.PumpVo;
+import com.tuoren.web.layer.vo.InfusionListParam;
+import com.tuoren.web.layer.vo.PumpNewParam;
+import com.tuoren.web.layer.vo.PumpParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.tuoren.web.layer.service.IBusPumpService;
-import com.tuoren.web.layer.entity.BusPumpEntity;
-
 import java.io.Serializable;
 import java.util.List;
 
-import org.springframework.web.bind.annotation.RestController;
-
 /**
  * <p>
  *  前端控制器

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

@@ -212,6 +212,13 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
         }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);
+        }
         IPage<PumpVo> iPage = new Page<>(pumpParam.getPageNo(), pumpParam.getPageSize());
         List<PumpVo> pumpVos = this.getBaseMapper().queryPumpInfoNew(
                 iPage,

pump-web/src/main/resources/mapper/BusPumpEntityMapper.xml

@@ -348,6 +348,9 @@
             <if test="pumpParam.runStatus != null">
                 AND result.run_state = #{pumpParam.runStatus}
             </if>
+            <if test="pumpParam.noSignal != null">
+                AND result.no_signal = #{pumpParam.noSignal}
+            </if>
             <if test="pumpParam.alarm != null and pumpParam.alarm">
                 AND result.view_state in
                 <foreach item="item" collection="pumpParam.alarmList" separator="," open="(" close=")">