Browse Source

修改集团报警规则删除影响项目报警规则与设备关联关系问题

lixing 3 years ago
parent
commit
a1dadfd921

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

@@ -389,7 +389,6 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
         this.deleteGroupAlarmRule(groupRuleId);
         alarmConditionService.deleteAlarmCondition(deleteGroupAlarmRuleDTO.getAlarmConditionId());
         projectAlarmRuleService.deleteBatch(groupAlarmRule);
-        projectAlarmRuleObjRelService.deleteBatch();
         String condition = deleteGroupAlarmRuleDTO.getCondition();
         String classCode = deleteGroupAlarmRuleDTO.getClassCode();
         deleteEquipCondition(condition, classCode, groupAlarmRule.getAlarmItemCode());

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

@@ -568,7 +568,8 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         queryWrapper.eq(ProjectAlarmRule.PROP_GROUP_ID, groupAlarmRule.getGroupId());
         queryWrapper.eq(ProjectAlarmRule.PROP_ALARM_ITEM_CODE, groupAlarmRule.getAlarmItemCode());
         queryWrapper.eq(ProjectAlarmRule.PROP_ALARM_CONDITION_ID, groupAlarmRule.getAlarmConditionId());
-        List<ProjectAlarmRule> list = list(queryWrapper);
+        List<ProjectAlarmRule> projectAlarmRuleList = list(queryWrapper);
+        projectAlarmRuleObjRelService.deleteBatch(projectAlarmRuleList);
         ProjectAlarmRule projectAlarmRule = new ProjectAlarmRule();
         projectAlarmRule.setValid(ValidEnum.FALSE.getType());
         update(projectAlarmRule, queryWrapper);

+ 3 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/IProjectAlarmRuleObjRelService.java

@@ -1,5 +1,7 @@
 package com.persagy.apm.alarmservice.project.alarmruleobjrel.service;
 
+import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
+import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
 import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.*;
 import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.*;
 import java.util.List;
@@ -82,7 +84,7 @@ public interface IProjectAlarmRuleObjRelService  {
 
     void updateBatch(ShieldManageListDTO shieldManageListDTO) throws Exception;
 
-    void deleteBatch();
+    void deleteBatch(List<ProjectAlarmRule> projectAlarmRuleList);
 
     List<ProjectAlarmRuleObjRel> queryShieldManage(QueryShieldManageDTO queryShieldManageDTO);
 

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

@@ -8,6 +8,7 @@ import com.google.common.base.CaseFormat;
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.persagy.apm.alarmservice.common.jms.JmsSender;
+import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
 import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
 import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
@@ -324,11 +325,9 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
     }
 
     @Override
-    public void deleteBatch() {
-        List<ProjectVO> project = projectAlarmRuleService.getProject();
-        List<String> list = project.stream().map(ProjectVO::getProjectId).collect(Collectors.toList());
+    public void deleteBatch(List<ProjectAlarmRule> projectAlarmRuleList) {
         QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, list);
+        queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleList);
         ProjectAlarmRuleObjRel projectAlarmRuleObjRel = new ProjectAlarmRuleObjRel();
         projectAlarmRuleObjRel.setValid(ValidEnum.FALSE.getType());
         update(projectAlarmRuleObjRel, queryWrapper);