日志优化修改

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/controller/SpeakerController.java

@@ -106,7 +106,6 @@ public class SpeakerController {
             return AjaxResult.error("获取设备列表失败！");
         }
         JSONObject jsonObject=JSONObject.parseObject(responseStr);
-        logger.info("jsonObject.toString():"+jsonObject.toString());
         JSONArray jsonArray=JSONArray.parseArray(jsonObject.getString("rows"));
         for(Map<String,Object> map: mapList){
             for(int i=0;i<jsonArray.size();i++){

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

@@ -253,17 +253,17 @@ public class LabRiskPlanController extends BaseController {
     @Log(title = "一件灭火触发火焰预警")
     @PostMapping("/oneClickFire")
     public ResultData oneClickFire(@RequestBody OneClickFireDTO oneClickFireDTO){
+        logger.info("一键灭火触发火焰预警,入参={}", JSON.toJSONString(oneClickFireDTO));
         if (Objects.isNull(oneClickFireDTO)) {
             return ResultData.fail("传入参数为空！");
         }
-        logger.info("一键灭火触发火焰预警,入参={}", JSON.toJSONString(oneClickFireDTO));
         if (oneClickFireDTO.getIfFire() == 1) {
             R deviceByCode = remoteFireDeviceService.getDeviceByCode(oneClickFireDTO.getDeviceCode());
             if (deviceByCode.getCode()!=(HttpStatus.SUCCESS)){
                 return ResultData.fail("查询一键灭火实验室信息失败！");
             }
             HardwareFireDeviceVO hardwareFireDeviceVO = JSON.parseObject(JSON.toJSONString(deviceByCode.getData()), HardwareFireDeviceVO.class);
-            if (hardwareFireDeviceVO.getSubjectId() != null){
+            if (!Objects.isNull(hardwareFireDeviceVO) && hardwareFireDeviceVO.getSubjectId() != null){
                 //自动或手动
                 if(oneClickFireDTO.getAutomanual() == 0 || oneClickFireDTO.getAutomanual() == 1){
                     Boolean b = labRiskPlanAbnormalLogService.queryIfTriggerRiskPlan(hardwareFireDeviceVO.getSubjectId());
@@ -279,7 +279,7 @@ public class LabRiskPlanController extends BaseController {
                     return oneClickFireTriggerRiskPlan(oneClickFireDTO, hardwareFireDeviceVO);
                 }
             }
-            return ResultData.fail("未查询到一键灭火实验室信息！");
+            return ResultData.fail("未查询到一键灭火设备或实验室信息！");
         }
         return ResultData.fail("当前传入非火焰预案！");
     }
@@ -330,14 +330,8 @@ public class LabRiskPlanController extends BaseController {
                             .forEach(a->{
                                 //没有火焰预警的缓存信息，则执行智能预警方法，否则不执行， 需要手动关闭火焰预警
                                 if(redisService.getCacheObject("subjectByHuoyan"+subFunction.getSubId())==null){
-//                                    redisService.setCacheObject("subjectByHuoyan"+subFunction.getSubId(), subFunction.getSubId());
                                     labRiskPlanService.triggerRiskPlan(subFunction, RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
                                 }
-//                                else{
-//                                    //如果是温度，烟感 则走正常逻辑
-//                                    labRiskPlanService.triggerRiskPlan(subFunction,RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
-//                                }
-
                             });
                 }
             }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/LabMessageListener.java

@@ -18,11 +18,8 @@ import org.springframework.stereotype.Component;
  * @date 2021/10/14
  */
 @Component
-public class LabMessageListener implements ApplicationListener <SensorLabMessageEvent> {
+public class LabMessageListener implements ApplicationListener<SensorLabMessageEvent> {
     private static final Logger log = LoggerFactory.getLogger(LabMessageListener.class);
-
-//    private Lock lock = new ReentrantLock(true);
-
     @Autowired
     ILabRiskPlanService riskPlanService;
     static TypeReference<SubFunction<SensorFunctionStatus>> typeReference = new TypeReference<SubFunction<SensorFunctionStatus>>() {
@@ -31,25 +28,13 @@ public class LabMessageListener implements ApplicationListener <SensorLabMessage
     @Override
     public void onApplicationEvent(SensorLabMessageEvent sensorLabMessageEvent) {
         SubFunction<SensorFunctionStatus> message = sensorLabMessageEvent.getMessage();
-        log.error("实验室ID======================================================="+message.getSubId());
-//        JSONObject object = JSONObject.parseObject(payload);
-//
-//        SubFunction<SensorFunctionStatus> messageBody = object.getObject("data", typeReference);
+        log.info("监听传感器入口——实验室Id======{}",message.getSubId());
         //触发事件
-//        try{
-//            lock.lock();
-            log.error("锁住预案，一次只执行一个预案，实验室ID======================================================="+message.getSubId());
-            //没有实验室Id 不处理
-            if(message.getSubId()==null) {
-                return;
-            }
-            riskPlanService.triggerRiskPlan(message, RiskPlanConstants.RISK_ATTRIBUTE_NO_FIRE);
-//        }catch(Exception e){
-//            e.printStackTrace();
-//            log.error("LabMessageListener: " + e.getMessage());
-//        }finally {
-////            lock.unlock();
-//        }
-
+        //没有实验室Id 不处理
+        if (message.getSubId() == null) {
+            log.error("无实验室id，不予处理！");
+            return;
+        }
+        riskPlanService.triggerRiskPlan(message, RiskPlanConstants.RISK_ATTRIBUTE_NO_FIRE);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.zd.laboratory.mqtt.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.algorithm.api.speaker.feign.RemoteSpeakService;
 import com.zd.common.core.exception.ServiceException;
@@ -70,12 +71,12 @@ public class SubMessageSendManager {
      * @param bigViewDataType
      */
     public void SendBigViewUpdate(BigViewDataType bigViewDataType) {
-
         Assert.isNotNull(bigViewDataType, "发送大屏更新数据类型不能为空");
         MessageBody messageBody = new MessageBody();
         messageBody.setData(bigViewDataType);
         //仅发送一次
         commonSend.send(MqttConstants.TOPIC_LAB_BIG_VIEW, messageBody, SendMode.ONCE);
+        logger.info("发送大屏数据更新通知完成！topic={},msg={}",MqttConstants.TOPIC_LAB_BIG_VIEW,messageBody);
     }
 
     /**
@@ -83,11 +84,11 @@ public class SubMessageSendManager {
      *
      */
     public void riskPlanTriggerNotice() {
-        logger.info("预案触发，发送前段mqtt信息");
         MessageBody messageBody = new MessageBody();
         messageBody.setData(1);
         //仅发送一次
         commonSend.send(MqttConstants.TOPIC_RISKPLAN_TRIGGER_NOTICE, messageBody, SendMode.ONCE);
+        logger.info("发送前端预案触发通知完成！topic={},msg={}",MqttConstants.TOPIC_RISKPLAN_TRIGGER_NOTICE,JSON.toJSONString(messageBody));
     }
 
     /**
@@ -238,6 +239,7 @@ public class SubMessageSendManager {
         MessageBody messageBody = new MessageBody();
         messageBody.setData(BigViewDataType.SUB_WRAN);
         commonSend.send(MqttConstants.TOPIC_LAB_WRAN + id, messageBody, SendMode.ONCE);
+        logger.info("向一体机发送预警数据完成！topic={},msg={}",MqttConstants.TOPIC_LAB_WRAN + id,messageBody);
     }
 
     /**
@@ -349,6 +351,7 @@ public class SubMessageSendManager {
         messageBody.setData(map);
         //仅发送一次
         commonSend.send(MqttConstants.TOPIC_LAB_ONEPC_SUB_NEWS + subId, messageBody, SendMode.ONCE);
+        logger.info("发送一体机通知消息完成，topic={},msg={}",MqttConstants.TOPIC_LAB_ONEPC_SUB_NEWS + subId,messageBody);
     }
 
     /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabWarnPushMessageService.java

@@ -40,5 +40,5 @@ public interface ILabWarnPushMessageService
      * @param subId 实验室id
      * @return 结果
      */
-    public void insertLabWarnPushMessage(Long subId, String userids, Long groupId, LabRiskPlanLevel labRiskPlanLevel/*LabRiskPlan newRiskPlan*/, WarnUserAttrEnum warnUserAttrEnum);
+    public void insertLabWarnPushMessage(Long subId, String userids, Long groupId, LabRiskPlanLevel labRiskPlanLevel, WarnUserAttrEnum warnUserAttrEnum);
 }

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

@@ -100,29 +100,23 @@ public class LabContentMachineMsgServiceImpl implements ILabContentMachineMsgSer
 
     @Override
     public int insert(LabMessageContent labMessageContent) {
-
         List<String> subIds = Arrays.asList(labMessageContent.getSubIds().split(","));
-        logger.error("一体机通知啊哈哈哈哈哈哈");
         LabContentMachineMsg labContentMachineMsg;
         for (String subId : subIds) {
             labContentMachineMsg = new LabContentMachineMsg();
             labContentMachineMsg.setContentId(labMessageContent.getId());
             labContentMachineMsg.setContentMsg(labMessageContent.getContent());
             labContentMachineMsg.setSubId(Long.parseLong(subId));
-
             labContentMachineMsg.setUserId(labMessageContent.getUserId());
             labContentMachineMsg.setCreateBy(labMessageContent.getCreateBy());
             labContentMachineMsg.setCreateTime(labMessageContent.getCreateTime());
             labContentMachineMsg.setDeptId(labMessageContent.getDeptId());
             labContentMachineMsg.setDeptName(labMessageContent.getDeptName());
-
             insertLabContentMachineMsg(labContentMachineMsg);
-            logger.error("一体机通知消息={}",MqttConstants.TOPIC_LAB_CONTENT + subId);
             // 生成一条通知一个，此处不应该有重复的实验室ID
             commonSend.send(MqttConstants.TOPIC_LAB_CONTENT + subId, "收到一条新的消息通知！");
-            logger.error("发送实验室一体机消息通知：" + subId);
+            logger.info("向实验室一体机发送消息通知完成！topic={},msg={}", MqttConstants.TOPIC_LAB_CONTENT + subId,"收到一条新的消息通知！");
         }
-
         return 1;
     }
 }

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

@@ -152,12 +152,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
         if (labMessageContent.getMessClass() == null) {
             labMessageContent.setMessClass(1);
         }
-
         insertLabMessageContent(labMessageContent);
-
         if (labMessageContent.getMessClass() == 3 && StringUtils.isNotBlank(labMessageContent.getSubIds())) {
             // 一体机消息发送mqtt 通知，并生成相关数据
-            logger.info("一体机消息发送通知，应该是弹窗");
             labContentMachineMsgService.insert(labMessageContent);
         }
         return true;
@@ -177,17 +174,14 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
      * 这里一定要重构，预警消息里内部又发送预案消息，以后需要重构为事件驱动
      *
      * @param subId       实验室ID
-     * @param newRiskPlan 预案
      */
     @Override
     @Async("labExecutor")
-    public void sendWranMessage(Long subId,/* LabRiskPlan newRiskPlan*/LabRiskPlanLevel labRiskPlanLevel, Long groupId) {
-        logger.info("*******************sendWranMessage***********************");
+    public void sendWranMessage(Long subId,LabRiskPlanLevel labRiskPlanLevel, Long groupId) {
         //获取实验室负责人信息
         LabSubject subject = new LabSubject();
         subject.setId(subId);
         List<LabSubjectVO> labSubjects = labSubjectMapper.selectLabSubjectVOList(subject);
-        logger.info("**************labSubjects.size()***********" + labSubjects.size());
         Optional.ofNullable(labSubjects)
                 .filter(a -> a.size() > 0)
                 .map(a -> a.get(0))
@@ -198,8 +192,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 .orElse(null);
     }
 
-    private void sendSubWran(LabSubjectVO subject, LabRiskPlanLevel labRiskPlanLevel/*LabRiskPlan newRiskPlan*/, Long groupId) {
-        logger.info("$$$$$$$$$$$$$进入sendSubWran$$$$$$$$$$$$$");
+    private void sendSubWran(LabSubjectVO subject, LabRiskPlanLevel labRiskPlanLevel, Long groupId) {
         String safeUserId = subject.getSafeUserId();
         if (StringUtils.isNotBlank(safeUserId)) {
             subject.setSafeUserPhone(labSubjectMapper.queryUserPhoneBySafeUserId(safeUserId));
@@ -234,7 +227,6 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 .collect(Collectors.joining(","))
                 .split(",");
 
-        logger.info("%%%%%%%%%%%%%%%%%%%%strings:" + strings);
         //todo 发送最多支持200个电话号码 ， 这里不会超过200人 所以没有验证， 切割
         //todo 这里判断电话类型，如果是0，发送短信，如果是1,是四医大内部短信接口。
         if (phoneMode == 0) {
@@ -242,12 +234,8 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 AlarmEntrty alarmEntrty = new AlarmEntrty(Routes.NoticePush, strings, format);
                 MessageBody messageBody = new MessageBody();
                 messageBody.setData(alarmEntrty);
-                //commonSend.send("alarm/"+newRiskPlan.getId()+"/"+subject.getId(),messageBody, SendMode.DISTINCT);
                 commonSend.send(MqttConstants.TOPIC_ALERT + labRiskPlanLevel.getRiskPlanId() + "/" + subject.getId(), messageBody, SendMode.DISTINCT);
-                logger.info("&&&&" + MqttConstants.TOPIC_ALERT + labRiskPlanLevel.getRiskPlanId() + "/" + subject.getId());
-                logger.info("&&&&" + JSON.toJSONString(messageBody));
-//           改用mqtt
-//           ResultData send = remoteAlarmService.send(alarmEntrty);
+                logger.info("发送短信打电话消息推送完成！topic={},msg={}",MqttConstants.TOPIC_ALERT + labRiskPlanLevel.getRiskPlanId() + "/" + subject.getId(),JSON.toJSONString(messageBody));
                 try {
                     if (subject.getAdminId() != null) {
                         //发送预案消息（预案指挥中心） 没什么卵用 lab_warn_push_message

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

@@ -4,6 +4,7 @@ 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;
 import com.zd.chemical.api.fegin.RemoteChemicalService;
@@ -148,6 +149,10 @@ public class LabSubjectManagerService {
             return ResultData.fail(StrUtil.format("未关联继电器位！id：{}，名称：{}", labHardware.getId(), labHardware.getName()));
 
         }
+        if(labHardware.getIsPcfire() == 1){
+            logger.error("一键灭火设备不进行开关操作！");
+            return ResultData.fail("一键灭火设备不进行开关操作！");
+        }
 
         //新老继电器调用方法
         Symbol.command command = null;
@@ -159,7 +164,7 @@ public class LabSubjectManagerService {
             return ResultData.fail("继电器指令错误!!");
         }
 
-        logger.info("预案调用硬件:=====================硬件id" + labHardware.getId() + "==========硬件指令:====" + command.toString());
+        logger.info("预案调用硬件,硬件id={},硬件指令={}",labHardware.getId(), JSON.toJSONString(command));
         return ResultData.success(control(labHardware.getId(), command));
 
         //老继电器调用方法
@@ -187,12 +192,6 @@ public class LabSubjectManagerService {
             logger.error("未关联继电器位！id：{},名称:{}", id, labHardwareVO.getName());
             return false;
         }
-        /*if (1==labHardwareVO.getIsPcfire()) {
-            //一键灭火的设备不允许做开关操作
-            logger.error("不支持做该设备开关操作！");
-            return false;
-        }*/
-
         if (labHardwareVO.getHardwareType() == 2) {
             ResultData ResultData = socketService.sendMqttCommand(labHardwareVO.getId(), labHardwareVO.getRelayCode(), command, labHardwareVO.getBit(),labHardwareVO.getSubjectId());
             boolean equals = ResultData.getCode().equals(HttpStatus.SUCCESS);

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

@@ -66,7 +66,7 @@ public class LabWarnPushMessageServiceImpl implements ILabWarnPushMessageService
      * @return 结果
      */
     @Override
-    public void insertLabWarnPushMessage(Long subId, String userids, Long groupId, LabRiskPlanLevel labRiskPlanLevel,/*LabRiskPlan newRiskPlan*/ WarnUserAttrEnum warnUserAttrEnum) {
+    public void insertLabWarnPushMessage(Long subId, String userids, Long groupId, LabRiskPlanLevel labRiskPlanLevel, WarnUserAttrEnum warnUserAttrEnum) {
         String[] split = userids.split(",");
 
         Stream.of(split).forEach(a->{

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

@@ -255,6 +255,7 @@
         factory,
         type,
         pc_type,
+        is_pcfire,
         mac_add,
         subject_id,
         function_status,