电源开关查询灭火字段

通风橱查询字段

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/vo/HardwareCVO.java

@@ -35,6 +35,11 @@ public class HardwareCVO extends BaseHardware {
     @Deprecated
     List<FunctionStatus> functionStatusList;
 
+    @ApiModelProperty(value = "一体机类型")
+    private Integer pcType;
+
+    @ApiModelProperty(value = "是否灭火主机")
+    private Integer isPcfire;
     /**
      * 设备类型
      *
@@ -77,4 +82,20 @@ public class HardwareCVO extends BaseHardware {
     public void setHardwareTypeEnum(HardwareTypeEnum hardwareTypeEnum) {
         this.hardwareTypeEnum = hardwareTypeEnum;
     }
+
+    public Integer getPcType() {
+        return pcType;
+    }
+
+    public void setPcType(Integer pcType) {
+        this.pcType = pcType;
+    }
+
+    public Integer getIsPcfire() {
+        return isPcfire;
+    }
+
+    public void setIsPcfire(Integer isPcfire) {
+        this.isPcfire = isPcfire;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -1,5 +1,7 @@
 package com.zd.laboratory.controller;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.TimeInterval;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -356,6 +358,8 @@ public class LabRiskPlanController extends BaseController {
     @PostMapping("/closeRiskPlan")
     public ResultData closeRiskPlan(@RequestBody LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup) {
         try {
+            TimeInterval timer = DateUtil.timer();
+            logger.info("开始进入手动关闭预案");
             LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = new LabRiskPlanAbnormalLog();
             labRiskPlanAbnormalLog.setGroupId(labRiskPlanAbnormalGroup.getId());
             List<LabRiskPlanAbnormalLog> logList = labRiskPlanAbnormalLogService.selectLabRiskPlanAbnormalLogOrderByList(labRiskPlanAbnormalLog);
@@ -369,6 +373,8 @@ public class LabRiskPlanController extends BaseController {
                 //关闭预案
                 labRiskPlanService.closeRiskPlan(subFunction);
             });
+            long interval = timer.interval();
+            logger.info("开始执行花费时间={}",interval);
             return ResultData.success(1);
         }catch (Exception e){
             e.printStackTrace();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -1347,6 +1347,13 @@ public class LabSubjectManagerService {
         hardware.setHardwareNUM(a.getHardwareNum());
         //默认不在线
         hardware.setSwitchEnums(ControlEntity.SwitchEnums.NO_ONLINE);
+        //通风设备
+        if(a.getType().equals(HardwareTypeEnum.AI_VENTILATION)){
+            hardware.setPcType(a.getPcType());
+        }
+        if(a.getType().equals(HardwareTypeEnum.SWITCH)){
+            hardware.setIsPcfire(a.getIsPcfire());
+        }
         //初始化开关状态 (开关类型)
         if (a.getHardwareType() == 2) {
             Integer code=redisService.getCacheObject(CacheConstants.RELAY_STATUS_KEY+a.getId());

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabHardwareMapper.xml

@@ -9,7 +9,7 @@
         <result property="name" column="name"/>
         <result property="factory" column="factory"/>
         <result property="type" column="type" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
-        <result property="pcType" column="pcType"/>
+        <result property="pcType" column="pc_type"/>
         <result property="macAdd" column="mac_add"/>
         <result property="subjectId" column="subject_id"/>
         <result property="deptId" column="dept_id"/>