修改bug

iot-dao/iot-data-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java

@@ -26,6 +26,11 @@ public class AlertConfig implements Owned<Long> {
 
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 配置所属用户
      */

iot-dao/iot-data-model/src/main/java/cc/iotkit/model/alert/AlertRecord.java

@@ -26,6 +26,11 @@ public class AlertRecord implements Owned<Long> {
 
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 配置所属用户
      */

iot-dao/iot-data-model/src/main/java/cc/iotkit/model/notify/ChannelConfig.java

@@ -1,13 +1,12 @@
 package cc.iotkit.model.notify;
 
-import cc.iotkit.model.Id;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import cc.iotkit.model.Owned;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
+import java.util.Date;
 
 /**
  * author: 石恒
@@ -18,31 +17,49 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ChannelConfig implements Id<Long> {
+public class ChannelConfig implements Owned<Long> {
 
     private Long id;
 
+    private String tenantId;
+
     private Long channelId;
 
     private String title;
 
-    private ChannelParam param;
+    private String param;
 
     private Long createAt;
 
-    @Data
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public static class ChannelParam implements Serializable {
-        private String userName;
-        private String passWord;
-        private String host;
-        private Integer port;
-        private Boolean mailSmtpAuth;
-        private String from;
-        private String to;
-        private String dingTalkWebhook;
-        private String dingTalkSecret;
-        private String qyWechatWebhook;
-
-    }
+    private Long createDept;
+
+    private Long createBy;
+
+    private Date createTime;
+
+    private Long updateBy;
+
+    private Date updateTime;
+
+    /**
+     * 配置所属用户
+     */
+    private String uid;
+
+
+//    @Data
+//    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    public static class ChannelParam implements Serializable {
+//        private String userName;
+//        private String passWord;
+//        private String host;
+//        private Integer port;
+//        private Boolean mailSmtpAuth;
+//        private String from;
+//        private String to;
+//        private String dingTalkWebhook;
+//        private String dingTalkSecret;
+//        private String qyWechatWebhook;
+//
+//    }
 }

iot-dao/iot-data-model/src/main/java/cc/iotkit/model/notify/ChannelTemplate.java

@@ -19,6 +19,8 @@ public class ChannelTemplate implements Id<Long> {
 
     private Long id;
 
+    private String tenantId;
+
     private Long channelConfigId;
 
     private String title;
@@ -26,4 +28,11 @@ public class ChannelTemplate implements Id<Long> {
     private String content;
 
     private Long createAt;
+
+    /**
+     * 配置所属用户
+     */
+    private String uid;
+
+
 }

iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertConfigData.java

@@ -18,5 +18,6 @@ import cc.iotkit.model.alert.AlertConfig;
 public interface IAlertConfigData extends ICommonData<AlertConfig, Long> {
 
 
-  Paging<AlertConfig> selectAlertConfigPage(PageRequest<AlertConfig> request);
+   Paging<AlertConfig> selectAlertConfigPage(PageRequest<AlertConfig> request);
+
 }

iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertRecordData.java

@@ -19,4 +19,6 @@ public interface IAlertRecordData extends ICommonData<AlertRecord, Long> {
 
 
   Paging<AlertRecord> selectAlertConfigPage(PageRequest<AlertRecord> request);
+
+  Paging<AlertRecord> selectAlertRecordPage(PageRequest<AlertRecord> request);
 }

iot-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelConfigData.java

@@ -9,4 +9,6 @@ import cc.iotkit.model.notify.ChannelConfig;
  * description:
  **/
 public interface IChannelConfigData extends ICommonData<ChannelConfig, Long> {
+    ChannelConfig saveChannelConfig(ChannelConfig channelConfig);
+
 }