预警生成前查询库里是否已生成该预警数据的规则错误问题调整。

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

@@ -280,7 +280,8 @@ public class HealthStatusIndicatorServiceImpl {
                 //库里若已存在该测点预警 不生成重复的 若新生预警等级高于历史 则生成
                 LambdaQueryWrapper<PvWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(PvWarningRecord::getAnalysisPointId,idxBizPvHealthIndices.get(0).getAnalysisObjSeq());
-                query.isNotNull(PvWarningRecord::getDisposotionDate);
+                query.eq(PvWarningRecord::getStatus,"0");
+                query.isNull(PvWarningRecord::getDisposotionDate);
                 query.orderByDesc(PvWarningRecord::getTs);
                 List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
 
@@ -650,7 +651,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.isNull(PvWarningRecord::getDisposotionDate);
                 query.orderByDesc(PvWarningRecord::getRecDate);
                 List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
 
@@ -838,7 +839,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.isNull(PvWarningRecord::getDisposotionDate);
                 query.orderByDesc(PvWarningRecord::getTs);
                 List<PvWarningRecord> idxBizPvWarningRecords = pvWaringRecordMapper.selectList(query);
 
@@ -1028,7 +1029,7 @@ public class HealthStatusIndicatorServiceImpl {
                 LambdaQueryWrapper<FanWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(FanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
                 query.eq(FanWarningRecord::getStatus,"0");
-                query.isNotNull(FanWarningRecord::getDisposotionDate);
+                query.isNull(FanWarningRecord::getDisposotionDate);
                 query.orderByDesc(FanWarningRecord::getTs);
                 List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
 
@@ -1222,7 +1223,7 @@ public class HealthStatusIndicatorServiceImpl {
                 LambdaQueryWrapper<FanWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(FanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
                 query.eq(FanWarningRecord::getStatus,"0");
-                query.isNotNull(FanWarningRecord::getDisposotionDate);
+                query.isNull(FanWarningRecord::getDisposotionDate);
                 query.orderByDesc(FanWarningRecord::getTs);
                 List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);
 
@@ -1418,7 +1419,7 @@ public class HealthStatusIndicatorServiceImpl {
                 LambdaQueryWrapper<FanWarningRecord> query = new LambdaQueryWrapper<>();
                 query.eq(FanWarningRecord::getAnalysisPointId,idxBizFanHealthIndices.get(0).getAnalysisObjSeq());
                 query.eq(FanWarningRecord::getStatus,"0");
-                query.isNotNull(FanWarningRecord::getDisposotionDate);
+                query.isNull(FanWarningRecord::getDisposotionDate);
                 query.orderByDesc(FanWarningRecord::getTs);
                 List<FanWarningRecord> idxBizFanWarningRecords = fanWaringRecordMapper.selectList(query);