linfutong лет назад: 2
Родитель
Сommit
8848129fed

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

@@ -29,8 +29,8 @@ public class LabMessageListener implements ApplicationListener<SensorLabMessageE
     @Override
     @Override
     public void onApplicationEvent(SensorLabMessageEvent sensorLabMessageEvent) {
     public void onApplicationEvent(SensorLabMessageEvent sensorLabMessageEvent) {
         SubFunction<SensorFunctionStatus> message = sensorLabMessageEvent.getMessage();
         SubFunction<SensorFunctionStatus> message = sensorLabMessageEvent.getMessage();
-        log.info("监听传感器入口——实验室Id======{}",message.getSubId());
-        log.info("监听传感器入口——传感器param==={}", JSON.toJSONString(message));
+        //log.info("监听传感器入口——实验室Id======{}",message.getSubId());
+        //log.info("监听传感器入口——传感器param==={}", JSON.toJSONString(message));
         //触发事件
         //触发事件
         //没有实验室Id 不处理
         //没有实验室Id 不处理
         if (message.getSubId() == null) {
         if (message.getSubId() == null) {

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

@@ -216,7 +216,7 @@ public class SubMessageSendManager {
 //        subFunction.setFunctionStatuses(newFunctionStatuses);
 //        subFunction.setFunctionStatuses(newFunctionStatuses);
         //todo 到这里结束
         //todo 到这里结束
         //发送事件
         //发送事件
-        logger.info("采集器数据接收={}",JSON.toJSONString(subFunction));
+        //logger.info("采集器数据接收={}",JSON.toJSONString(subFunction));
         //本来使用mqtt接收,因为mqtt 每个客户端接受到都会处理,
         //本来使用mqtt接收,因为mqtt 每个客户端接受到都会处理,
         List<LabMessageEvent> labMessageEvents = mqttConfig.getLabMessMap().get(MqttConstants.TOPIC_LAB_FUNCTION_DATA);
         List<LabMessageEvent> labMessageEvents = mqttConfig.getLabMessMap().get(MqttConstants.TOPIC_LAB_FUNCTION_DATA);
         if (CollUtil.isNotEmpty(labMessageEvents)) {
         if (CollUtil.isNotEmpty(labMessageEvents)) {

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

@@ -628,7 +628,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
      */
      */
     @Override
     @Override
     public synchronized int triggerRiskPlan(SubFunction<SensorFunctionStatus> subFunction, Integer riskAttribute) {
     public synchronized int triggerRiskPlan(SubFunction<SensorFunctionStatus> subFunction, Integer riskAttribute) {
-        log.info("======进入触发预案======");
+        //log.info("======进入触发预案======");
         int flag = 200;
         int flag = 200;
         //这里判断火焰预案,就不继续往下执行了,锁死火焰预案
         //这里判断火焰预案,就不继续往下执行了,锁死火焰预案
         if (redisService.getCacheObject("subjectByHuoyan" + subFunction.getSubId()) != null) {
         if (redisService.getCacheObject("subjectByHuoyan" + subFunction.getSubId()) != null) {
@@ -637,7 +637,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         }
         }
         //实验室传感器是否触发预案
         //实验室传感器是否触发预案
         LabRiskPlanLevel labRiskPlanLevel = matchingRiskPlan(subFunction);
         LabRiskPlanLevel labRiskPlanLevel = matchingRiskPlan(subFunction);
-        log.info("触发预案具体信息={}", JSON.toJSONString(labRiskPlanLevel));
+        //log.info("触发预案具体信息={}", JSON.toJSONString(labRiskPlanLevel));
         //获取当前实验室触发预案的风险异常组列表
         //获取当前实验室触发预案的风险异常组列表
         List<LabRiskPlanAbnormalGroupVO> groupList = getLabRiskPlanAbnormalGroupVOS(subFunction.getSubId());
         List<LabRiskPlanAbnormalGroupVO> groupList = getLabRiskPlanAbnormalGroupVOS(subFunction.getSubId());
         //如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
         //如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
@@ -673,7 +673,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("预案缓存冗余时间,请等待...");
                 log.info("预案缓存冗余时间,请等待...");
                 return flag;
                 return flag;
             }
             }
-            log.info("传感器触发关闭预案!实验室id={}", subFunction.getSubId());
+            //log.info("传感器触发关闭预案!实验室id={}", subFunction.getSubId());
             for (LabRiskPlanAbnormalGroupVO groupVo : groupList) {
             for (LabRiskPlanAbnormalGroupVO groupVo : groupList) {
                 //更新结束预案日志
                 //更新结束预案日志
                 updateLogs(subFunction, groupVo);
                 updateLogs(subFunction, groupVo);