预案提交

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabRiskPlanLevel.java

@@ -169,6 +169,12 @@ public class LabRiskPlanLevel implements Serializable {
     @TableField(exist = false)
     private Integer riskAttribute;
 
+    /**
+     * 异常原因描述
+     */
+    @TableField(exist = false)
+    private String describe;
+
 
     private static final long serialVersionUID = 5240521020283577787L;
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/LabBuildFloorLayoutDTO.java

@@ -65,4 +65,7 @@ public class LabBuildFloorLayoutDTO {
      */
     @ApiModelProperty(value = "预案名称")
     private String name;
+
+    @ApiModelProperty(value = "组id")
+    private Long groupId;
 }

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

@@ -1,7 +1,6 @@
 package com.zd.laboratory.event;
 
 import com.alibaba.fastjson.TypeReference;
-import com.zd.laboratory.api.constant.RiskPlanConstants;
 import com.zd.laboratory.api.entity.SensorFunctionStatus;
 import com.zd.laboratory.api.vo.SubFunction;
 import com.zd.laboratory.service.ILabRiskPlanService;
@@ -43,7 +42,7 @@ public class LabMessageListener implements ApplicationListener <SensorLabMessage
             if(message.getSubId()==null) {
                 return;
             }
-            riskPlanService.triggerRiskPlan(message, RiskPlanConstants.RISK_ATTRIBUTE_NO_FIRE);
+//            riskPlanService.triggerRiskPlan(message, RiskPlanConstants.RISK_ATTRIBUTE_NO_FIRE);
 //        }catch(Exception e){
 //            e.printStackTrace();
 //            log.error("LabMessageListener: " + e.getMessage());

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

@@ -1062,6 +1062,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
             //处理预案下的传感器翻译
             JSONArray riskPlanJson = new JSONArray();
+            StringBuffer sb = new StringBuffer();
             for (LabRiskPlanSensorRelation rps : labRiskPlanLevel.getRiskPlanSensorList()) {
                 //硬件社保统一传入的传感器设备列表
                 for (SensorFunctionStatus sensorFunc : subFunction.getFunctionStatuses()) {
@@ -1069,9 +1070,13 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     if (funNum1.equals(sensorFunc.getFunNum())) {
                         getJsonStr(riskPlanJson, sensorFunc);
                         labRiskPlanLevel.setTopName(labRiskPlanLevel.getTopName() + " " + sensorFunc.getDescribe());
+                        sb.append(sensorFunc.getDescribe()).append("、");
                     }
                 }
             }
+            if(StringUtils.isNotBlank(sb)){
+                labRiskPlanLevel.setDescribe(sb.substring(0,sb.length() - 1)+"异常");
+            }
 
             //插入风险日志
             Long groupId = insertPlanAbnormalLog(labRiskPlanLevel, riskPlanJson, groupList, 1L, subFunction, riskAttribute);
@@ -1083,6 +1088,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 //                    remoteCameraService.startRecord("192.168.1.14");
                     remoteCameraService.startRecord(labHardware.getIpAddress());
                 }
+                R r = remoteCameraService.startRecord("192.168.1.64");
 
 
                 log.error("这里记录预警消息记录开始=======================================================");
@@ -1270,6 +1276,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
                     }
                 }
+                R r = remoteCameraService.stopRecord("192.168.1.64");
+
+
                 //TODO 更新风险概要  recordVideo - 视频记录存放地址
                 String handlePerson = null;
                 String recordVideo = "";
@@ -1381,9 +1390,25 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             messageSendService.sendWranFunctionToSub(subFunction.getSubId());
             //首页预案流程通知
             messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_GROUP);
+            messageSendService.riskPlanTriggerNotice();
             messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_LOG);
             //首页预案是否同步疏散线路
             messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_EXIT);
+            //关闭视频录像
+            LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subFunction.getSubId());
+            if (labHardware != null){
+                //开始录制视频
+//                    remoteCameraService.startRecord("192.168.1.14");
+                R r = remoteCameraService.stopRecord(labHardware.getIpAddress());
+                if (r.getCode() == HttpStatus.SUCCESS) {
+
+                }
+            }
+            R r = remoteCameraService.stopRecord("192.168.1.64");
+            if (r.getCode()== HttpStatus.SUCCESS){
+
+            }
+            log.info("assddd");
         }
         return 0;
     }
@@ -1415,7 +1440,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labRiskPlanAbnormalGroup.setRiskAttribute(newRiskPlan.getRiskAttribute());
         if(labRiskPlanAbnormalGroupMapper.insertLabRiskPlanAbnormalGroup(labRiskPlanAbnormalGroup) > 0) {
             //添加风险概况
-            labRiskPlanAbnormalDescService.addLabRiskPlanAbnormalDesc(labRiskPlanAbnormalGroup.getId(),subjectId, "", riskPlanLevel);
+            labRiskPlanAbnormalDescService.addLabRiskPlanAbnormalDesc(labRiskPlanAbnormalGroup.getId(),subjectId, newRiskPlan.getDescribe(), riskPlanLevel);
         }
         return labRiskPlanAbnormalGroup;
     }
@@ -2136,6 +2161,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 labBuildFloorLayoutDTO1.setBuildId(labBuildFloorLayoutDTO.getBuildId());
                 labBuildFloorLayoutDTO1.setFloorId(labBuildFloorLayoutDTO.getFloorId());
                 labBuildFloorLayoutDTO1.setSubId(labBuildFloorLayoutDTO.getSubId());
+                labBuildFloorLayoutDTO1.setGroupId(labRiskPlanAbnormalGroupVO.getId());
                 labBuilder.add(labBuildFloorLayoutDTO1);
             }
         }