新增一件灭火日志

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/entity/SensorFunctionStatus.java

@@ -68,6 +68,17 @@ public class SensorFunctionStatus extends BasicFunctionStatus {
 
     private String  configName;
 
+    @ApiModelProperty("手动灭火/自动灭火 0/1")
+    private Integer automanual;
+
+    public Integer getAutomanual() {
+        return automanual;
+    }
+
+    public void setAutomanual(Integer automanual) {
+        this.automanual = automanual;
+    }
+
     public SensorFunctionStatus() {
         //获取当前时间
         LocalDateTime newTime = LocalDateTime.now();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanController.java

@@ -263,9 +263,10 @@ public class LabRiskPlanController extends BaseController {
                     List<SensorFunctionStatus> sensorFunctionStatuses = new ArrayList<>();
                     SensorFunctionStatus sensorFunctionStatus = new SensorFunctionStatus();
                     sensorFunctionStatus.setVal("1");
-                    sensorFunctionStatus.setFunNum("火焰");
+                    sensorFunctionStatus.setFunNum("huoyan");
                     sensorFunctionStatus.setHardwareNum(oneClickFireDTO.getDeviceCode());
                     sensorFunctionStatus.setDescribe("火焰");
+                    sensorFunctionStatus.setAutomanual(oneClickFireDTO.getAutomanual());
                     sensorFunctionStatuses.add(sensorFunctionStatus);
                     subFunction.setSubId(hardwareFireDeviceVO.getSubjectId());
                     subFunction.setFunctionStatuses(sensorFunctionStatuses);

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

@@ -409,6 +409,18 @@ public class LabRiskPlanAbnormalLogServiceImpl implements ILabRiskPlanAbnormalLo
                     appVo.getVoiceOpreteActList().add(opreteVo);
                 }
 
+                //这里是查询一件灭火日志，是否插入。
+                labRiskPlanAbnormalLogVoByhard.setGroupId(b.getGroupId());
+                labRiskPlanAbnormalLogVoByhard.setRiskPlanId(b.getRiskPlanId());
+                labRiskPlanAbnormalLogVoByhard.setRiskStatus(6L);
+                List<LabRiskPlanAbnormalLogVO> riskPlanLogListByoneClickFire = labRiskPlanAbnormalLogMapper.adminSubByRiskPlan(labRiskPlanAbnormalLogVoByhard);
+                if(riskPlanLogListByoneClickFire.size()>0){
+                    HardwareOpreteActVO opreteVo = new HardwareOpreteActVO();
+                    opreteVo.setHardWareName("一件灭火");
+                    opreteVo.setOpreteMes(riskPlanLogListByoneClickFire.get(0).getRemark());
+                    appVo.getVoiceOpreteActList().add(opreteVo);
+                }
+
                 //这里是查询语音电话短信，是否执行成功。
                 if(subDiy.size()>0){
                     SubDiyVO diyVo = subDiy.get(0);

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

@@ -1092,7 +1092,6 @@ 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("这里记录预警消息记录开始=======================================================");
@@ -1107,6 +1106,8 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 insertPlanAbnormalLogByPhone(labRiskPlanLevel, subFunction.getSubId(), groupId);
                 log.error("这里记录语音电话结束=======================================================");
 
+                insertPlanAbnormalLogByOneClickFire(labRiskPlanLevel, subFunction, groupId);
+
                 //向一体机推送语音播报
                 log.error("向一体机推送语音播报开始=======================================================");
                 try {
@@ -1628,6 +1629,28 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
     }
 
+    public void insertPlanAbnormalLogByOneClickFire(LabRiskPlanLevel labRiskPlanLevel, SubFunction<SensorFunctionStatus> subFunction, Long groupId) {
+        //将一件灭火插入日志
+        subFunction.getFunctionStatuses().stream().filter(a->"huoyan".equals(a.getFunNum())).forEach(a -> {
+            if(a.getAutomanual()!=null){
+                LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = new LabRiskPlanAbnormalLog();
+                labRiskPlanAbnormalLog.setRiskPlanId(labRiskPlanLevel.getRiskPlanId());
+                labRiskPlanAbnormalLog.setRiskPlanName("一键灭火");
+                labRiskPlanAbnormalLog.setSubjectId(subFunction.getSubId());
+                labRiskPlanAbnormalLog.setCreateTime(new Date());
+                labRiskPlanAbnormalLog.setGroupId(groupId);
+                labRiskPlanAbnormalLog.setRiskAttribute(labRiskPlanLevel.getRiskAttribute());
+                labRiskPlanAbnormalLog.setRiskPlanLevelId(labRiskPlanLevel.getId());
+                labRiskPlanAbnormalLog.setRiskPlanLevelName(RiskPlanLevelEnum.getValue(labRiskPlanLevel.getRiskPlanLevel()));
+                labRiskPlanAbnormalLog.setRiskPlanLevel(labRiskPlanLevel.getRiskPlanLevel());
+                labRiskPlanAbnormalLog.setRiskStatus(6L);
+                labRiskPlanAbnormalLog.setRemark(a.getAutomanual() == 1 ?"自动灭火":"手动灭火");
+                //插入风险日志
+                labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
+            }
+        });
+    }
+
     /**
      * 调用执行硬件的接口，交由接口实现具体的设备开启或关闭
      *
@@ -1733,12 +1756,11 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             return labRiskPlanLevel;
         }
         LinkedHashMap<Long, List<LabRiskPlanSensorRelation>> collect = Optional.ofNullable(labRiskPlanSensorRelations).orElseGet(Collections::emptyList).stream().collect(Collectors.groupingBy(LabRiskPlanSensorRelation::getRiskPlanLevelId, LinkedHashMap::new, Collectors.toList()));
+        Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
         List<Long> list = new ArrayList<>();
         collect.forEach((key, value) -> {
             Integer count = 0;
 //            Integer fireCount = 0;
-
-            Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
             //预案级别下传感器列表
             for (LabRiskPlanSensorRelation labRiskPlanSensorRelation : value) {
                 List<SensorFunctionStatus> sensorFunctionStatuses = sensorFunctionStatusListMap.get(SenseType.getByCode(labRiskPlanSensorRelation.getSensorType()));