浏览代码

2022-09-21 添加查询预案的时候,是否有疏散路线。

zhuchangxue 3 年之前
父节点
当前提交
61da1755e8

+ 12 - 1
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabRiskPlanAbnormalGroupVO.java

@@ -44,7 +44,10 @@ public class LabRiskPlanAbnormalGroupVO extends LabRiskPlanAbnormalGroup {
     @ApiModelProperty(value = "预案id")
     private Long riskPlanId;
 
-   private List<LabHardware> hardwareList;
+    @ApiModelProperty(value = "是否有疏散线路")
+    private Boolean whetherRoute;
+
+    private List<LabHardware> hardwareList;
 
     public String getSubjectName() {
         return subjectName;
@@ -125,4 +128,12 @@ public class LabRiskPlanAbnormalGroupVO extends LabRiskPlanAbnormalGroup {
     public void setRiskPlanId(Long riskPlanId) {
         this.riskPlanId = riskPlanId;
     }
+
+    public Boolean getWhetherRoute() {
+        return whetherRoute;
+    }
+
+    public void setWhetherRoute(Boolean whetherRoute) {
+        this.whetherRoute = whetherRoute;
+    }
 }

+ 13 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalGroupServiceImpl.java

@@ -13,6 +13,7 @@ import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalGroupVO;
 import com.zd.laboratory.mapper.LabHardwareMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalGroupMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalLogMapper;
+import com.zd.laboratory.service.ILabExitLineService;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalGroupService;
 import com.zd.system.api.laboratory.domain.SensorFunctionStatus;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,9 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
     @Autowired
     private LabRiskPlanAbnormalLogMapper labRiskPlanAbnormalLogMapper;
 
+    @Autowired
+    private ILabExitLineService labExitLineService;
+
 
     @Override
 //    @DataScope(deptAlias = "t")
@@ -73,6 +77,15 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
             labHardware.setType(HardwareTypeEnum.SWITCH);
             List<LabHardware> hardwareList = labHardwareMapper.selectLabHardwareListBySubject(labHardware);
             a.setHardwareList(hardwareList);
+
+            //todo 这里查看预案下是不是有疏散线路,返回true和false
+            try{
+                labExitLineService.getRoute(a.getSubjectId(),0);
+                a.setWhetherRoute(true);
+            }catch (Exception e){
+                a.setWhetherRoute(false);
+            }
+
         });
         return groupList;
     }