|
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.persagy.apm.alarmservice.common.configuration.rabbitmq.RabbitMsgSender;
|
|
|
import com.persagy.apm.alarmservice.common.jms.JmsSender;
|
|
|
import com.persagy.apm.alarmservice.common.util.DataUtils;
|
|
|
import com.persagy.apm.alarmservice.group.alarmrule.model.GroupAlarmRule;
|
|
@@ -35,15 +34,13 @@ import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlar
|
|
|
import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
|
import com.persagy.apm.common.context.AppContext;
|
|
|
import com.persagy.apm.common.context.poems.PoemsContext;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.*;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
@@ -103,54 +100,54 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
//存储项目报警
|
|
|
save(projectAlarmRule);
|
|
|
|
|
|
- List<ProjectAlarmRuleObjRel> addEquipList = addProjectAlarmRuleDTO.getAddEquipList();
|
|
|
- addEquipList.forEach(addEquip -> {
|
|
|
+ List<ProjectAlarmRuleObjRel> alarmRuleObjRels = addProjectAlarmRuleDTO.getAddEquipList();
|
|
|
+ alarmRuleObjRels.forEach(addEquip -> {
|
|
|
addEquip.setProjectAlarmRuleId(projectAlarmRule.getId());
|
|
|
addEquip.setProjectId(addProjectAlarmRuleDTO.getProjectId());
|
|
|
});
|
|
|
- //保存报警对象
|
|
|
- projectAlarmRuleObjRelService.saveProjectAlarmRule(addEquipList);
|
|
|
+ // 保存报警对象与规则的关联关系
|
|
|
+ projectAlarmRuleObjRelService.saveObjRuleRels(alarmRuleObjRels);
|
|
|
|
|
|
// 勿删后续可能启用 lixing
|
|
|
-// //保存中台规则
|
|
|
-// BatchAddAlarmConfigDTO batchAddAlarmConfigDTO = new BatchAddAlarmConfigDTO();
|
|
|
-// List<AddAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
-// for (ProjectAlarmRuleObjRel ProjectAlarmRuleObjRel : addEquipList) {
|
|
|
-// AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
|
|
|
-// String equipId = ProjectAlarmRuleObjRel.getObjId();
|
|
|
-// addAlarmConfigDTO.setObjId(equipId);
|
|
|
-// addAlarmConfigDTO.setItemCode(addProjectAlarmRuleDTO.getAlarmItemCode());
|
|
|
-// addAlarmConfigDTO.setClassCode(addProjectAlarmRuleDTO.getClassCode());
|
|
|
-// addAlarmConfigDTO.setLevel(alarmConditionDTO.getAlarmLevel());
|
|
|
-// addAlarmConfigDTO.setCategory("Eqdx");
|
|
|
-// addAlarmConfigDTO.setOpen(1);
|
|
|
-// AlarmCondition equipCondition = new AlarmCondition();
|
|
|
-// List<String> infoCodeList = (List<String>) alarmConditionMap.get("infoCode");
|
|
|
-// List<String> infoCodeNew = new ArrayList<>();
|
|
|
-// for (String infoCode : infoCodeList) {
|
|
|
-// String replacement = equipId + "_" + infoCode;
|
|
|
-// infoCodeNew.add(infoCode.replaceAll(infoCode, replacement));
|
|
|
-// }
|
|
|
-// equipCondition.setInfoCode(infoCodeNew);
|
|
|
-// String backend = (String) alarmConditionMap.get("backend");
|
|
|
-// for (String infoCode : infoCodeList) {
|
|
|
-// String replacement = equipId + "_" + infoCode;
|
|
|
-// backend = backend.replaceAll(infoCode, replacement);
|
|
|
-// }
|
|
|
-// equipCondition.setEnd("!" + backend);
|
|
|
-// equipCondition.setEndUphold(0);
|
|
|
-// equipCondition.setTrigger(backend);
|
|
|
-// equipCondition.setTriggerUphold(alarmConditionDTO.getTriggerUphold() * 60);
|
|
|
-// equipCondition.setRules((List<String>) alarmConditionMap.get("displayFormula"));
|
|
|
-// JSONArray configs = JSONArray.parseArray(JSON.toJSONString(alarmConditionDTO.getFrontend()));
|
|
|
-// equipCondition.setConfigs(configs);
|
|
|
-// AlarmEffectTime effectTime = new AlarmEffectTime();
|
|
|
-// effectTime.setType("always");
|
|
|
-// equipCondition.setEffectTime(effectTime);
|
|
|
-// addAlarmConfigDTO.setCondition(equipCondition);
|
|
|
-// alarmConfigs.add(addAlarmConfigDTO);
|
|
|
-// }
|
|
|
-// sendBatchCreateAlarmConfigMsg(alarmConfigs, addProjectAlarmRuleDTO.getProjectId());
|
|
|
+ // //保存中台规则
|
|
|
+ // BatchAddAlarmConfigDTO batchAddAlarmConfigDTO = new BatchAddAlarmConfigDTO();
|
|
|
+ // List<AddAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
+ // for (ProjectAlarmRuleObjRel ProjectAlarmRuleObjRel : alarmRuleObjRels) {
|
|
|
+ // AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
|
|
|
+ // String equipId = ProjectAlarmRuleObjRel.getObjId();
|
|
|
+ // addAlarmConfigDTO.setObjId(equipId);
|
|
|
+ // addAlarmConfigDTO.setItemCode(addProjectAlarmRuleDTO.getAlarmItemCode());
|
|
|
+ // addAlarmConfigDTO.setClassCode(addProjectAlarmRuleDTO.getClassCode());
|
|
|
+ // addAlarmConfigDTO.setLevel(alarmConditionDTO.getAlarmLevel());
|
|
|
+ // addAlarmConfigDTO.setCategory("Eqdx");
|
|
|
+ // addAlarmConfigDTO.setOpen(1);
|
|
|
+ // AlarmCondition equipCondition = new AlarmCondition();
|
|
|
+ // List<String> infoCodeList = (List<String>) alarmConditionMap.get("infoCode");
|
|
|
+ // List<String> infoCodeNew = new ArrayList<>();
|
|
|
+ // for (String infoCode : infoCodeList) {
|
|
|
+ // String replacement = equipId + "_" + infoCode;
|
|
|
+ // infoCodeNew.add(infoCode.replaceAll(infoCode, replacement));
|
|
|
+ // }
|
|
|
+ // equipCondition.setInfoCode(infoCodeNew);
|
|
|
+ // String backend = (String) alarmConditionMap.get("backend");
|
|
|
+ // for (String infoCode : infoCodeList) {
|
|
|
+ // String replacement = equipId + "_" + infoCode;
|
|
|
+ // backend = backend.replaceAll(infoCode, replacement);
|
|
|
+ // }
|
|
|
+ // equipCondition.setEnd("!" + backend);
|
|
|
+ // equipCondition.setEndUphold(0);
|
|
|
+ // equipCondition.setTrigger(backend);
|
|
|
+ // equipCondition.setTriggerUphold(alarmConditionDTO.getTriggerUphold() * 60);
|
|
|
+ // equipCondition.setRules((List<String>) alarmConditionMap.get("displayFormula"));
|
|
|
+ // JSONArray configs = JSONArray.parseArray(JSON.toJSONString(alarmConditionDTO.getFrontend()));
|
|
|
+ // equipCondition.setConfigs(configs);
|
|
|
+ // AlarmEffectTime effectTime = new AlarmEffectTime();
|
|
|
+ // effectTime.setType("always");
|
|
|
+ // equipCondition.setEffectTime(effectTime);
|
|
|
+ // addAlarmConfigDTO.setCondition(equipCondition);
|
|
|
+ // alarmConfigs.add(addAlarmConfigDTO);
|
|
|
+ // }
|
|
|
+ // sendBatchCreateAlarmConfigMsg(alarmConfigs, addProjectAlarmRuleDTO.getProjectId());
|
|
|
return projectAlarmRule.getId();
|
|
|
}
|
|
|
|
|
@@ -230,9 +227,10 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
projectAlarmRule.setModifiedTime(new Date());
|
|
|
projectAlarmRule.setModifier(PoemsContext.getContext().getUserId());
|
|
|
projectAlarmRule.setBelong(updateProjectAlarmRuleDTO.getBelong());
|
|
|
+ // 前面更新报警条件已经发送了消息,这里更新报警规则不需要再发送消息
|
|
|
updateById(projectAlarmRule);
|
|
|
// 根据报警规则删除规则与设备关联关系并发送mq消息
|
|
|
- deleteAndSendMsgByRuleId(updateProjectAlarmRuleDTO.getId());
|
|
|
+ deleteRelsAndSendMsgByRuleId(updateProjectAlarmRuleDTO.getId());
|
|
|
//新增关联关系
|
|
|
List<UpdateAlarmItemDTO> addRelationList = updateProjectAlarmRuleDTO.getAddEquipList();
|
|
|
String projectId = updateProjectAlarmRuleDTO.getProjectId();
|
|
@@ -240,49 +238,49 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
List<AddProjectAlarmRuleObjRelDTO> addRelations = convert2AddProjectAlarmRuleObjRelDTO(addRelationList, id, projectId);
|
|
|
projectAlarmRuleObjRelService.createBatchRelation(addRelations);
|
|
|
// 勿删后续可能启用 lixing
|
|
|
-// String condition = updateProjectAlarmRuleDTO.getCondition();
|
|
|
-// String classCode = updateProjectAlarmRuleDTO.getClassCode();
|
|
|
-// String alarmItemCode = updateProjectAlarmRuleDTO.getAlarmItemCode();
|
|
|
-// //删除中台报警条件
|
|
|
-// groupAlarmRuleService.deleteEquipCondition(condition, classCode, alarmItemCode);
|
|
|
-// //新增中台报警条件
|
|
|
-// List<AddAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
-// for (AddProjectAlarmRuleObjRelDTO equipRel : addRelations) {
|
|
|
-// AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
|
|
|
-// String equipId = equipRel.getObjId();
|
|
|
-// addAlarmConfigDTO.setObjId(equipId);
|
|
|
-// addAlarmConfigDTO.setItemCode(alarmItemCode);
|
|
|
-// addAlarmConfigDTO.setClassCode(classCode);
|
|
|
-// addAlarmConfigDTO.setLevel(alarmCondition.getAlarmLevel());
|
|
|
-// addAlarmConfigDTO.setCategory("Eqdx");
|
|
|
-// addAlarmConfigDTO.setOpen(1);
|
|
|
-// AlarmCondition equipCondition = new AlarmCondition();
|
|
|
-// List<String> infoCodeList = (List<String>) conditionMap.get("infoCode");
|
|
|
-// List<String> infoCodeNew = new ArrayList<>();
|
|
|
-// for (String infoCode : infoCodeList) {
|
|
|
-// String replacement = equipId + "_" + infoCode;
|
|
|
-// infoCodeNew.add(infoCode.replaceAll(infoCode, replacement));
|
|
|
-// }
|
|
|
-// equipCondition.setInfoCode(infoCodeNew);
|
|
|
-// String backend = (String) conditionMap.get("backend");
|
|
|
-// for (String infoCode : infoCodeList) {
|
|
|
-// String replacement = equipId + "_" + infoCode;
|
|
|
-// backend = backend.replaceAll(infoCode, replacement);
|
|
|
-// }
|
|
|
-// equipCondition.setEnd("!" + backend);
|
|
|
-// equipCondition.setEndUphold(0);
|
|
|
-// equipCondition.setTrigger(backend);
|
|
|
-// equipCondition.setTriggerUphold(alarmCondition.getTriggerUphold() * 60);
|
|
|
-// equipCondition.setRules((List<String>) conditionMap.get("displayFormula"));
|
|
|
-// JSONArray configs = JSONArray.parseArray(JSON.toJSONString(alarmCondition.getFrontend()));
|
|
|
-// equipCondition.setConfigs(configs);
|
|
|
-// AlarmEffectTime effectTime = new AlarmEffectTime();
|
|
|
-// effectTime.setType("always");
|
|
|
-// equipCondition.setEffectTime(effectTime);
|
|
|
-// addAlarmConfigDTO.setCondition(equipCondition);
|
|
|
-// alarmConfigs.add(addAlarmConfigDTO);
|
|
|
-// }
|
|
|
-// sendBatchCreateAlarmConfigMsg(alarmConfigs, projectId);
|
|
|
+ // String condition = updateProjectAlarmRuleDTO.getCondition();
|
|
|
+ // String classCode = updateProjectAlarmRuleDTO.getClassCode();
|
|
|
+ // String alarmItemCode = updateProjectAlarmRuleDTO.getAlarmItemCode();
|
|
|
+ // //删除中台报警条件
|
|
|
+ // groupAlarmRuleService.deleteEquipCondition(condition, classCode, alarmItemCode);
|
|
|
+ // //新增中台报警条件
|
|
|
+ // List<AddAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
+ // for (AddProjectAlarmRuleObjRelDTO equipRel : addRelations) {
|
|
|
+ // AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
|
|
|
+ // String equipId = equipRel.getObjId();
|
|
|
+ // addAlarmConfigDTO.setObjId(equipId);
|
|
|
+ // addAlarmConfigDTO.setItemCode(alarmItemCode);
|
|
|
+ // addAlarmConfigDTO.setClassCode(classCode);
|
|
|
+ // addAlarmConfigDTO.setLevel(alarmCondition.getAlarmLevel());
|
|
|
+ // addAlarmConfigDTO.setCategory("Eqdx");
|
|
|
+ // addAlarmConfigDTO.setOpen(1);
|
|
|
+ // AlarmCondition equipCondition = new AlarmCondition();
|
|
|
+ // List<String> infoCodeList = (List<String>) conditionMap.get("infoCode");
|
|
|
+ // List<String> infoCodeNew = new ArrayList<>();
|
|
|
+ // for (String infoCode : infoCodeList) {
|
|
|
+ // String replacement = equipId + "_" + infoCode;
|
|
|
+ // infoCodeNew.add(infoCode.replaceAll(infoCode, replacement));
|
|
|
+ // }
|
|
|
+ // equipCondition.setInfoCode(infoCodeNew);
|
|
|
+ // String backend = (String) conditionMap.get("backend");
|
|
|
+ // for (String infoCode : infoCodeList) {
|
|
|
+ // String replacement = equipId + "_" + infoCode;
|
|
|
+ // backend = backend.replaceAll(infoCode, replacement);
|
|
|
+ // }
|
|
|
+ // equipCondition.setEnd("!" + backend);
|
|
|
+ // equipCondition.setEndUphold(0);
|
|
|
+ // equipCondition.setTrigger(backend);
|
|
|
+ // equipCondition.setTriggerUphold(alarmCondition.getTriggerUphold() * 60);
|
|
|
+ // equipCondition.setRules((List<String>) conditionMap.get("displayFormula"));
|
|
|
+ // JSONArray configs = JSONArray.parseArray(JSON.toJSONString(alarmCondition.getFrontend()));
|
|
|
+ // equipCondition.setConfigs(configs);
|
|
|
+ // AlarmEffectTime effectTime = new AlarmEffectTime();
|
|
|
+ // effectTime.setType("always");
|
|
|
+ // equipCondition.setEffectTime(effectTime);
|
|
|
+ // addAlarmConfigDTO.setCondition(equipCondition);
|
|
|
+ // alarmConfigs.add(addAlarmConfigDTO);
|
|
|
+ // }
|
|
|
+ // sendBatchCreateAlarmConfigMsg(alarmConfigs, projectId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -292,10 +290,11 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
* @author lixing
|
|
|
* @version V1.0 2021/10/26 5:38 下午
|
|
|
*/
|
|
|
- private void deleteAndSendMsgByRuleId(String ruleId) {
|
|
|
+ private void deleteRelsAndSendMsgByRuleId(String ruleId) {
|
|
|
jmsSender.sendRemoveObjConditionRelListMsg(ruleId);
|
|
|
projectAlarmRuleObjRelMapper.deleteByProjectAlarmRuleId(ruleId);
|
|
|
}
|
|
|
+
|
|
|
private List<AddProjectAlarmRuleObjRelDTO> convert2AddProjectAlarmRuleObjRelDTO(List<UpdateAlarmItemDTO> addRelationList, String id, String projectId) {
|
|
|
List<AddProjectAlarmRuleObjRelDTO> list = new ArrayList<>();
|
|
|
for (UpdateAlarmItemDTO updateAlarmItemDTO : addRelationList) {
|
|
@@ -349,9 +348,9 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void deleteProjectAlarmRule(DeleteProjectAlarmRuleDTO deleteProjectAlarmRuleDTO) throws Exception {
|
|
|
+ public void deleteProjectAlarmRule(String ruleId) throws Exception {
|
|
|
// 校验是否可删除
|
|
|
- ProjectAlarmRule projectAlarmRule = checkDeletable(deleteProjectAlarmRuleDTO.getId());
|
|
|
+ ProjectAlarmRule projectAlarmRule = checkDeletable(ruleId);
|
|
|
projectAlarmRule.setValid(ValidEnum.FALSE.getType());
|
|
|
updateById(projectAlarmRule);
|
|
|
//查询是否是自定义报警,是则删除自定义规则
|
|
@@ -361,31 +360,31 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
}
|
|
|
//删除项目报警规则与监测对象的关联
|
|
|
projectAlarmRuleObjRelService.deleteRelation(projectAlarmRule.getId());
|
|
|
-// //删除设备报警条件 begin
|
|
|
-// BatchDeleteAlarmConfigDTO batchDeleteAlarmConfigDTO = new BatchDeleteAlarmConfigDTO();
|
|
|
-// List<DeleteAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
-// String condition = deleteProjectAlarmRuleDTO.getCondition();
|
|
|
-// String classCode = deleteProjectAlarmRuleDTO.getClassCode();
|
|
|
-// String projectId = deleteProjectAlarmRuleDTO.getProjectId();
|
|
|
-// //查询所有设备
|
|
|
-// List<EquipItem> equips = this.getAllEquip(classCode, condition, projectId);
|
|
|
-// List<String> objIds = equips.stream().map(EquipItem::getId).collect(Collectors.toList());
|
|
|
-// QueryAlarmConfigDTO queryAlarmConfigDTO = new QueryAlarmConfigDTO();
|
|
|
-// queryAlarmConfigDTO.setObjId(objIds);
|
|
|
-// DmpResult<List<AlarmConfigItem>> query = alarmConfigService.query(queryAlarmConfigDTO);
|
|
|
-// //所有设备条件
|
|
|
-// List<AlarmConfigItem> data = query.getData();
|
|
|
-// //组织删除参数
|
|
|
-// if (data.size() > 0) {
|
|
|
-// data.forEach(alarmConfigItem -> {
|
|
|
-// DeleteAlarmConfigDTO deleteAlarmConfigDTO = new DeleteAlarmConfigDTO();
|
|
|
-// deleteAlarmConfigDTO.setId(alarmConfigItem.getId());
|
|
|
-// alarmConfigs.add(deleteAlarmConfigDTO);
|
|
|
-// });
|
|
|
-// batchDeleteAlarmConfigDTO.setAlarmConfigs(alarmConfigs);
|
|
|
-// alarmConfigService.batchDelete(batchDeleteAlarmConfigDTO);
|
|
|
-// }
|
|
|
-// //删除设备报警条件 end
|
|
|
+ // //删除设备报警条件 begin
|
|
|
+ // BatchDeleteAlarmConfigDTO batchDeleteAlarmConfigDTO = new BatchDeleteAlarmConfigDTO();
|
|
|
+ // List<DeleteAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
+ // String condition = deleteProjectAlarmRuleDTO.getCondition();
|
|
|
+ // String classCode = deleteProjectAlarmRuleDTO.getClassCode();
|
|
|
+ // String projectId = deleteProjectAlarmRuleDTO.getProjectId();
|
|
|
+ // //查询所有设备
|
|
|
+ // List<EquipItem> equips = this.getAllEquip(classCode, condition, projectId);
|
|
|
+ // List<String> objIds = equips.stream().map(EquipItem::getId).collect(Collectors.toList());
|
|
|
+ // QueryAlarmConfigDTO queryAlarmConfigDTO = new QueryAlarmConfigDTO();
|
|
|
+ // queryAlarmConfigDTO.setObjId(objIds);
|
|
|
+ // DmpResult<List<AlarmConfigItem>> query = alarmConfigService.query(queryAlarmConfigDTO);
|
|
|
+ // //所有设备条件
|
|
|
+ // List<AlarmConfigItem> data = query.getData();
|
|
|
+ // //组织删除参数
|
|
|
+ // if (data.size() > 0) {
|
|
|
+ // data.forEach(alarmConfigItem -> {
|
|
|
+ // DeleteAlarmConfigDTO deleteAlarmConfigDTO = new DeleteAlarmConfigDTO();
|
|
|
+ // deleteAlarmConfigDTO.setId(alarmConfigItem.getId());
|
|
|
+ // alarmConfigs.add(deleteAlarmConfigDTO);
|
|
|
+ // });
|
|
|
+ // batchDeleteAlarmConfigDTO.setAlarmConfigs(alarmConfigs);
|
|
|
+ // alarmConfigService.batchDelete(batchDeleteAlarmConfigDTO);
|
|
|
+ // }
|
|
|
+ // //删除设备报警条件 end
|
|
|
}
|
|
|
|
|
|
private List<EquipItem> getAllEquip(String classCode, String condition, String projectId) {
|
|
@@ -517,7 +516,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
// 按项目批量保存
|
|
|
saveBatch(projectAlarmRuleList);
|
|
|
projectAlarmRuleObjRelService.createBatchRelation(addRelationList);
|
|
|
- count ++;
|
|
|
+ count++;
|
|
|
log.info("已完成{}个项目的报警规则创建, 剩余{}个项目的报警规则待创建", count, projects.size() - count);
|
|
|
}
|
|
|
}
|
|
@@ -545,34 +544,36 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
}
|
|
|
|
|
|
// 勿删后续可能启用 lixing
|
|
|
-// @Override
|
|
|
-// public void sendBatchCreateAlarmConfigMsg(List<AddAlarmConfigDTO> alarmConfigs, String projectId) {
|
|
|
-// if (CollectionUtils.isEmpty(alarmConfigs)) {
|
|
|
-// return;
|
|
|
-// }
|
|
|
-// DmpMessage dmpMessage = new DmpMessage();
|
|
|
-// dmpMessage.setGroupCode(PoemsContext.getContext().getGroupCode());
|
|
|
-// dmpMessage.setProjectId(projectId);
|
|
|
-// dmpMessage.setUserId(PoemsContext.getContext().getUserId());
|
|
|
-// dmpMessage.setAppId("energy-alarm-service");
|
|
|
-// dmpMessage.setType("alarmConfigBatchCreate");
|
|
|
-// JSONObject exts = new JSONObject();
|
|
|
-// exts.put("alarmConfigs", alarmConfigs);
|
|
|
-// dmpMessage.setExts(exts);
|
|
|
-// rabbitMsgSender.convertAndSend(dmpMessage);
|
|
|
-// }
|
|
|
+ // @Override
|
|
|
+ // public void sendBatchCreateAlarmConfigMsg(List<AddAlarmConfigDTO> alarmConfigs, String projectId) {
|
|
|
+ // if (CollectionUtils.isEmpty(alarmConfigs)) {
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // DmpMessage dmpMessage = new DmpMessage();
|
|
|
+ // dmpMessage.setGroupCode(PoemsContext.getContext().getGroupCode());
|
|
|
+ // dmpMessage.setProjectId(projectId);
|
|
|
+ // dmpMessage.setUserId(PoemsContext.getContext().getUserId());
|
|
|
+ // dmpMessage.setAppId("energy-alarm-service");
|
|
|
+ // dmpMessage.setType("alarmConfigBatchCreate");
|
|
|
+ // JSONObject exts = new JSONObject();
|
|
|
+ // exts.put("alarmConfigs", alarmConfigs);
|
|
|
+ // dmpMessage.setExts(exts);
|
|
|
+ // rabbitMsgSender.convertAndSend(dmpMessage);
|
|
|
+ // }
|
|
|
|
|
|
@Override
|
|
|
- public void deleteBatch(GroupAlarmRule groupAlarmRule) {
|
|
|
+ public void deleteBatchByGroupRule(GroupAlarmRule groupAlarmRule) throws Exception{
|
|
|
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> projectAlarmRuleList = list(queryWrapper);
|
|
|
- projectAlarmRuleObjRelService.deleteBatch(projectAlarmRuleList);
|
|
|
- ProjectAlarmRule projectAlarmRule = new ProjectAlarmRule();
|
|
|
- projectAlarmRule.setValid(ValidEnum.FALSE.getType());
|
|
|
- update(projectAlarmRule, queryWrapper);
|
|
|
+ if (CollectionUtils.isEmpty(projectAlarmRuleList)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (ProjectAlarmRule projectAlarmRule : projectAlarmRuleList) {
|
|
|
+ deleteProjectAlarmRule(projectAlarmRule.getId());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|