一体机弹框

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabRiskPlanAbnormalGroupMapper.java

@@ -53,7 +53,7 @@ public interface LabRiskPlanAbnormalGroupMapper {
      * @param subId 实验室ID
      * @return
      */
-    List<String> queryWranFunNumBySubId(Long subId);
+    List<Integer> queryWranFunNumBySubId(Long subId);
 
     /**
      * 批量查询 实验室当前预警

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

@@ -14,18 +14,19 @@ import com.zd.laboratory.domain.LabRiskPlanAbnormalGroup;
 import com.zd.laboratory.domain.LabRiskPlanAbnormalLog;
 import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalGroupVO;
 import com.zd.laboratory.mapper.LabHardwareMapper;
-import com.zd.laboratory.mapper.LabHardwareStateMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalGroupMapper;
 import com.zd.laboratory.mapper.LabRiskPlanAbnormalLogMapper;
 import com.zd.laboratory.service.ILabExitLineService;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalDescService;
 import com.zd.laboratory.service.ILabRiskPlanAbnormalGroupService;
 import com.zd.model.enums.HardwareTypeEnum;
+import com.zd.model.enums.SenseType;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -58,6 +59,9 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
     @Autowired
     private RedisService redisService;
 
+    @Autowired
+    public HardwareFunctionStatusConfig hardwareFunctionStatusConfig;
+
 
     @Override
 //    @DataScope(deptAlias = "t")
@@ -107,11 +111,17 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
      */
     @Override
     public List<SensorFunctionStatus> queryWranFunNumBySubId(Long subId) {
-        List<String> strings = labRiskPlanAbnormalGroupMapper.queryWranFunNumBySubId(subId);
-
-        if(CollectionUtils.isEmpty(strings)){
+        List<Integer> sensorTypes = labRiskPlanAbnormalGroupMapper.queryWranFunNumBySubId(subId);
+        if(CollectionUtils.isEmpty(sensorTypes)){
             return new ArrayList<>();
         }
+        List<String> strings = new ArrayList<>();
+        Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
+        for (Integer sensorType : sensorTypes) {
+            List<SensorFunctionStatus> sensorFunctionStatuses = sensorFunctionStatusListMap.get(SenseType.getByCode(sensorType));
+            String funNum = sensorFunctionStatuses.get(0).getFunNum();
+            strings.add(funNum);
+        }
         logger.info("一体机预案异常类型：" + JSONUtil.toJsonStr(strings) + ", 实验室ID------" + subId);
         List<SensorFunctionStatus> list = labSubjectManagerService.querySenseNewFunctionBySubId(subId);
         logger.info("一体机预案实验室数据：" + JSONUtil.toJsonStr(list));

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

@@ -1069,8 +1069,8 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             });
             //有效预案延长一分钟
 //            if(redisService.getCacheObject("subjectByYa"+subFunction.getSubId())==null){
-//            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 10L, TimeUnit.SECONDS);
-            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 2L, TimeUnit.MINUTES);
+            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 10L, TimeUnit.SECONDS);
+//            redisService.setCacheObject("subjectByYa" + subFunction.getSubId(), subFunction.getSubId(), 2L, TimeUnit.MINUTES);
             log.info("@@@@@@@@@@@@@@@@@@@@预案延长3分钟@@@@@@@@@@@@@@@@@@@@");
 //            }
             Map<SenseType, List<SensorFunctionStatus>> sensorFunctionStatusListMap = hardwareFunctionStatusConfig.getSensorFunctionStatusListMap();
@@ -1206,12 +1206,15 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     LabHardware labHardware = labHardwareService.selectLabHardwareCameraBySub(subFunction.getSubId());
                     if (labHardware != null) {
                         //开始录制视频
-    //                    remoteCameraService.startRecord("192.168.1.14");
-                        remoteCameraService.startRecord(labHardware.getIpAddress());
+    //                    remoteCameraService.startRecord("192.168.1.64");
+//                        remoteCameraService.startRecord(labHardware.getIpAddress());
                     }
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
+
+                R r = remoteCameraService.startRecord("192.168.1.64");
+                log.info("摄像头信息={}", JSON.toJSONString(r));
                 //向前端发送mqtt预案触发提示
                 messageSendService.riskPlanTriggerNotice();
 
@@ -1303,6 +1306,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     }
                 }
 
+                R r = remoteCameraService.stopRecord("192.168.1.64");
+                log.info("摄像头信息2={}", JSON.toJSONString(r));
+
                 //TODO 更新风险概要  recordVideo - 视频记录存放地址
                 String handlePerson = null;
                 String recordVideo = "";

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalGroupMapper.xml

@@ -124,8 +124,8 @@
         where id = #{id}
     </update>
     <!--  根据实验室ID查询当前预警测试功能   -->
-      <select id="queryWranFunNumBySubId" resultType="java.lang.String" >
-          SELECT DISTINCT psr.`fun_num` FROM lab_risk_plan rp INNER JOIN  lab_risk_plan_sensor_relation psr ON rp.id = psr.`risk_plan_id`
+      <select id="queryWranFunNumBySubId" resultType="java.lang.Integer" >
+          SELECT DISTINCT psr.`sensor_type` FROM lab_risk_plan rp INNER JOIN  lab_risk_plan_sensor_relation psr ON rp.id = psr.`risk_plan_id`
           INNER JOIN lab_risk_planjoinsub rpb ON rp.id = rpb.`risk_plan_id`
           INNER JOIN lab_risk_plan_abnormal_log pal ON pal.`risk_plan_id` = rp.`id`
           INNER JOIN lab_risk_plan_abnormal_group pag ON pal.`group_id` = pag.`id`