预案升级功能修改

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

@@ -667,7 +667,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             if (redisService.getCacheObject("subjectByYa" + subFunction.getSubId()) != null) {
                 return flag;
             }
-            log.info("传感器触发关闭预案！实验室id={}",subFunction.getSubId());
+            log.info("传感器触发关闭预案！实验室id={}", subFunction.getSubId());
             for (LabRiskPlanAbnormalGroupVO groupVo : groupList) {
                 //更新结束预案日志
                 updateLogs(subFunction, groupVo);
@@ -766,7 +766,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("录制视频结束返回结果打印={}", JSON.toJSONString(r));
                 if (r.getCode() == HttpStatus.SUCCESS) {
                     com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(r.getData()));
-                    if(jsonObject.getInteger("code") == HttpStatus.SUCCESS){
+                    if (jsonObject.getInteger("code") == HttpStatus.SUCCESS) {
                         recordVideo = jsonObject.getString("data");
                     }
                 } else {
@@ -780,9 +780,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         }
         //更新风险概要  recordVideo - 视频记录存放地址
         String handlePerson = "";
-        if(!Objects.isNull(tokenService.getLoginUser())){
+        if (!Objects.isNull(tokenService.getLoginUser())) {
             handlePerson = tokenService.getLoginUser().getNickName();
-        }else {
+        } else {
             handlePerson = "SYSTEM";
         }
         labRiskPlanAbnormalDescService.updateLabRiskPlanAbnormalDesc(groupId, handlePerson, recordVideo);
@@ -874,7 +874,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             labRiskPlanLevel.setFloorId(list.get(0).getFloorId());
             labRiskPlanLevel.setTopName(labRiskPlan.getTopName());
         } catch (Exception e) {
-            log.error("获取园区楼栋信息异常！{}",e);
+            log.error("获取园区楼栋信息异常！{}", e);
         }
     }
 
@@ -896,7 +896,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 labRiskPlanLevel.setInformation(labNoticeconfig.getRiskPhone());
             }
         } catch (Exception e) {
-            log.error("获取通知配置信息异常！{}",e);
+            log.error("获取通知配置信息异常！{}", e);
         }
     }
 
@@ -922,7 +922,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 labRiskPlanLevel.setDescribe(sb.substring(0, sb.length() - 1) + "异常");
             }
         } catch (Exception e) {
-            log.error("传感器数据翻译异常！{}",e);
+            log.error("传感器数据翻译异常！{}", e);
         }
         return riskPlanJson;
     }
@@ -979,7 +979,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_EXIT);
             }
         } catch (Exception e) {
-            log.error("预案处理消息异常！{}",e);
+            log.error("预案处理消息异常！{}", e);
         }
     }
 
@@ -1029,7 +1029,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("打开喇叭-合成音乐列表为空，此预案不触发音乐！riskPlanId={}", riskPlanId);
             }
         } catch (Exception e) {
-            log.error("开启喇叭异常！{}",e);
+            log.error("开启喇叭异常！{}", e);
         }
     }
 
@@ -1050,10 +1050,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("开始录制视频返回结果打印={}", JSON.toJSONString(r));
                 if (r.getCode() == HttpStatus.SUCCESS) {
                     log.info("开始录制视频成功！");
-                }else {
+                } else {
                     log.info("开始录制视频失败！");
                 }
-            }else {
+            } else {
                 log.info("未查询到实验室关联摄像头信息！请检查ip是否为空！");
             }
         } catch (Exception e) {
@@ -1082,10 +1082,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 updateLogs(subFunction, groupVo);
             }
         } catch (Exception e) {
-            log.error("手动关闭火焰预案发生异常！{}",e);
+            log.error("手动关闭火焰预案发生异常！{}", e);
         } finally {
             //删除火焰报警的redis验证，这样其他传感器上报预案就能执行了
-            redisService.deleteObject("subjectByHuoyan"+subFunction.getSubId());
+            redisService.deleteObject("subjectByHuoyan" + subFunction.getSubId());
             //删除预案升级火焰预案时，基本预案缓存
             if (redisService.getCacheObject("subjectByYa" + subFunction.getSubId()) != null) {
                 redisService.deleteObject("subjectByYa" + subFunction.getSubId());
@@ -1134,7 +1134,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             //将风险预案写入日志表
             LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = new LabRiskPlanAbnormalLog();
             labRiskPlanAbnormalLog.setRiskPlanId(labRiskPlanLevel.getRiskPlanId());
-            labRiskPlanAbnormalLog.setRiskPlanName("发生预案："+labRiskPlanLevel.getRiskName());
+            labRiskPlanAbnormalLog.setRiskPlanName(labRiskPlanLevel.getRiskName());
             labRiskPlanAbnormalLog.setCreateTime(new Date());
             labRiskPlanAbnormalLog.setSensorJson(riskPlanJson.toString());
             labRiskPlanAbnormalLog.setRiskStatus(riskStatus);
@@ -1162,6 +1162,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     }
                 }
                 //插入风险日志
