hanzhiwei лет назад: 3
Родитель
Сommit
c12a4ac62b

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

@@ -1033,7 +1033,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
 
         //如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
         //如果预案里面配置传感器都达标,需要执行预案对应的硬件操作
         if (labRiskPlanLevel.getRiskPlanId() != null) {
         if (labRiskPlanLevel.getRiskPlanId() != null) {
-            log.error("daying");
+            log.info("触发预案信息:{}",labRiskPlanLevel.toString());
             //获取通知配置信息
             //获取通知配置信息
             List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
             List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
             LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
             LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
@@ -1760,6 +1760,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         List<Long> list = new ArrayList<>();
         List<Long> list = new ArrayList<>();
         collect.forEach((key, value) -> {
         collect.forEach((key, value) -> {
             Integer count = 0;
             Integer count = 0;
+            StringBuffer funNumStr = new StringBuffer();
 //            Integer fireCount = 0;
 //            Integer fireCount = 0;
             //预案级别下传感器列表
             //预案级别下传感器列表
             for (LabRiskPlanSensorRelation labRiskPlanSensorRelation : value) {
             for (LabRiskPlanSensorRelation labRiskPlanSensorRelation : value) {
@@ -1777,6 +1778,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                         //判断值范围  在范围内存储预案ID和类型名称 (火焰,温度,湿度)
                         //判断值范围  在范围内存储预案ID和类型名称 (火焰,温度,湿度)
                         if ((senseVal >= labRiskPlanSensorRelation.getMinMonitor().floatValue()) && (senseVal <= labRiskPlanSensorRelation.getMaxMonitor().floatValue())) {
                         if ((senseVal >= labRiskPlanSensorRelation.getMinMonitor().floatValue()) && (senseVal <= labRiskPlanSensorRelation.getMaxMonitor().floatValue())) {
                             count++;
                             count++;
+                            funNumStr.append(funNum).append("、");
 //                            if (funNum.equals(RiskPlanConstants.TEMPERATURE_FUN_NUM) || funNum.equals(RiskPlanConstants.SMOKE_FUN_NUM)){
 //                            if (funNum.equals(RiskPlanConstants.TEMPERATURE_FUN_NUM) || funNum.equals(RiskPlanConstants.SMOKE_FUN_NUM)){
 //                                fireCount++;
 //                                fireCount++;
 //                            }
 //                            }
@@ -1785,6 +1787,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 }
                 }
             }
             }
             if (value.size() == count) {
             if (value.size() == count) {
+                log.info("预案级别下={}下,{}传感器数值发生异常",key,funNumStr.toString());
                 list.add(key);
                 list.add(key);
             }
             }
         });
         });