Browse Source

修改项目报警屏蔽对象管理

xujiaheng 3 years ago
parent
commit
5ed4f986c3

+ 3 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/controller/ProjectAlarmRuleController.java

@@ -126,7 +126,9 @@ public class ProjectAlarmRuleController {
             String equipName = pageQueryProjectAlarmRuleDTO.getEquipName();
             if (StringUtils.isNotBlank(equipName)) {
                 for (ProjectAlarmRuleObjRel projectAlarmRuleObjRel : query) {
-                    if (StringUtils.isNotBlank(projectAlarmRuleObjRel.getObjName()) && projectAlarmRuleObjRel.getObjName().equals(equipName)) {
+                    if (StringUtils.isNotBlank(projectAlarmRuleObjRel.getObjName())
+                            && projectAlarmRuleObjRel.getObjName().equals(equipName)
+                            && projectAlarmRuleObjRel.getOpen() == 1) {
                         projectAlarmRuleListItemVO.setRelListItemList(query);
                         result.add(projectAlarmRuleListItemVO);
                     }

+ 1 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -538,6 +538,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         queryWrapper.eq(ProjectAlarmRule.PROP_GROUP_ID, queryRuleObjRelDTO.getGroupId());
         queryWrapper.eq(ProjectAlarmRule.PROP_ALARM_ITEM_CODE, queryRuleObjRelDTO.getAlarmItemCode());
         queryWrapper.eq(ProjectAlarmRule.PROP_PROJECT_ID, queryRuleObjRelDTO.getProjectId());
+        queryWrapper.eq(ProjectAlarmRule.PROP_VALID, ValidEnum.TRUE.getType());
         List<ProjectAlarmRule> list = list(queryWrapper);
         List<String> idList = list.stream().map(ProjectAlarmRule::getId).collect(Collectors.toList());
         return idList;

+ 3 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/impl/ProjectAlarmRuleObjRelServiceImpl.java

@@ -396,6 +396,8 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
             //修改
             QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, queryRuleObjRelDTO.getProjectAlarmRuleId());
+            queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
+            queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
             List<ProjectAlarmRuleObjRel> relList = list(queryWrapper);
             resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(relList);
 
@@ -424,6 +426,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
         for (String projectAlarmRuleId : projectAlarmRuleIdList) {
             QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleId);
+            queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
             list.addAll(list(queryWrapper));
 
         }