过滤通风橱

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

@@ -3,7 +3,6 @@ package com.zd.laboratory.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.chemical.api.fegin.RemoteChemicalAlarmService;
@@ -19,10 +18,8 @@ import com.zd.laboratory.api.vo.HardwareCVO;
 import com.zd.laboratory.api.vo.LabSubClassVO;
 import com.zd.laboratory.api.vo.SenseValVO;
 import com.zd.laboratory.config.HardwareFunctionStatusConfig;
-import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.*;
 import com.zd.laboratory.domain.dto.LabSubListQuery;
-import com.zd.laboratory.domain.vo.LabSubjectVO;
 import com.zd.laboratory.domain.vo.*;
 import com.zd.laboratory.mapper.*;
 import com.zd.laboratory.mqtt.entiy.EquipmentStatus;
@@ -147,12 +144,15 @@ public class LabSubjectManagerService {
         if (labHardware.getBit() == null) {
             logger.error("硬件不存在或未关联继电器！id：{},名称:{}", labHardware.getId(), labHardware.getName());
             return ResultData.fail(StrUtil.format("未关联继电器位！id：{}，名称：{}", labHardware.getId(), labHardware.getName()));
-
         }
         if(labHardware.getIsPcfire() == 1){
             logger.error("一键灭火设备不进行开关操作！");
             return ResultData.fail("一键灭火设备不进行开关操作！");
         }
+        if(labHardware.getType().equals(HardwareTypeEnum.AI_VENTILATION) && labHardware.getPcType() == 1){
+            logger.error("通风橱设备不进行开关操作！");
+            return ResultData.fail("通风橱设备不进行开关操作！");
+        }
 
         //新老继电器调用方法
         Symbol.command command = null;