فهرست منبع

修改报警对象

xujiaheng 3 سال پیش
والد
کامیت
b5b26b23ff

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

@@ -382,10 +382,12 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
         List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
         QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, projectId);
-        if(projectAlarmRuleIdList.size()>0)
-        queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleIdList);
+        if (projectAlarmRuleIdList.size() > 0)
+            queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleIdList);
         queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
-        queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
+        //新增项目报警,要把屏蔽的查出来
+        if (StringUtils.isBlank(queryRuleObjRelDTO.getProjectAlarmRuleId()))
+            queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
         List<ProjectAlarmRuleObjRel> list = list(queryWrapper);
         Map<String, ProjectAlarmRuleObjRel> partitionMap = list.stream().collect(Collectors.toMap(ProjectAlarmRuleObjRel::getObjId, equip -> equip, (k1, k2) -> k1));