修改代码

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

@@ -275,6 +275,7 @@ public class HealthStatusIndicatorServiceImpl {
         LambdaQueryWrapper<IdxBizPvHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizPvHealthIndex::getAnalysisType,"按小时");
         wrapper.ne(IdxBizPvHealthIndex::getHealthLevel,"安全");
+        wrapper.eq(IdxBizPvHealthIndex::getAnalysisObjType,"测点");
         wrapper.ge(IdxBizPvHealthIndex::getRecDate,df.format(calendar.getTime()));
         wrapper.orderByDesc(IdxBizPvHealthIndex::getRecDate);
         List<IdxBizPvHealthIndex> healthIndices = idxBizPvHealthIndexMapper.selectList(wrapper);
@@ -712,6 +713,7 @@ public class HealthStatusIndicatorServiceImpl {
 
         LambdaQueryWrapper<IdxBizFanHealthIndex> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizFanHealthIndex::getAnalysisType,"按小时");
+        wrapper.eq(IdxBizFanHealthIndex::getAnalysisObjType,"测点");
         wrapper.ne(IdxBizFanHealthIndex::getHealthLevel,"安全");
         wrapper.ge(IdxBizFanHealthIndex::getRecDate,df.format(calendar.getTime()));
         wrapper.orderByDesc(IdxBizFanHealthIndex::getRecDate);
@@ -722,7 +724,7 @@ public class HealthStatusIndicatorServiceImpl {
         List<String> collect = healthIndices.stream().map(IdxBizFanHealthIndex::getAnalysisObjSeq).collect(Collectors.toList());
 
         LambdaQueryWrapper<IdxBizFanWarningRuleSet> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisType,"小时");
+        queryWrapper.eq(IdxBizFanWarningRuleSet::getAnalysisType,"按小时");
         queryWrapper.in(IdxBizFanWarningRuleSet::getAnalysisPointId,collect);
         List<IdxBizFanWarningRuleSet> idxBizPvWarningRules = idxBizFanWarningRuleSetMapper.selectList(queryWrapper);