预案日志记录2

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

@@ -290,8 +290,11 @@ public class LabRiskPlanController extends BaseController {
 //                                    redisService.setCacheObject("subjectByHuoyan"+subFunction.getSubId(), subFunction.getSubId());
                                     labRiskPlanService.triggerRiskPlan(subFunction, RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
                                 }
-                                //如果是温度，烟感 则走正常逻辑
-                                labRiskPlanService.triggerRiskPlan(subFunction,RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
+//                                else{
+//                                    //如果是温度，烟感 则走正常逻辑
+//                                    labRiskPlanService.triggerRiskPlan(subFunction,RiskPlanConstants.RISK_ATTRIBUTE_FIRE);
+//                                }
+
                             });
                 }
             }

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

@@ -1,7 +1,6 @@
 package com.zd.laboratory.mapper;
 
 import com.zd.laboratory.domain.LabRiskPlanAbnormalGroup;
-import com.zd.laboratory.domain.LabRiskPlanAbnormalLog;
 import com.zd.laboratory.domain.SubWarnFunctions;
 import com.zd.laboratory.domain.vo.LabRiskPlanAbnormalGroupVO;
 
@@ -78,4 +77,11 @@ public interface LabRiskPlanAbnormalGroupMapper {
      * @return
      */
     List<LabRiskPlanAbnormalGroup> queryRiskExeRecordList(LabRiskPlanAbnormalGroup group);
+
+    /**
+     * 根据状态查询接口
+     * @param status
+     * @return
+     */
+    List<LabRiskPlanAbnormalGroupVO> selectByStatus(long status);
 }

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

@@ -1008,9 +1008,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         //调用烟雾特殊处理方法
 //        intelligentMotionCompensation(subFunction);
 
-        LabRiskPlanVO riskPlanVo = new LabRiskPlanVO();
-        //这里需要接收对应的实验室id
-        riskPlanVo.setSubjectId(subFunction.getSubId());
+//        LabRiskPlanVO riskPlanVo = new LabRiskPlanVO();
+//        //这里需要接收对应的实验室id
+//        riskPlanVo.setSubjectId(subFunction.getSubId());
         //通过实验室ID查询到对应的预案列表
 //        List<LabRiskPlan> riskPlanList = labRiskPlanMapper.selectLabRiskPlanBySubjectList(riskPlanVo);
 
@@ -1019,14 +1019,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         // 云盒传入数据如果没有落入传感器区间 有可能是之前预案关闭
 
 
-        //获取通知配置信息
-        List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
-        LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
-        StringBuffer radioStr = new StringBuffer();
-        radioStr.append(noticeconfigList.get(0).getRiskRadio());
-        labRiskPlanLevel.setMessage(labNoticeconfig.getRiskMessage());
-        labRiskPlanLevel.setVoicebroadcast(labNoticeconfig.getRiskVoice());
-        labRiskPlanLevel.setInformation(labNoticeconfig.getRiskPhone());
+
 
         //将风险预案写入归属组级表里面
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
@@ -1037,7 +1030,17 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
 
         //如果预案里面配置传感器都达标，需要执行预案对应的硬件操作
         if (labRiskPlanLevel.getRiskPlanId() != null) {
-
+            log.error("daying");
+            //获取通知配置信息
+            List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
+            LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
+            StringBuffer radioStr = new StringBuffer();
+            radioStr.append(noticeconfigList.get(0).getRiskRadio());
+            labRiskPlanLevel.setMessage(labNoticeconfig.getRiskMessage());
+            labRiskPlanLevel.setVoicebroadcast(labNoticeconfig.getRiskVoice());
+            labRiskPlanLevel.setInformation(labNoticeconfig.getRiskPhone());
+
+            //记录是否为火灾预案
             labRiskPlanLevel.setRiskAttribute(riskAttribute);
 
             LabRiskPlan labRiskPlan = labRiskPlanMapper.selectLabRiskPlanByRiskPlanId(labRiskPlanLevel.getRiskPlanId());
@@ -1081,8 +1084,6 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     remoteCameraService.startRecord(labHardware.getIpAddress());
                 }
 
-                //向前端发送mqtt预案触发提示
-                messageSendService.riskPlanTriggerNotice();
 
                 log.error("这里记录预警消息记录开始=======================================================");
                 insertWarnPushMessageByOnePc(labRiskPlanLevel, subFunction.getSubId(), groupId);
@@ -1179,6 +1180,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                     messageSendService.SendBigViewUpdate(BigViewDataType.SUB_RISKPLAN_EXIT);
                 }
 
+                //向前端发送mqtt预案触发提示
+                messageSendService.riskPlanTriggerNotice();
+
             }
 
         } else {
@@ -1557,6 +1561,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labRiskPlanAbnormalLogByVoicePhone.setCreateTime(new Date());
         labRiskPlanAbnormalLogByVoicePhone.setGroupId(groupId);
         labRiskPlanAbnormalLogByVoicePhone.setRiskStatus(5L);
+        labRiskPlanAbnormalLogByVoicePhone.setRiskAttribute(labRiskPlanLevel.getRiskAttribute());
+        labRiskPlanAbnormalLogByVoicePhone.setRiskPlanLevelId(labRiskPlanLevel.getId());
+        labRiskPlanAbnormalLogByVoicePhone.setRiskPlanLevelName(RiskPlanLevelEnum.getValue(labRiskPlanLevel.getRiskPlanLevel()));
+        labRiskPlanAbnormalLogByVoicePhone.setRiskPlanLevel(labRiskPlanLevel.getRiskPlanLevel());
         labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLogByVoicePhone);
     }
 
