优化查询日志详情接口，将同一个规则下触发的所有动作合并到一个日志记录；

service-rule/service-rule-biz/src/main/java/com/usky/rule/config/CronTaskManager.java

@@ -113,7 +113,7 @@ public class CronTaskManager {
 
     public void performConsumptionTask() {
         JobDetail consumptionJob = JobBuilder.newJob(ConsumptionJob.class).withIdentity("consumption", "device").build();
-        CronTrigger consumptionTrigger = (CronTrigger)TriggerBuilder.newTrigger().forJob(consumptionJob).withIdentity("consumptionTrigger").withSchedule(CronScheduleBuilder.cronSchedule("0 0 * * * ?")).build();
+        CronTrigger consumptionTrigger = (CronTrigger)TriggerBuilder.newTrigger().forJob(consumptionJob).withIdentity("consumptionTrigger").withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")).build();
 //        JobDetail spaceJob = JobBuilder.newJob(SpaceJob.class).withIdentity("space").build();
 //        CronTrigger spaceTrigger = (CronTrigger)TriggerBuilder.newTrigger().forJob(spaceJob).withIdentity("spaceTrigger", "space").withSchedule(CronScheduleBuilder.cronSchedule("0 0 * * * ?")).build();
 

service-rule/service-rule-biz/src/main/java/com/usky/rule/subscribe/TriggerDeviceUtil.java

@@ -355,7 +355,7 @@ public class TriggerDeviceUtil {
                 List<Condition> meetConstraintConditionList = new ArrayList();
                 deviceTriggerLog.setId(deviceId);
                 deviceTriggerLog.setMethod("acq");
-//                deviceTriggerLog.setName(this.deviceService.getName(deviceId));
+                deviceTriggerLog.setName(deviceConstraint.getDevices().get(0).getName());
                 deviceTriggerLog.setConditions(meetConstraintConditionList);
                 deviceTriggerLogs.add(deviceTriggerLog);
                 List<Condition> identifierConditions = deviceConstraint.getConditions();

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

@@ -83,26 +83,27 @@ public class RuleEngineUtil {
                 baseLogs.add(baseLog);
                 ruleEngineLog.setTenantId(((AlarmEventAction) ruleEngineAction).getDevices().get(0).getTenantId());
             }
-            ruleEngineLog.setDetail(JsonUtil.toJson(ruleEngineDetail));
-            ruleEngineLog.setRuleEngineId(ruleEngineId);
-            ruleEngineLog.setRuleEngineName(ruleEngineName);
-            ruleEngineLog.setAutoTrigger((byte) (isAuto ? 1 : 0));
-            ruleEngineLog.setProjectId(projectId);
-            ruleEngineLog.setAction(String.join(",", deviceActionTypes));
-            ruleEngineLog.setTriggerType(triggerType);
-            ruleEngineLog.setUpdateTime(now);
-            ruleEngineLog.setCreateTime(now);
-            ruleEngineLog.setCreatedBy("admin");
-            ruleEngineLog.setUpdatedBy("admin");
-            if(!SecurityUtils.getUsername().isEmpty()) {
-                ruleEngineLog.setCreatedBy(SecurityUtils.getUsername());
-                ruleEngineLog.setUpdatedBy(SecurityUtils.getUsername());
-                ruleEngineLog.setTenantId(SecurityUtils.getTenantId());
-            }
-            ruleEngineLog.setTime(now);
-            this.ruleEngineLogService.save(ruleEngineLog);
         }
 
+        ruleEngineLog.setDetail(JsonUtil.toJson(ruleEngineDetail));
+        ruleEngineLog.setRuleEngineId(ruleEngineId);
+        ruleEngineLog.setRuleEngineName(ruleEngineName);
+        ruleEngineLog.setAutoTrigger((byte) (isAuto ? 1 : 0));
+        ruleEngineLog.setProjectId(projectId);
+        ruleEngineLog.setAction(String.join(",", deviceActionTypes));
+        ruleEngineLog.setTriggerType(triggerType);
+        ruleEngineLog.setUpdateTime(now);
+        ruleEngineLog.setCreateTime(now);
+        ruleEngineLog.setCreatedBy("admin");
+        ruleEngineLog.setUpdatedBy("admin");
+        if(!SecurityUtils.getUsername().isEmpty()) {
+            ruleEngineLog.setCreatedBy(SecurityUtils.getUsername());
+            ruleEngineLog.setUpdatedBy(SecurityUtils.getUsername());
+            ruleEngineLog.setTenantId(SecurityUtils.getTenantId());
+        }
+        ruleEngineLog.setTime(now);
+        this.ruleEngineLogService.save(ruleEngineLog);
+
     }
 
     @NotNull