Browse Source

项目编码加Pj

xujiaheng 3 years ago
parent
commit
8583948e56

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

@@ -379,6 +379,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
 //        GroupAlarmRule groupAlarmRule = getGroupAlarmRule(getGroupAlarmRuleDTO);
         this.deleteGroupAlarmRule(groupRuleId);
         alarmConditionService.deleteAlarmCondition(deleteGroupAlarmRuleDTO.getAlarmConditionId());
+        projectAlarmRuleService.deleteBatch(groupAlarmRule);
         projectAlarmRuleObjRelService.deleteBatch();
         String condition = deleteGroupAlarmRuleDTO.getCondition();
         String classCode = deleteGroupAlarmRuleDTO.getClassCode();
@@ -462,6 +463,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
     public List<GroupAlarmRule> getExistAlarmItem(String groupId) {
         QueryWrapper<GroupAlarmRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(GroupAlarmRule.PROP_GROUP_ID, groupId);
+        queryWrapper.eq(GroupAlarmRule.PROP_VALID, ValidEnum.TRUE.getType());
         return list(queryWrapper);
     }
 }

+ 3 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/IProjectAlarmRuleService.java

@@ -1,6 +1,7 @@
 package com.persagy.apm.alarmservice.project.alarmrule.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
 import com.persagy.apm.alarmservice.group.alarmrule.model.dto.AddGroupAlarmRuleDTO;
 import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
 import com.persagy.apm.alarmservice.project.alarmrule.model.dto.*;
@@ -100,4 +101,6 @@ public interface IProjectAlarmRuleService  {
      * @version V1.0 2021/10/11 8:38 下午
      */
     void sendBatchCreateAlarmConfigMsg(List<AddAlarmConfigDTO> alarmConfigs, String projectId);
+
+    void deleteBatch(GroupAlarmRule groupAlarmRule);
 }

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

@@ -570,6 +570,18 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         rabbitMsgSender.convertAndSend(dmpMessage);
     }
 
+    @Override
+    public void deleteBatch(GroupAlarmRule groupAlarmRule) {
+        QueryWrapper<ProjectAlarmRule> queryWrapper = new QueryWrapper<>();
+        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);
+        ProjectAlarmRule projectAlarmRule = new ProjectAlarmRule();
+        projectAlarmRule.setValid(ValidEnum.FALSE.getType());
+        update(projectAlarmRule,queryWrapper);
+    }
+
     /**
      * 利用subList方法进行分页
      *

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

@@ -326,6 +326,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
     public void deleteBatch() {
         List<ProjectVO> project = projectAlarmRuleService.getProject();
         List<String> list = project.stream().map(ProjectVO::getProjectId).collect(Collectors.toList());
+        list.forEach(projectId-> projectId = "Pj" +projectId);
         QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
         queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, list);
         ProjectAlarmRuleObjRel projectAlarmRuleObjRel = new ProjectAlarmRuleObjRel();