Bladeren bron

分组条件修改为非必传

lixing 3 jaren geleden
bovenliggende
commit
e86e534b99

+ 22 - 19
src/main/java/com/persagy/apm/alarmservice/group/alarmrecord/service/AlarmRecordWrapper.java

@@ -230,26 +230,29 @@ public class AlarmRecordWrapper {
         copyBasicInfo(alarmRecordItem, alarmRecordItemVO);
         /* 报警条件 */
         JSONObject condition = alarmRecordItem.getCondition();
-        AlarmConditionStrItem alarmConditionStrItem = new AlarmConditionStrItem();
-        // 报警规则
-        String rules = condition.getString("rules");
-        List<String> rulesList = JSONArray.parseArray(rules, String.class);
-        alarmConditionStrItem.setRules(rulesList);
-        // 报警触发时间转换为分钟
-        Integer triggerUphold = condition.getInteger("triggerUphold");
-        if (triggerUphold != null) {
-            triggerUphold = triggerUphold / 60;
+        if (condition != null) {
+            AlarmConditionStrItem alarmConditionStrItem = new AlarmConditionStrItem();
+            // 报警规则
+            String rules = condition.getString("rules");
+            List<String> rulesList = JSONArray.parseArray(rules, String.class);
+            alarmConditionStrItem.setRules(rulesList);
+            // 报警触发时间转换为分钟
+            Integer triggerUphold = condition.getInteger("triggerUphold");
+            if (triggerUphold != null) {
+                triggerUphold = triggerUphold / 60;
+            }
+            String lastTimeInfo = "持续%s分钟满足报警触发规则,则产生报警";
+            alarmConditionStrItem.setLastTimeInfo(
+                    String.format(lastTimeInfo, triggerUphold == null ? "--" : triggerUphold));
+            EnumAlarmLevel alarmLevel = EnumAlarmLevel.getByType(alarmRecordItem.getLevel());
+            if (alarmLevel != null) {
+                alarmConditionStrItem.setAlarmLevel(new SimpleObjVO(
+                        alarmLevel.getType(), alarmLevel.getDesc()
+                ));
+            }
+            alarmRecordItemVO.setAlarmCondition(alarmConditionStrItem);
         }
-        String lastTimeInfo = "持续%s分钟满足报警触发规则,则产生报警";
-        alarmConditionStrItem.setLastTimeInfo(
-                String.format(lastTimeInfo, triggerUphold == null ? "--" : triggerUphold));
-        EnumAlarmLevel alarmLevel = EnumAlarmLevel.getByType(alarmRecordItem.getLevel());
-        if (alarmLevel != null) {
-            alarmConditionStrItem.setAlarmLevel(new SimpleObjVO(
-                    alarmLevel.getType(), alarmLevel.getDesc()
-            ));
-        }
-        alarmRecordItemVO.setAlarmCondition(alarmConditionStrItem);
+
         return alarmRecordItemVO;
     }
 

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

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -154,9 +155,14 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
         if (queryMonitorIndicatorDTO != null) {
 
             if (queryMonitorIndicatorDTO.getIds() != null) {
+                if (CollectionUtils.isEmpty(queryMonitorIndicatorDTO.getIds())) {
+                    return new ArrayList<>();
+                }
                 queryWrapper.in(MonitorIndicator.PROP_ID, queryMonitorIndicatorDTO.getIds());
             }
 
+
+
             if (StringUtils.isNotEmpty(queryMonitorIndicatorDTO.getName())) {
                 queryWrapper.like(MonitorIndicator.PROP_NAME, queryMonitorIndicatorDTO.getName());
             }

+ 1 - 2
src/main/java/com/persagy/apm/alarmservice/project/monitorindicatorconfig/model/dto/PageQueryProjectMonitorIndicatorConfigDTO.java

@@ -29,7 +29,6 @@ public class PageQueryProjectMonitorIndicatorConfigDTO extends PageDTO {
     @NotBlank(message = "查询条件缺少设备类编码")
     private String classCode;
 
-    @ApiModelProperty(value = "分组条件", required = true)
-    @NotBlank(message = "查询条件缺少分组条件")
+    @ApiModelProperty(value = "分组条件")
     private String condition;
 }