xujiaheng пре 3 година
родитељ
комит
5311e69e9c

+ 1 - 2
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/dto/AddGroupAlarmRuleDTO.java

@@ -36,8 +36,7 @@ public class AddGroupAlarmRuleDTO {
     @NotBlank(message = "对象类编码必传")
     private String classCode;
 
-    @ApiModelProperty(value = "查询条件",required = true)
-    @NotBlank(message = "查询条件必传")
+    @ApiModelProperty(value = "分组条件",required = true)
     private String condition;
     
 }

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

@@ -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);

+ 4 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmcondition/service/impl/AlarmConditionServiceImpl.java

@@ -113,9 +113,12 @@ public class AlarmConditionServiceImpl extends ServiceImpl<AlarmConditionMapper,
         Map<String, Object> map = new HashMap();
         List<String> infoCodesList = new ArrayList<>();
         infoCodesList.addAll(infoCodesSet);
+        List<String> displayFormula = new ArrayList();
+        displayFormula.addAll(displayFormulaList);
         map.put("infoCode", infoCodesList);
         map.put("backend", substring.toString());
-        map.put("displayFormula", displayFormulaList);
+        map.put("end", "!"+substring);
+        map.put("displayFormula", displayFormula);
         return map;
     }
 

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/model/ProjectAlarmRuleObjRel.java

@@ -23,10 +23,10 @@ public class ProjectAlarmRuleObjRel extends AuditableEntity<ProjectAlarmRuleObjR
     private String projectAlarmRuleId;
     
     @ApiModelProperty("设备ID")
-    private String equipId;
+    private String objId;
 
     @ApiModelProperty("设备名称")
-    private String equipName;
+    private String objName;
     
     @ApiModelProperty("屏蔽状态 1-open、0- 屏蔽")
     private Integer open;