优化规则执行日志详情接口中控制日志描述内容

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

@@ -128,7 +128,13 @@ public class RuleEngineServiceImpl extends AbstractCrudService<RuleEngineMapper,
 
     @Override
     public RuleEngine getById(Long id) {
-        return getBaseMapper().selectById(id, SecurityUtils.getTenantId());
+        Integer tenantId = SecurityUtils.getTenantId();
+        if (tenantId == 0) {
+            return getBaseMapper().selectById(id, null);
+        }else{
+            return getBaseMapper().selectById(id, SecurityUtils.getTenantId());
+        }
+
     }
 
     /** 收集某空间下所有子孙空间 id（兼容 MySQL 5.7，在应用层递归） */

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

@@ -84,7 +84,7 @@ public class TriggerDeviceUtil {
                 Long ruleEngineId = ruleEngineDeviceVO.getRuleEngineId();
                 Long productId = ruleEngineDeviceVO.getProductId();
                 String deviceId = ruleEngineDeviceVO.getDeviceId();
-                RuleEngine ruleEngine = (RuleEngine)this.ruleEngineService.getById(ruleEngineId);
+                RuleEngine ruleEngine = this.ruleEngineService.getById(ruleEngineId);
                 if (ruleEngine != null && ruleEngine.getStatus() != 0) {
                     if (!StringUtils.isBlank(ruleEngine.getDetail())) {
                         RuleEngineDetail ruleEngineDetail = (RuleEngineDetail)JsonUtil.toObject(ruleEngine.getDetail(), RuleEngineDetail.class);

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

@@ -51,12 +51,12 @@ public class ActionControlSerialization implements RuleEngineLogSerialization<Co
                     builder.append("，");
                 }
 
-                if ("200000".equals(result.getCode())) {
+                if ("200".equals(result.getCode())) {
                     resultDesc = "成功";
                 }
 
                 Control control = (Control)controls.get(i);
-                builder.append(control.getName()).append("延时").append(control.getDelaySeconds()).append("秒设置为：").append(control.getValueDesc()).append("(").append(resultDesc).append(")");
+                builder.append(control.getName()).append("设置为：").append(control.getValueDesc()).append("(").append(resultDesc).append(")");
             }
         }