+                labRiskPlanAbnormalLog.setRiskPlanName("发生预案：" + labRiskPlanAbnormalLog.getRiskPlanName());
                 labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
                 // 后面放入老柴的事件中 或者订阅老柴的事件处理
                 //增加预警缓存
@@ -1192,17 +1193,17 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                         //这里调用旧预案结束动作的方法
                         overRiskPlanAction(checkLog.getRiskPlanId(), checkLog.getSubjectId());
                         groupId = labRiskPlanAbnormalGroup.getId();
-                        if (labRiskPlanLevel.getRiskPlanId().equals(checkLog.getRiskPlanId())){
-                            if (labRiskPlanLevel.getRiskPlanLevel()>checkLog.getRiskPlanLevel()){
+                        if (labRiskPlanLevel.getRiskPlanId().equals(checkLog.getRiskPlanId())) {
+                            if (labRiskPlanLevel.getRiskPlanLevel() > checkLog.getRiskPlanLevel()) {
                                 //升级
-                                labRiskPlanAbnormalLog.setRiskPlanName("预案升级："+labRiskPlanAbnormalLog.getRiskPlanName().substring(labRiskPlanAbnormalLog.getRiskPlanName().indexOf(":")));
+                                labRiskPlanAbnormalLog.setRiskPlanName("预案升级：" + labRiskPlanAbnormalLog.getRiskPlanName());
                             }
-                            if (labRiskPlanLevel.getRiskPlanLevel()>checkLog.getRiskPlanLevel()){
+                            if (labRiskPlanLevel.getRiskPlanLevel() < checkLog.getRiskPlanLevel()) {
                                 //降级
-                                labRiskPlanAbnormalLog.setRiskPlanName("预案降级："+labRiskPlanAbnormalLog.getRiskPlanName().substring(labRiskPlanAbnormalLog.getRiskPlanName().indexOf(":")));
+                                labRiskPlanAbnormalLog.setRiskPlanName("预案降级：" + labRiskPlanAbnormalLog.getRiskPlanName());
                             }
-                        }else {
-                            labRiskPlanAbnormalLog.setRiskPlanName("预案变更："+labRiskPlanAbnormalLog.getRiskPlanName().substring(labRiskPlanAbnormalLog.getRiskPlanName().indexOf(":")));
+                        } else {
+                            labRiskPlanAbnormalLog.setRiskPlanName("预案变更：" + labRiskPlanAbnormalLog.getRiskPlanName());
                         }
                         //插入风险日志
                         labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
@@ -1226,7 +1227,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 return null;
             }
         } catch (Exception e) {
-            log.error("插入风险日志异常！{}",e);
+            log.error("插入风险日志异常！{}", e);
         }
         return null;
     }
@@ -1340,7 +1341,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 }
             });
         } catch (Exception e) {
-            log.error("一键灭火插入日志异常！{}",e);
+            log.error("一键灭火插入日志异常！{}", e);
         }
     }
 
@@ -1527,6 +1528,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         List<LabRiskPlanDTO> list = labRiskPlanMapper.queryRiskPlanList(riskPlan);
         return list;
     }
+
     @Override
     public List<LabSubjectVO> getLabRiskPlanJoinSubInfo(LabRiskPlanSubVo labRiskPlanSubVo) {
         //通过传感器字符串和预案id查询相关实验室列表