Browse Source

增加对部分空对象的处理

lixing 3 years ago
parent
commit
5975b2b976

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/dependency/eqdiagnose/service/EqDiagnoseServiceImpl.java

@@ -52,7 +52,7 @@ public class EqDiagnoseServiceImpl {
         if (CollectionUtils.isEmpty(records)) {
             return new HashMap<>(0);
         }
-        return records.stream().collect(
+        return records.stream().filter(record -> record.getDate() != null).collect(
                 Collectors.toMap(
                         MonitorIndicatorRecordListItemVO::getDate,
                         MonitorIndicatorRecordListItemVO::getValue

+ 3 - 0
src/main/java/com/persagy/apm/alarmservice/group/monitorindicator/service/impl/MonitorIndicatorServiceImpl.java

@@ -337,6 +337,9 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
     private List<GraphItemVO> getIndicatorRecordGraphData(
             MonitorIndicator monitorIndicator, Map<Date, String> indicatorRecordMap) {
         List<GraphItemVO> values = new ArrayList<>();
+        if (CollectionUtils.isEmpty(indicatorRecordMap)) {
+            return values;
+        }
         for (Date date : indicatorRecordMap.keySet()) {
             if (date == null) {
                 continue;

+ 1 - 0
src/main/resources/mapper/ProjectAlarmRuleObjRelMapper.xml

@@ -43,6 +43,7 @@
         from project_alarm_rule rule,
         project_alarm_rule_obj_rel rel
         where rule.id = rel.project_alarm_rule_id
+          and rel.valid = 1 and rule.valid = 1
         <if test="projectId != null and projectId != ''">
             and rule.project_id = #{projectId};
         </if>