@@ -1569,6 +1577,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         labRiskPlanAbnormalLogByVoicePhone.setCreateTime(new Date());
         labRiskPlanAbnormalLogByVoicePhone.setGroupId(groupId);
         labRiskPlanAbnormalLogByVoicePhone.setRiskStatus(4L);
+        labRiskPlanAbnormalLogByVoicePhone.setRiskAttribute(labRiskPlanLevel.getRiskAttribute());
+        labRiskPlanAbnormalLogByVoicePhone.setRiskPlanLevelId(labRiskPlanLevel.getId());
+        labRiskPlanAbnormalLogByVoicePhone.setRiskPlanLevelName(RiskPlanLevelEnum.getValue(labRiskPlanLevel.getRiskPlanLevel()));
+        labRiskPlanAbnormalLogByVoicePhone.setRiskPlanLevel(labRiskPlanLevel.getRiskPlanLevel());
         labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLogByVoicePhone);
     }
 
@@ -2113,6 +2125,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
         LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = new LabRiskPlanAbnormalGroup();
         labRiskPlanAbnormalGroup.setStatus(1L);
         List<LabRiskPlanAbnormalGroupVO> groupList = labRiskPlanAbnormalGroupMapper.selectLabRiskPlanAbnormalGroupList(labRiskPlanAbnormalGroup);
+//        List<LabRiskPlanAbnormalGroupVO> groupList = labRiskPlanAbnormalGroupMapper.selectByStatus(1L);
+        if (groupList.size() == 0){
+            return labBuilder;
+        }
         for (LabRiskPlanAbnormalGroupVO labRiskPlanAbnormalGroupVO : groupList) {
             LabBuildFloorLayoutDTO labBuildFloorLayoutDTO = labBuildFloorLayoutMapper.selectBuildInfoBySubIdAndUser(labRiskPlanAbnormalGroupVO.getSubjectId(), tokenService.getLoginUser().getUserid());
             if (!Objects.isNull(labBuildFloorLayoutDTO)){

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

@@ -173,4 +173,9 @@
     <select id="selectById" resultMap="LabRiskPlanAbnormalGroupResult">
         SELECT id, group_name, subject_id, subject_name, risk_attribute, status, create_time FROM lab_risk_plan_abnormal_group WHERE id = #{id}
     </select>
+    <select id="selectByStatus" resultMap="LabRiskPlanAbnormalGroupVOResult">
+	    select DISTINCT lrpag.id, lrpag.subject_id,lrpal.risk_plan_id
+        from lab_risk_plan_abnormal_group lrpag left join lab_risk_plan_abnormal_log lrpal on lrpag.id = lrpal.group_id
+        where status = 1
+    </select>
 </mapper>

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

@@ -7,9 +7,10 @@
     <resultMap type="com.zd.laboratory.domain.LabRiskPlanAbnormalLog" id="LabRiskPlanAbnormalLogResult">
         <result property="id" column="id"/>
         <result property="riskPlanId" column="risk_plan_id"/>
-        <result property="riskPlanLevelId" column="risk_plan_level_id"/>
-        <result property="riskPlanLevelName" column="risk_plan_name"/>
         <result property="riskPlanName" column="risk_plan_name"/>
+        <result property="riskPlanLevelId" column="risk_plan_level_id"/>
+        <result property="riskPlanLevelName" column="risk_plan_level_name"/>
+        <result property="riskPlanLevel" column="risk_plan_level"/>
         <result property="riskAttribute" column="risk_attribute"/>
         <result property="subjectId" column="subject_id"/>
         <result property="deptId" column="dept_id"/>
@@ -30,6 +31,10 @@
         select id,
                risk_plan_id,
                risk_plan_name,
+               risk_plan_level_id,
+               risk_plan_level_name,
+               risk_plan_level,
+               risk_attribute,
                subject_id,
                dept_id,
                dept_name,
@@ -343,6 +348,10 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="riskPlanId != null">risk_plan_id,</if>
             <if test="riskPlanName != null">risk_plan_name,</if>
+            <if test="riskPlanLevel != null">risk_plan_level,</if>
+            <if test="riskPlanLevelId != null">risk_plan_level_id,</if>
+            <if test="riskPlanLevelName != null">risk_plan_level_name,</if>
+            <if test="riskAttribute != null">risk_attribute,</if>
             <if test="subjectId != null">subject_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null">dept_name,</if>
@@ -360,6 +369,10 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="riskPlanId != null">#{riskPlanId},</if>
             <if test="riskPlanName != null">#{riskPlanName},</if>
+            <if test="riskPlanLevel != null">#{riskPlanLevel},</if>
+            <if test="riskPlanLevelId != null">#{riskPlanLevelId},</if>
+            <if test="riskPlanLevelName != null">#{riskPlanLevelName},</if>
+            <if test="riskAttribute != null">#{riskAttribute},</if>
             <if test="subjectId != null">#{subjectId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
@@ -381,6 +394,10 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="riskPlanId != null">risk_plan_id = #{riskPlanId},</if>
             <if test="riskPlanName != null">risk_plan_name = #{riskPlanName},</if>
+            <if test="riskPlanLevel != null">#{riskPlanLevel},</if>
+            <if test="riskPlanLevelId != null">#{riskPlanLevelId},</if>
+            <if test="riskPlanLevelName != null">#{riskPlanLevelName},</if>
+            <if test="riskAttribute != null">#{riskAttribute},</if>
             <if test="subjectId != null">subject_id = #{subjectId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>