Merge commit 'bfecc91c4b0e5dfa3243e8c1d1eb66bbe9b1cfc2' into suda

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

@@ -985,17 +985,26 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 R deviceList = remoteSpeakService.getDeviceList(1, 100, floorId, subjectId);
                 log.info("远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
+                    log.info("调用喇叭1");
                     List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
+                    log.info("调用喇叭2={}",JSON.toJSONString(mapList));
                     for (Map<String, Object> map : mapList) {
                         if (StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))) {
+                            log.info("调用喇叭3");
                             List<PlayVo> playVoList = new ArrayList<>();
                             PlayVo playVo = new PlayVo();
+                            log.info("调用喇叭4");
                             playVo.setSn(map.get("deviceSn") + "");
+                            log.info("调用喇叭5");
                             playVo.setDeviceIp(map.get("deviceIp") + "");
+                            log.info("调用喇叭6");
                             playVo.setPort(Integer.parseInt(map.get("port") + ""));
+                            log.info("调用喇叭7");
                             ParamVo paramVo = new ParamVo();
                             paramVo.setVol(Integer.parseInt(map.get("deviceVol").toString()));
+                            log.info("调用喇叭8");
                             playVo.setParams(paramVo);
+                            log.info("调用喇叭9");
                             playVoList.add(playVo);
                             log.info("远程调用喇叭播放音乐！url={},playVoList={}", audioSyntheses.get(0).getNewMusicUrl(), JSON.toJSONString(playVoList));
                             R r = remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList);
@@ -1011,7 +1020,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("合成音乐列表为空，此预案不触发音乐！riskPlanId={}", riskPlanId);
             }
         } catch (Exception e) {
-            log.error("开启喇叭失败！！！！！:" + e);
+            log.info("开启喇叭失败！={}",e);
         }
     }
 

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;