预案级别 优先高级别预案触发

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

@@ -1,5 +1,6 @@
 package com.zd.laboratory.event;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.zd.laboratory.api.constant.RiskPlanConstants;
 import com.zd.laboratory.api.entity.SensorFunctionStatus;
@@ -29,6 +30,7 @@ public class LabMessageListener implements ApplicationListener<SensorLabMessageE
     public void onApplicationEvent(SensorLabMessageEvent sensorLabMessageEvent) {
         SubFunction<SensorFunctionStatus> message = sensorLabMessageEvent.getMessage();
         log.info("监听传感器入口——实验室Id======{}",message.getSubId());
+        log.info("监听传感器入口——传感器param==={}", JSON.toJSONString(message));
         //触发事件
         //没有实验室Id 不处理
         if (message.getSubId() == null) {

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

@@ -1150,7 +1150,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             if (newPlanAbnormalLogList.size() > 0) {
                 LabRiskPlanAbnormalLog checkLog = newPlanAbnormalLogList.get(0);
                 //判断如果当前传感器匹配预案和日志表的预案相同，则不插入日志。过滤重复预案
-                if (!labRiskPlanLevel.getRiskPlanId().equals(checkLog.getRiskPlanId())) {
+                if (!labRiskPlanLevel.getId().equals(checkLog.getRiskPlanLevelId())) {
                     //这里调用旧预案结束动作的方法
                     overRiskPlanAction(checkLog.getRiskPlanId(), checkLog.getSubjectId());
                     groupId = labRiskPlanAbnormalGroup.getId();

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

@@ -38,7 +38,7 @@
   <select id="queryRiskPlanLevelByLevelIds" resultType="com.zd.laboratory.domain.LabRiskPlanLevel">
     SELECT lrpl.*,lrp.name riskName
     FROM lab_risk_plan_level lrpl left join lab_risk_plan lrp on lrpl.risk_plan_id = lrp.id
-    where lrpl.id in (#{levelIds})
+    where FIND_IN_SET(lrpl.id,#{levelIds})
     ORDER BY lrpl.risk_plan_level DESC
     LIMIT 1
   </select>