|
@@ -97,15 +97,24 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
|
List<AddAlarmConfigDTO> alarmConfigs = new ArrayList<>();
|
|
|
for (AddProjectAlarmRuleObjRelDTO addProjectAlarmRuleObjRelDTO : addProjectAlarmRuleObjRelDTOS) {
|
|
|
AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
|
|
|
- addAlarmConfigDTO.setObjId(addProjectAlarmRuleObjRelDTO.getEquipId());
|
|
|
+ String equipId = addProjectAlarmRuleObjRelDTO.getEquipId();
|
|
|
+ addAlarmConfigDTO.setObjId(equipId);
|
|
|
addAlarmConfigDTO.setItemCode(addGroupAlarmRuleDTO.getAlarmItemCode());
|
|
|
addAlarmConfigDTO.setClassCode(addGroupAlarmRuleDTO.getClassCode());
|
|
|
addAlarmConfigDTO.setLevel(alarmCondition.getAlarmLevel());
|
|
|
+ addAlarmConfigDTO.setCategory("Eqdx");
|
|
|
AlarmCondition condition = new AlarmCondition();
|
|
|
- condition.setTrigger((String) conditionMap.get("backend"));
|
|
|
List<String> infoCodeList = (List<String>) conditionMap.get("infoCode");
|
|
|
condition.setInfoCode(infoCodeList);
|
|
|
- condition.setTriggerUphold(alarmCondition.getTriggerUphold());
|
|
|
+ String backend = (String) conditionMap.get("backend");
|
|
|
+ for (String infoCode : infoCodeList) {
|
|
|
+ String replacement = equipId+"-"+infoCode;
|
|
|
+ backend = backend.replaceAll(infoCode,replacement);
|
|
|
+ }
|
|
|
+ condition.setEnd("!"+backend);
|
|
|
+ condition.setEndUphold(0);
|
|
|
+ condition.setTrigger(backend);
|
|
|
+ condition.setTriggerUphold(alarmCondition.getTriggerUphold()*60);
|
|
|
condition.setRules((List<String>) conditionMap.get("displayFormula"));
|
|
|
addAlarmConfigDTO.setCondition(condition);
|
|
|
alarmConfigs.add(addAlarmConfigDTO);
|