预警产生规则调整。

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -265,7 +265,7 @@ public class HealthStatusIndicatorServiceImpl {
                 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
                 LambdaQueryWrapper<PvWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(PvWarningRecord::getAnalysisPointId,idxBizPvHealthIndices.get(0).getAnalysisObjSeq());
-                query.eq(PvWarningRecord::getStatus,0);
+                query.isNotNull(PvWarningRecord::getDisposotionDate);
                 query.orderByDesc(PvWarningRecord::getTs);
                 List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
 
@@ -433,7 +433,8 @@ public class HealthStatusIndicatorServiceImpl {
                 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
                 LambdaQueryWrapper<PvWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(PvWarningRecord::getAnalysisPointId,idxBizPvHealthIndices.get(0).getAnalysisObjSeq());
-                query.eq(PvWarningRecord::getStatus,0);
+                query.eq(PvWarningRecord::getStatus,"0");
+                query.isNotNull(PvWarningRecord::getDisposotionDate);
                 query.orderByDesc(PvWarningRecord::getRecDate);
                 List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
 
@@ -599,7 +600,8 @@ public class HealthStatusIndicatorServiceImpl {
                 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
                 LambdaQueryWrapper<PvWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(PvWarningRecord::getAnalysisPointId,idxBizPvHealthIndices.get(0).getAnalysisObjSeq());
-                query.eq(PvWarningRecord::getStatus,0);
+                query.eq(PvWarningRecord::getStatus,"0");
+                query.isNotNull(PvWarningRecord::getDisposotionDate);
                 query.orderByDesc(PvWarningRecord::getTs);
                 List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
 
@@ -769,7 +771,8 @@ public class HealthStatusIndicatorServiceImpl {
                 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
                 LambdaQueryWrapper<FanWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(FanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
-                query.eq(FanWarningRecord::getStatus,0);
+                query.eq(FanWarningRecord::getStatus,"0");
+                query.isNotNull(FanWarningRecord::getDisposotionDate);
                 query.orderByDesc(FanWarningRecord::getTs);
                 List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
 
@@ -938,7 +941,8 @@ public class HealthStatusIndicatorServiceImpl {
                 }
                 LambdaQueryWrapper<FanWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(FanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
-                query.eq(FanWarningRecord::getStatus,0);
+                query.eq(FanWarningRecord::getStatus,"0");
+                query.isNotNull(FanWarningRecord::getDisposotionDate);
                 query.orderByDesc(FanWarningRecord::getTs);
                 List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
 
@@ -1111,7 +1115,8 @@ public class HealthStatusIndicatorServiceImpl {
 
                 LambdaQueryWrapper<FanWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(FanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
-                query.eq(FanWarningRecord::getStatus,0);
+                query.eq(FanWarningRecord::getStatus,"0");
+                query.isNotNull(FanWarningRecord::getDisposotionDate);
                 query.orderByDesc(FanWarningRecord::getTs);
                 List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);