feat(告警中心):数据库、接口相关

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertAction.java → iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/alert/AlertAction.java

@@ -7,9 +7,10 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.ruleengine.action;
+package cc.iotkit.ruleengine.action.alert;
 
 import cc.iotkit.model.device.message.ThingModelMessage;
+import cc.iotkit.ruleengine.action.Action;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertService.java → iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/alert/AlertService.java

@@ -7,9 +7,10 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.ruleengine.action;
+package cc.iotkit.ruleengine.action.alert;
 
 import cc.iotkit.model.device.message.ThingModelMessage;
+import cc.iotkit.ruleengine.action.ScriptService;
 import cc.iotkit.ruleengine.alert.Alerter;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.Data;

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceAction.java → iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/device/DeviceAction.java

@@ -7,10 +7,12 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.ruleengine.action;
+package cc.iotkit.ruleengine.action.device;
 
 import cc.iotkit.common.utils.JsonUtil;
 import cc.iotkit.model.device.message.ThingModelMessage;
+import cc.iotkit.ruleengine.action.Action;
+import cc.iotkit.ruleengine.action.device.DeviceActionService.Service;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -21,7 +23,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-public class DeviceAction implements Action<DeviceActionService.Service> {
+public class DeviceAction implements Action<Service> {
 
     public static final String TYPE = "device";
 

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java → iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/device/DeviceActionService.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.ruleengine.action;
+package cc.iotkit.ruleengine.action.device;
 
 import cc.iotkit.common.utils.UniqueIdUtil;
 import cc.iotkit.comps.DeviceComponentManager;

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpAction.java → iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/http/HttpAction.java

@@ -7,9 +7,10 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.ruleengine.action;
+package cc.iotkit.ruleengine.action.http;
 
 import cc.iotkit.model.device.message.ThingModelMessage;
+import cc.iotkit.ruleengine.action.Action;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpService.java → iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/http/HttpService.java

@@ -7,12 +7,13 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.ruleengine.action;
+package cc.iotkit.ruleengine.action.http;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.JsonUtil;
 import cc.iotkit.model.device.message.ThingModelMessage;
+import cc.iotkit.ruleengine.action.ScriptService;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java

@@ -16,6 +16,10 @@ import cc.iotkit.model.Paging;
 import cc.iotkit.model.rule.RuleAction;
 import cc.iotkit.model.rule.RuleInfo;
 import cc.iotkit.ruleengine.action.*;
+import cc.iotkit.ruleengine.action.device.DeviceAction;
+import cc.iotkit.ruleengine.action.device.DeviceActionService;
+import cc.iotkit.ruleengine.action.http.HttpAction;
+import cc.iotkit.ruleengine.action.http.HttpService;
 import cc.iotkit.ruleengine.action.kafka.KafkaAction;
 import cc.iotkit.ruleengine.action.kafka.KafkaService;
 import cc.iotkit.ruleengine.action.mqtt.MqttAction;

iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/DeviceActionExecutor.java

@@ -10,8 +10,8 @@
 package cc.iotkit.ruleengine.task;
 
 import cc.iotkit.common.utils.JsonUtil;
-import cc.iotkit.ruleengine.action.DeviceAction;
-import cc.iotkit.ruleengine.action.DeviceActionService;
+import cc.iotkit.ruleengine.action.device.DeviceAction;
+import cc.iotkit.ruleengine.action.device.DeviceActionService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;