预案触发新增日志

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) {
-            log.info("触发预案信息：{}",labRiskPlanLevel.toString());
+            log.error("触发预案信息：{}",labRiskPlanLevel.toString());
             //获取通知配置信息
             List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
             LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
@@ -1042,7 +1042,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             labRiskPlanLevel.setMessage(labNoticeconfig.getRiskMessage());
             labRiskPlanLevel.setVoicebroadcast(labNoticeconfig.getRiskVoice());
             labRiskPlanLevel.setInformation(labNoticeconfig.getRiskPhone());
-
+            log.error("触发预案1");
             //记录是否为火灾预案
             labRiskPlanLevel.setRiskAttribute(riskAttribute);
 
@@ -1050,7 +1050,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             labRiskPlanLevel.setFloorId(labRiskPlan.getFloorId());
             labRiskPlanLevel.setTopName(labRiskPlan.getTopName());
 
-
+            log.error("触发预案2");
             //这里处理，如果是火焰预案，需要redis额外缓存
             Optional.ofNullable(subFunction.getFunctionStatuses()).orElseGet(Collections::emptyList).stream().filter(a -> "huoyan".equals(a.getFunNum())).forEach(a -> {
                 if (redisService.getCacheObject("subjectByHuoyan" + subFunction.getSubId()) == null) {
@@ -1081,19 +1081,12 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             if(StringUtils.isNotBlank(sb)){
                 labRiskPlanLevel.setDescribe(sb.substring(0,sb.length() - 1)+"异常");
             }
-
+            log.error("触发预案3");
             //插入风险日志
             Long groupId = insertPlanAbnormalLog(labRiskPlanLevel, riskPlanJson, groupList, 1L, subFunction, riskAttribute);
             log.info("####################groupId:" + groupId);
             if (groupId != null) {
-                LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subFunction.getSubId());
-                if (labHardware != null) {
-                    //开始录制视频
-//                    remoteCameraService.startRecord("192.168.1.14");
-                    remoteCameraService.startRecord(labHardware.getIpAddress());
-                }
-
-
+                log.error("触发预案4");
                 log.error("这里记录预警消息记录开始=======================================================");
                 insertWarnPushMessageByOnePc(labRiskPlanLevel, subFunction.getSubId(), groupId);
                 log.error("这里记录预警消息记录结束=======================================================");
@@ -1190,7 +1183,16 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     redisService.setCacheObject("subjectByExit" + subFunction.getSubId(), subFunction.getSubId(), 30L, TimeUnit.SECONDS);
                     messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_EXIT);
                 }
-
+                try {
+                    LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subFunction.getSubId());
+                    if (labHardware != null) {
+                        //开始录制视频
+    //                    remoteCameraService.startRecord("192.168.1.14");
+                        remoteCameraService.startRecord(labHardware.getIpAddress());
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
                 //向前端发送mqtt预案触发提示
                 messageSendService.riskPlanTriggerNotice();
 
@@ -1466,9 +1468,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labRiskPlanAbnormalLog.setRiskPlanLevelId(labRiskPlanLevel.getId());
         labRiskPlanAbnormalLog.setRiskPlanLevelName(RiskPlanLevelEnum.getValue(labRiskPlanLevel.getRiskPlanLevel()));
         labRiskPlanAbnormalLog.setRiskPlanLevel(labRiskPlanLevel.getRiskPlanLevel());
-
+        log.error("预案触发5");
         if (groupList == null || groupList.size() == 0) {
             // todo
+            log.error("预案触发6");
             labRiskPlanAbnormalGroup = insertPlanAbnormalGroup(labRiskPlanLevel, subFunction.getSubId(),riskAttribute,labRiskPlanLevel.getRiskPlanLevel());
 //            labRiskPlanAbnormalGroupService.addRiskExeRecord(riskPlanName, subjectId, subjectName, riskAttribute, riskReason, riskLevel);
             groupId = labRiskPlanAbnormalGroup.getId();
@@ -1489,9 +1492,11 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 }
             }
             //插入风险日志
+            log.error("预案触发8");
             labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
             //todo 后面放入老柴的事件中 或者订阅老柴的事件处理
             //增加预警缓存
+            log.error("预案触发9");
             Optional.ofNullable(labRiskPlanLevel.getRiskPlanSensorList()).ifPresent(f -> {
                 Set<String> funSet = labRiskPlanLevel.getRiskPlanSensorList().stream().map(d -> d.getFunNum()).collect(Collectors.toSet());
                 redisService.setCacheSetV2(BaseConstants.WRAN_KEY + subFunction.getSubId(), funSet);
@@ -1499,12 +1504,14 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             try {
                 //插入风险硬件日志
                 operateHardWareInfo(labRiskPlanLevel, labRiskPlanAbnormalGroup.getSubjectId(), labRiskPlanAbnormalLog.getGroupId(), riskPlanJson.toString());
+                log.error("预案触发10");
             } catch (Exception e) {
                 log.error("操作硬件设备异常::::" + e);
             } finally {
                 return groupId;
             }
         } else {
+            log.error("预案触发7");
             labRiskPlanAbnormalGroup = groupList.get(0);
             //如果查询到是当前组，那么就给日志表插入的时候，补上组id
             labRiskPlanAbnormalLog.setGroupId(labRiskPlanAbnormalGroup.getId());
@@ -1521,6 +1528,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     groupId = labRiskPlanAbnormalGroup.getId();
                     //插入风险日志
                     labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
+                    log.error("预案触发11");
                     try {
                         //插入风险硬件日志
                         operateHardWareInfo(labRiskPlanLevel, labRiskPlanAbnormalGroup.getSubjectId(), groupList.get(0).getId(), riskPlanJson.toString());
@@ -1787,7 +1795,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 }
             }
             if (value.size() == count) {
-                log.info("预案级别下={}下，{}传感器数值发生异常",key,funNumStr.toString());
+                log.error("预案级别下={}下，{}传感器数值发生异常",key,funNumStr.toString());
                 list.add(key);
             }
         });