优化规则执行日志详情接口中控制日志设备控制描述内容和告警推送内容

service-rule/service-rule-biz/src/main/java/com/usky/rule/service/impl/RuleEngineLogServiceImpl.java

@@ -47,11 +47,11 @@ public class RuleEngineLogServiceImpl extends AbstractCrudService<RuleEngineLogM
         ConstraintDeviceSerialization constraintDeviceSerialization = new ConstraintDeviceSerialization();
         this.serializationMap.put(constraintDeviceSerialization.getType(), constraintDeviceSerialization);
         this.serializationMap.put(constraintCronSerialization.getType(), constraintCronSerialization);
-//        ActionAlarmEventSerialization actionAlarmEventSerialization = new ActionAlarmEventSerialization();
+        ActionAlarmEventSerialization actionAlarmEventSerialization = new ActionAlarmEventSerialization();
 //        ActionWorkOrderSerialization actionWorkOrderSerialization = new ActionWorkOrderSerialization();
         ActionControlSerialization actionControlSerialization = new ActionControlSerialization();
         this.serializationMap.put(actionControlSerialization.getType(), actionControlSerialization);
-//        this.serializationMap.put(actionAlarmEventSerialization.getType(), actionAlarmEventSerialization);
+        this.serializationMap.put(actionAlarmEventSerialization.getType(), actionAlarmEventSerialization);
 //        this.serializationMap.put(actionWorkOrderSerialization.getType(), actionWorkOrderSerialization);
     }
 

service-rule/service-rule-biz/src/main/java/com/usky/rule/util/RuleEngineUtil.java

@@ -107,10 +107,14 @@ public class RuleEngineUtil {
     @NotNull
     private static AlarmActionLog getAlarmActionLog(LocalDateTime now, AlarmEventAction ruleEngineAction) {
         AlarmActionLog alarmActionLog = new AlarmActionLog();
-        List<AlarmEventAction> alarmEventLogs = new ArrayList();
+        List<AlarmEventLog> alarmEventLogs = new ArrayList();
         alarmActionLog.setAlarms(alarmEventLogs);
         alarmActionLog.setTime(DateTimeUtil.format(now));
-        alarmEventLogs.add(ruleEngineAction);
+        AlarmEventLog alarmEventLog = new AlarmEventLog();
+        alarmEventLog.setNotifiers(ruleEngineAction.getDevices());
+        alarmEventLog.setLevel(String.valueOf(ruleEngineAction.getAlarmGrade()));
+        alarmEventLog.setMethod(ruleEngineAction.getAlarmAttribute());
+        alarmEventLogs.add(alarmEventLog);
         return alarmActionLog;
     }
 

service-rule/service-rule-biz/src/main/java/com/usky/rule/vo/action/AlarmEventAction.java

@@ -3,7 +3,6 @@ package com.usky.rule.vo.action;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.usky.rule.enums.ActionTypeEnum;
 import com.usky.rule.vo.visualization.AlarmSimpleVO;
-import com.usky.rule.vo.visualization.SimpleVO;
 
 import java.util.List;
 

service-rule/service-rule-biz/src/main/java/com/usky/rule/vo/log/AlarmActionLog.java

@@ -5,10 +5,10 @@ import com.usky.rule.vo.action.AlarmEventAction;
 import java.util.List;
 
 public class AlarmActionLog {
-    private List<AlarmEventAction> alarms;
+    private List<AlarmEventLog> alarms;
     private String time;
 
-    public List<AlarmEventAction> getAlarms() {
+    public List<AlarmEventLog> getAlarms() {
         return this.alarms;
     }
 
@@ -16,7 +16,7 @@ public class AlarmActionLog {
         return this.time;
     }
 
-    public void setAlarms(final List<AlarmEventAction> alarms) {
+    public void setAlarms(final List<AlarmEventLog> alarms) {
         this.alarms = alarms;
     }