xujiaheng пре 3 година
родитељ
комит
8bd36627f6

+ 1 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/controller/GroupAlarmRuleController.java

@@ -168,6 +168,7 @@ public class GroupAlarmRuleController {
     @PostMapping("/getAlarmItem")
     public CommonResult<PageList<SimpleObjVO>> getAlarmItem(@RequestBody CheckAlarmItemDTO checkAlarmItemDTO) throws Exception {
         QueryAlarmItemDTO queryAlarmItemDTO = new QueryAlarmItemDTO();
+        queryAlarmItemDTO.setCategory(checkAlarmItemDTO.getCategory());
         DmpResult<List<AlarmItem>> dmpResult = alarmItemService.query(queryAlarmItemDTO);
         List<GroupAlarmRule> existAlarmItem = groupAlarmRuleService.getExistAlarmItem(checkAlarmItemDTO.getGroupId());
         List<String> alarmItemCodes = existAlarmItem.stream().map(GroupAlarmRule::getAlarmItemCode).collect(Collectors.toList());

+ 5 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/dto/CheckAlarmItemDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @author lixing
@@ -18,5 +19,9 @@ public class CheckAlarmItemDTO {
     @ApiModelProperty(value = "分组id", required = true)
     @NotNull(message = "分组id不能为空") // todo 更新校验规则
     private String groupId;
+
+    @ApiModelProperty(value = "category", required = true)
+
+    private List<String> category;
     
 }