Browse Source

修改项目报警

xujiaheng 3 years ago
parent
commit
31f0bf78e2

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

@@ -108,9 +108,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         save(projectAlarmRule);
 
         List<ProjectAlarmRuleObjRel> addEquipList = addProjectAlarmRuleDTO.getAddEquipList();
-        addEquipList.forEach(addEquip -> {
-            addEquip.setProjectAlarmRuleId(projectAlarmRule.getId());
-        });
+        addEquipList.forEach(addEquip -> addEquip.setProjectAlarmRuleId(projectAlarmRule.getId()));
         //保存报警对象
         projectAlarmRuleObjRelService.saveProjectAlarmRule(addEquipList);
         //保存中台规则
@@ -493,23 +491,15 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         String classCode = addGroupAlarmRuleDTO.getClassCode();
         //查询所有项目
         List<ProjectVO> projects = this.getProject();
-        List<EquipItem> records = new ArrayList<>();
-        for (ProjectVO project : projects) {
-            QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
-            queryEquipDTO.setProjectId("Pj" + project.getProjectId());
-            queryEquipDTO.setClassCode(classCode);
-            queryEquipDTO.setCondition(condition);
-            List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
-            records.addAll(record);
-        }
         //遍历项目,组好对象进行插入
         List<ProjectAlarmRule> projectAlarmRuleList = new ArrayList<>();
         String alarmItemCode = addGroupAlarmRuleDTO.getAlarmItemCode();
         String alarmItemName = addGroupAlarmRuleDTO.getAlarmItemName();
         List<AddProjectAlarmRuleObjRelDTO> addRelationList = new ArrayList<>();
         for (ProjectVO project : projects) {
+            String projectId = "Pj" + project.getProjectId();
             ProjectAlarmRule projectAlarmRule = new ProjectAlarmRule();
-            projectAlarmRule.setProjectId("Pj" + project.getProjectId());
+            projectAlarmRule.setProjectId(projectId);
             projectAlarmRule.setAlarmItemCode(alarmItemCode);
             projectAlarmRule.setAlarmItemName(alarmItemName);
             projectAlarmRule.setBelong(INTEGER_ONE);
@@ -520,12 +510,17 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
             setDefaultValue(projectAlarmRule);
             projectAlarmRuleList.add(projectAlarmRule);
             //新增关联关系
+            QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
+            queryEquipDTO.setProjectId(projectId);
+            queryEquipDTO.setClassCode(classCode);
+            queryEquipDTO.setCondition(condition);
+            List<EquipItem> records = groupManagementService.getEquipList(queryEquipDTO);
             for (EquipItem record : records) {
                 AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO = new AddProjectAlarmRuleObjRelDTO();
                 addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(projectAlarmRule.getId());
-                addProjectAlarmRuleObjRelDTO.setProjectId("Pj" + project.getProjectId());
+                addProjectAlarmRuleObjRelDTO.setProjectId(projectId);
                 addProjectAlarmRuleObjRelDTO.setObjId(record.getId());
-                addProjectAlarmRuleObjRelDTO.setObjName(record.getName());
+                addProjectAlarmRuleObjRelDTO.setObjName(record.getLocalName());
                 addProjectAlarmRuleObjRelDTO.setOpen(INTEGER_ONE);
                 addRelationList.add(addProjectAlarmRuleObjRelDTO);
             }

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

@@ -395,7 +395,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
             if (!partitionMap.containsKey(id)) {
                 ProjectAlarmRuleObjRel projectAlarmRuleObjRelVO = new ProjectAlarmRuleObjRel();
                 projectAlarmRuleObjRelVO.setObjId(record.getId());
-                projectAlarmRuleObjRelVO.setObjName(record.getName());
+                projectAlarmRuleObjRelVO.setObjName(record.getLocalName());
                 resultList.add(projectAlarmRuleObjRelVO);
             }
         }