refactor：雪花ID实现

iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/BaseDto.java

@@ -15,6 +15,7 @@ public class BaseDto {
     /**
      * 创建部门
      */
+
     private Long createDept;
 
     /**

iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Paging.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/Paging.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.model;
+package cc.iotkit.common.api;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ServletUtils.java

@@ -0,0 +1,189 @@
+package cc.iotkit.common.utils;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.http.HttpStatus;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 客户端工具类
+ *
+ * @author ruoyi
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ServletUtils extends JakartaServletUtil {
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name) {
+        return getRequest().getParameter(name);
+    }
+
+    /**
+     * 获取String参数
+     */
+    public static String getParameter(String name, String defaultValue) {
+        return Convert.toStr(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name) {
+        return Convert.toInt(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Integer参数
+     */
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
+        return Convert.toInt(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name) {
+        return Convert.toBool(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取Boolean参数
+     */
+    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
+        return Convert.toBool(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获得所有请求参数
+     *
+     * @param request 请求对象{@link ServletRequest}
+     * @return Map
+     */
+    public static Map<String, String[]> getParams(ServletRequest request) {
+        final Map<String, String[]> map = request.getParameterMap();
+        return Collections.unmodifiableMap(map);
+    }
+
+    /**
+     * 获得所有请求参数
+     *
+     * @param request 请求对象{@link ServletRequest}
+     * @return Map
+     */
+    public static Map<String, String> getParamMap(ServletRequest request) {
+        Map<String, String> params = new HashMap<>();
+        for (Map.Entry<String, String[]> entry : getParams(request).entrySet()) {
+            params.put(entry.getKey(), StringUtils.join(entry.getValue(), StringUtils.SEPARATOR));
+        }
+        return params;
+    }
+
+    /**
+     * 获取request
+     */
+    public static HttpServletRequest getRequest() {
+        return getRequestAttributes().getRequest();
+    }
+
+    /**
+     * 获取response
+     */
+    public static HttpServletResponse getResponse() {
+        return getRequestAttributes().getResponse();
+    }
+
+    /**
+     * 获取session
+     */
+    public static HttpSession getSession() {
+        return getRequest().getSession();
+    }
+
+    public static ServletRequestAttributes getRequestAttributes() {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        return (ServletRequestAttributes) attributes;
+    }
+
+    /**
+     * 将字符串渲染到客户端
+     *
+     * @param response 渲染对象
+     * @param string   待渲染的字符串
+     */
+    public static void renderString(HttpServletResponse response, String string) {
+        try {
+            response.setStatus(HttpStatus.HTTP_OK);
+            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+            response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+            response.getWriter().print(string);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 是否是Ajax异步请求
+     *
+     * @param request
+     */
+    public static boolean isAjaxRequest(HttpServletRequest request) {
+
+        String accept = request.getHeader("accept");
+        if (accept != null && accept.contains(MediaType.APPLICATION_JSON_VALUE)) {
+            return true;
+        }
+
+        String xRequestedWith = request.getHeader("X-Requested-With");
+        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
+            return true;
+        }
+
+        String uri = request.getRequestURI();
+        if (StringUtils.equalsAnyIgnoreCase(uri, ".json", ".xml")) {
+            return true;
+        }
+
+        String ajax = request.getParameter("__ajax");
+        return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
+    }
+
+    public static String getClientIP() {
+        return getClientIP(getRequest());
+    }
+
+    /**
+     * 内容编码
+     *
+     * @param str 内容
+     * @return 编码后的内容
+     */
+    public static String urlEncode(String str) {
+        return URLEncoder.encode(str, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 内容解码
+     *
+     * @param str 内容
+     * @return 解码后的内容
+     */
+    public static String urlDecode(String str) {
+        return URLDecoder.decode(str, StandardCharsets.UTF_8);
+    }
+
+}

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/SnowflakeIdGeneratorUtil.java

@@ -0,0 +1,183 @@
+package cc.iotkit.common.utils;
+
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+
+/**
+ * @author: Longjun.Tu
+ * @description:
+ * @date:created in 2023/5/18 10:20
+ * @modificed by:
+ */
+public class SnowflakeIdGeneratorUtil {
+
+    /**
+     * 起始的时间戳
+     */
+    private final static long START_STMP = 1577808000000L;
+
+    /**
+     * 每一部分占用的位数
+     */
+    private final static long SEQUENCE_BIT = 12; //序列号占用的位数
+    private final static long MACHINE_BIT = 5;   //机器标识占用的位数
+    private final static long DATACENTER_BIT = 5;//数据中心占用的位数
+
+    /**
+     * 每一部分的最大值
+     */
+    private final static long MAX_DATACENTER_NUM = -1L ^ (-1L << DATACENTER_BIT);
+    private final static long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT);
+    private final static long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT);
+
+    /**
+     * 每一部分向左的位移
+     */
+    private final static long MACHINE_LEFT = SEQUENCE_BIT;
+    private final static long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT;
+    private final static long TIMESTMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT;
+
+    private long datacenterId;  //数据中心
+    private long machineId;     //机器标识
+    private long sequence = 0L; //序列号
+    private long lastStmp = -1L;//上一次时间戳
+
+    private static volatile SnowflakeIdGeneratorUtil snowflake = null;
+    private static Object lock = new Object();
+
+    public SnowflakeIdGeneratorUtil(long datacenterId, long machineId) {
+        if (datacenterId > MAX_DATACENTER_NUM || datacenterId < 0) {
+            throw new IllegalArgumentException("datacenterId can't be greater than MAX_DATACENTER_NUM or less than 0");
+        }
+        if (machineId > MAX_MACHINE_NUM || machineId < 0) {
+            throw new IllegalArgumentException("machineId can't be greater than MAX_MACHINE_NUM or less than 0");
+        }
+        this.datacenterId = datacenterId;
+        this.machineId = machineId;
+    }
+
+    /**
+     * 获取单列
+     *
+     * @return
+     */
+    public static SnowflakeIdGeneratorUtil getInstanceSnowflake() {
+        if (snowflake == null) {
+            synchronized (lock) {
+                if(snowflake == null){
+                    long workerId;
+                    long dataCenterId = getRandom();
+                    try {
+                        //第一次使用获取mac地址的
+                        workerId = getWorkerId();
+                    } catch (Exception e) {
+                        workerId = getRandom();
+                    }
+                    snowflake = new SnowflakeIdGeneratorUtil(dataCenterId, workerId);
+                }
+            }
+        }
+        return snowflake;
+    }
+
+    /**
+     * 产生下一个ID
+     *
+     * @return
+     */
+    public synchronized long nextId() {
+        long currStmp = getNewstmp();
+        if (currStmp < lastStmp) {
+            throw new RuntimeException("Clock moved backwards.  Refusing to generate id");
+        }
+
+        if (currStmp == lastStmp) {
+            //相同毫秒内，序列号自增
+            sequence = (sequence + 1) & MAX_SEQUENCE;
+            //同一毫秒的序列数已经达到最大
+            if (sequence == 0L) {
+                currStmp = getNextMill();
+            }
+        } else {
+            //不同毫秒内，序列号置为0
+            sequence = 0L;
+        }
+
+        lastStmp = currStmp;
+
+        return (currStmp - START_STMP) << TIMESTMP_LEFT //时间戳部分
+                | datacenterId << DATACENTER_LEFT       //数据中心部分
+                | machineId << MACHINE_LEFT             //机器标识部分
+                | sequence;                             //序列号部分
+    }
+
+    private long getNextMill() {
+        long mill = getNewstmp();
+        while (mill <= lastStmp) {
+            mill = getNewstmp();
+        }
+        return mill;
+    }
+
+    private long getNewstmp() {
+        return System.currentTimeMillis();
+    }
+
+    /**
+     * 生成1-31之间的随机数
+     *
+     * @return
+     */
+    private static long getRandom() {
+        int max = (int) (MAX_MACHINE_NUM);
+        int min = 1;
+        Random random = new Random();
+        long result = random.nextInt(max - min) + min;
+        return result;
+    }
+
+    private static long getWorkerId() throws SocketException, UnknownHostException, NullPointerException {
+        @SuppressWarnings("unused")
+        InetAddress ip = InetAddress.getLocalHost();
+
+        NetworkInterface network = null;
+        Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces();
+        while (en.hasMoreElements()) {
+            NetworkInterface nint = en.nextElement();
+            if (!nint.isLoopback() && nint.getHardwareAddress() != null) {
+                network = nint;
+                break;
+            }
+        }
+
+        if (network == null) {
+            throw new NullPointerException("network is null");
+        }
+        @SuppressWarnings("ConstantConditions")
+        byte[] mac = network.getHardwareAddress();
+        long id = ((0x000000FF & (long) mac[mac.length - 1]) | (0x0000FF00 & (((long) mac[mac.length - 2]) << 8))) >> 11;
+        if (id > MAX_MACHINE_NUM) {
+            return getRandom();
+        }
+        return id;
+    }
+
+    public static void main(String[] args) {
+        Set<Long> idList = new HashSet<>();
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < 1000000; i++) {
+            long id = SnowflakeIdGeneratorUtil.getInstanceSnowflake().nextId();
+            idList.add(id);
+            // System.out.println("id="+id);
+        }
+        // System.out.println(idList.size());
+        // System.out.println(System.currentTimeMillis() - start);
+    }
+}

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

@@ -10,7 +10,7 @@
 package cc.iotkit.data.manager;
 
 import cc.iotkit.common.api.PageRequest;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.alert.AlertConfig;
 
 

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

@@ -10,7 +10,7 @@
 package cc.iotkit.data.manager;
 
 import cc.iotkit.common.api.PageRequest;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.alert.AlertRecord;
 
 

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

@@ -10,7 +10,7 @@
 package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Id;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 
 import java.util.List;
 

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.manager;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceGroup;
 
 public interface IDeviceGroupData extends ICommonData<DeviceGroup, String> {

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.manager;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.stats.DataItem;
 

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

@@ -10,7 +10,7 @@
 package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Owned;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.manager;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleInfo;
 
 import java.util.List;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.manager;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDevice;
 
 import java.util.List;

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java

@@ -1,7 +1,6 @@
 package cc.iotkit.data.system;
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
 import cc.iotkit.model.system.SysConfig;
 
 /**

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDeptData.java

@@ -2,7 +2,7 @@ package cc.iotkit.data.system;
 
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysDept;
 
 import java.util.List;

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictData.java

@@ -1,7 +1,7 @@
 package cc.iotkit.data.system;
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysDictData;
 import cc.iotkit.model.system.SysDictType;
 

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictTypeData.java

@@ -1,12 +1,9 @@
 package cc.iotkit.data.system;
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
-import cc.iotkit.model.system.SysDictData;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysDictType;
 
-import java.util.List;
-
 /**
  * 字典类型数据接口
  *

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysLogininforData.java

@@ -1,7 +1,7 @@
 package cc.iotkit.data.system;
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysLogininfor;
 
 /**

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysNoticeData.java

@@ -1,7 +1,7 @@
 package cc.iotkit.data.system;
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysNotice;
 
 /**

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOperLogData.java

@@ -1,7 +1,7 @@
 package cc.iotkit.data.system;
 
 import cc.iotkit.data.manager.ICommonData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysOperLog;
 
 /**

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/CategoryDataCache.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.ICategoryData;
 import cc.iotkit.data.cache.CategoryCacheEvict;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.Category;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java

@@ -14,7 +14,7 @@ import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.cache.DeviceInfoCacheEvict;
 import cc.iotkit.data.cache.DeviceInfoCachePut;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.stats.DataItem;
 import org.apache.commons.lang3.StringUtils;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java

@@ -10,7 +10,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.data.manager.IDeviceInfoData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.stats.DataItem;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/OauthClientDataCache.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.IOauthClientData;
 import cc.iotkit.data.cache.OauthClientCacheEvict;
 import cc.iotkit.model.OauthClient;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cache.annotation.Cacheable;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ProductDataCache.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.cache.ProductCacheEvict;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.Product;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ProductModelDataCache.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.data.cache.ProductModelCacheEvict;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.ProductModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/SpaceDataCache.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.ISpaceData;
 import cc.iotkit.data.cache.SpaceCacheEvict;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.space.Space;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ThingModelDataCache.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.data.cache.ThingModelCacheEvict;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.ThingModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/UserInfoDataCache.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.data.cache.UserInfoCacheEvict;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/config/id/SnowflakeIdGenerator.java

@@ -0,0 +1,23 @@
+package cc.iotkit.data.config.id;
+
+import cc.iotkit.common.utils.SnowflakeIdGeneratorUtil;
+import java.io.Serializable;
+import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.id.IdentifierGenerator;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author: Longjun.Tu
+ * @description:
+ * @date:created in 2023/5/18 10:20
+ * @modificed by:
+ */
+@Component
+public class SnowflakeIdGenerator implements IdentifierGenerator {
+
+  @Override
+  public Serializable generate(SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws HibernateException {
+    return SnowflakeIdGeneratorUtil.getInstanceSnowflake().nextId();
+  }
+}

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/model/TbSysConfig.java

@@ -3,12 +3,14 @@ package cc.iotkit.data.model;
 import cc.iotkit.data.model.BaseEntity;
 import cc.iotkit.model.system.SysConfig;
 import io.github.linpeilie.annotations.AutoMapper;
+import javax.persistence.GeneratedValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import org.hibernate.annotations.GenericGenerator;
 
 /**
  * 参数配置表 sys_config
@@ -27,6 +29,8 @@ public class TbSysConfig extends BaseEntity {
      * 参数主键
      */
     @Id
+    @GeneratedValue(generator = "SnowflakeIdGenerator")
+    @GenericGenerator(name = "SnowflakeIdGenerator", strategy = "cc.iotkit.data.config.id.SnowflakeIdGenerator")
     private Long configId;
 
     /**

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/AlertConfigDataImpl.java

@@ -5,7 +5,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IAlertConfigData;
 import cc.iotkit.data.dao.AlertConfigRepository;
 import cc.iotkit.data.model.TbAlertConfig;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.alert.AlertConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +32,6 @@ public class AlertConfigDataImpl implements IAlertConfigData {
 
     @Override
     public AlertConfig save(AlertConfig data) {
-        if (StringUtils.isBlank(data.getId())) {
-            data.setId(UUID.randomUUID().toString());
-        }
         alertConfigRepository.save(MapstructUtils.convert(data, TbAlertConfig.class));
         return data;
     }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/AlertRecordDataImpl.java

@@ -5,7 +5,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IAlertRecordData;
 import cc.iotkit.data.dao.AlertRecordRepository;
 import cc.iotkit.data.model.TbAlertRecord;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.alert.AlertRecord;
 
 import java.util.List;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/CategoryDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ICategoryData;
 import cc.iotkit.data.dao.CategoryRepository;
 import cc.iotkit.data.model.TbCategory;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.Category;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ChannelConfigDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelConfigData;
 import cc.iotkit.data.dao.ChannelConfigRepository;
 import cc.iotkit.data.model.TbChannelConfig;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.notify.ChannelConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Primary;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ChannelDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelData;
 import cc.iotkit.data.dao.ChannelRepository;
 import cc.iotkit.data.model.TbChannel;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.notify.Channel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Primary;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ChannelTemplateDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelTemplateData;
 import cc.iotkit.data.dao.ChannelTemplateRepository;
 import cc.iotkit.data.model.TbChannelTemplate;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.notify.ChannelTemplate;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Primary;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/CommonService.java

@@ -11,7 +11,7 @@ package cc.iotkit.data.service;
 
 import cc.iotkit.data.manager.ICommonData;
 import cc.iotkit.model.Id;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceConfigDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IDeviceConfigData;
 import cc.iotkit.data.dao.DeviceConfigRepository;
 import cc.iotkit.data.model.TbDeviceConfig;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceGroupDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IDeviceGroupData;
 import cc.iotkit.data.dao.DeviceGroupRepository;
 import cc.iotkit.data.model.TbDeviceGroup;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceGroup;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java

@@ -7,7 +7,7 @@ import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.dao.*;
 import cc.iotkit.data.model.*;
 import cc.iotkit.data.service.convert.DeviceInfoMapper;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.product.Category;
 import cc.iotkit.model.product.Product;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/HomeDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IHomeData;
 import cc.iotkit.data.dao.HomeRepository;
 import cc.iotkit.data.model.TbHome;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.space.Home;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/OauthClientDataImpl.java

@@ -14,7 +14,7 @@ import cc.iotkit.data.manager.IOauthClientData;
 import cc.iotkit.data.dao.OauthClientRepository;
 import cc.iotkit.data.model.TbOauthClient;
 import cc.iotkit.model.OauthClient;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProductDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.dao.ProductRepository;
 import cc.iotkit.data.model.TbProduct;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.Product;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProductModelDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.data.dao.ProductModelRepository;
 import cc.iotkit.data.model.TbProductModel;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.ProductModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProtocolComponentDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProtocolComponentData;
 import cc.iotkit.data.dao.ProtocolComponentRepository;
 import cc.iotkit.data.model.TbProtocolComponent;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.protocol.ProtocolComponent;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProtocolConverterDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProtocolConverterData;
 import cc.iotkit.data.dao.ProtocolConverterRepository;
 import cc.iotkit.data.model.TbProtocolConverter;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.protocol.ProtocolConverter;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/RuleInfoDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.data.manager.IRuleInfoData;
 import cc.iotkit.data.dao.RuleInfoRepository;
 import cc.iotkit.data.model.TbRuleInfo;
 import cc.iotkit.data.service.convert.RuleInfoMapper;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SpaceDataImpl.java

@@ -4,7 +4,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ISpaceData;
 import cc.iotkit.data.dao.SpaceRepository;
 import cc.iotkit.data.model.TbSpace;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.space.Space;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SpaceDeviceDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ISpaceDeviceData;
 import cc.iotkit.data.dao.SpaceDeviceRepository;
 import cc.iotkit.data.model.TbSpaceDevice;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.space.SpaceDevice;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysConfigDataImpl.java

@@ -3,7 +3,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.data.dao.system.SysConfigRepository;
 import cc.iotkit.data.model.TbSysConfig;
 import cc.iotkit.data.system.ISysConfigData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.system.SysConfig;
 import java.util.List;
 

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.data.manager.ITaskInfoData;
 import cc.iotkit.data.dao.TaskInfoRepository;
 import cc.iotkit.data.model.TbTaskInfo;
 import cc.iotkit.data.service.convert.TaskInfoMapper;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ThingModelDataImpl.java

@@ -12,7 +12,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.data.dao.ThingModelRepository;
 import cc.iotkit.data.service.convert.ThingModelMapper;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.ThingModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/UserInfoDataImpl.java

@@ -13,7 +13,7 @@ import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.data.dao.UserInfoRepository;
 import cc.iotkit.data.model.TbUserInfo;
 import cc.iotkit.data.service.convert.UserInfoMapper;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.UserInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java

@@ -15,7 +15,7 @@ import cc.iotkit.data.dao.VirtualDeviceRepository;
 import cc.iotkit.data.model.TbVirtualDevice;
 import cc.iotkit.data.model.TbVirtualDeviceMapping;
 import cc.iotkit.data.service.convert.VirtualDeviceMapper;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDevice;
 import cn.hutool.core.util.IdUtil;
 import org.apache.commons.lang3.StringUtils;

iot-common/iot-common-dao/iot-temporal-service/src/main/java/cc/iotkit/temporal/IRuleLogData.java

@@ -1,6 +1,6 @@
 package cc.iotkit.temporal;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleLog;
 
 public interface IRuleLogData {

iot-common/iot-common-dao/iot-temporal-service/src/main/java/cc/iotkit/temporal/ITaskLogData.java

@@ -1,6 +1,6 @@
 package cc.iotkit.temporal;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskLog;
 
 public interface ITaskLogData {

iot-common/iot-common-dao/iot-temporal-service/src/main/java/cc/iotkit/temporal/IThingModelMessageData.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.stats.TimeData;
 

iot-common/iot-common-dao/iot-temporal-service/src/main/java/cc/iotkit/temporal/IVirtualDeviceLogData.java

@@ -1,6 +1,6 @@
 package cc.iotkit.temporal;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDeviceLog;
 
 public interface IVirtualDeviceLogData {

iot-common/iot-common-dao/iot-temporal-serviceImpl-es/src/main/java/cc/iotkit/temporal/es/service/RuleLogDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.es.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleLog;
 import cc.iotkit.temporal.IRuleLogData;
 import cc.iotkit.temporal.es.dao.RuleLogRepository;

iot-common/iot-common-dao/iot-temporal-serviceImpl-es/src/main/java/cc/iotkit/temporal/es/service/TaskLogDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.es.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskLog;
 import cc.iotkit.temporal.ITaskLogData;
 import cc.iotkit.temporal.es.dao.TaskLogRepository;

iot-common/iot-common-dao/iot-temporal-serviceImpl-es/src/main/java/cc/iotkit/temporal/es/service/ThingModelMessageDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.es.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.stats.TimeData;
 import cc.iotkit.temporal.IThingModelMessageData;

iot-common/iot-common-dao/iot-temporal-serviceImpl-es/src/main/java/cc/iotkit/temporal/es/service/VirtualDeviceLogDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.es.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDeviceLog;
 import cc.iotkit.temporal.IVirtualDeviceLogData;
 import cc.iotkit.temporal.es.dao.VirtualDeviceLogRepository;

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/service/RuleLogDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.td.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleLog;
 import cc.iotkit.temporal.IRuleLogData;
 import cc.iotkit.temporal.td.dao.TdTemplate;

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/service/TaskLogDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.td.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskLog;
 import cc.iotkit.temporal.ITaskLogData;
 import cc.iotkit.temporal.td.dao.TdTemplate;

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/service/ThingModelMessageDataImpl.java

@@ -10,7 +10,7 @@
 package cc.iotkit.temporal.td.service;
 
 import cc.iotkit.common.utils.JsonUtils;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.stats.TimeData;
 import cc.iotkit.temporal.IThingModelMessageData;

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/service/VirtualDeviceLogDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.td.service;
 
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDeviceLog;
 import cc.iotkit.temporal.IVirtualDeviceLogData;
 import cc.iotkit.temporal.td.dao.TdTemplate;

iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/listener/UserActionListener.java

@@ -6,6 +6,7 @@ import cc.iotkit.common.redis.utils.RedisUtils;
 import cc.iotkit.common.satoken.utils.LoginHelper;
 import cc.iotkit.common.undefined.LoginUser;
 import cc.iotkit.common.undefined.UserOnlineDTO;
+import cc.iotkit.common.utils.ServletUtils;
 import cc.iotkit.common.utils.ip.AddressUtils;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.listener.SaTokenListener;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/AlertController.java

@@ -12,7 +12,7 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Request;
 import cc.iotkit.manager.service.AlertService;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.alert.AlertConfig;
 import cc.iotkit.model.alert.AlertRecord;
 import io.swagger.annotations.Api;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/DeviceController.java

@@ -18,7 +18,7 @@ import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.manager.service.DeviceService;
 import cc.iotkit.model.InvokeResult;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.DeviceConfig;
 import cc.iotkit.model.device.DeviceGroup;
 import cc.iotkit.model.device.DeviceInfo;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java

@@ -18,7 +18,7 @@ import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.manager.config.AliyunConfig;
 import cc.iotkit.manager.service.DataOwnerService;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.Category;
 import cc.iotkit.model.product.Product;
 import cc.iotkit.model.product.ProductModel;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java

@@ -18,7 +18,7 @@ import cc.iotkit.data.manager.IProtocolComponentData;
 import cc.iotkit.data.manager.IProtocolConverterData;
 import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.manager.service.DataOwnerService;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.protocol.ProtocolComponent;
 import cc.iotkit.model.protocol.ProtocolConverter;
 import cc.iotkit.utils.AuthUtil;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java

@@ -15,7 +15,7 @@ import cc.iotkit.common.utils.ReflectUtil;
 import cc.iotkit.data.manager.IRuleInfoData;
 import cc.iotkit.data.manager.ITaskInfoData;
 import cc.iotkit.manager.service.DataOwnerService;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleInfo;
 import cc.iotkit.model.rule.RuleLog;
 import cc.iotkit.model.rule.TaskInfo;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java

@@ -14,7 +14,7 @@ import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.ReflectUtil;
 import cc.iotkit.data.manager.IVirtualDeviceData;
 import cc.iotkit.manager.service.DataOwnerService;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.device.VirtualDevice;
 import cc.iotkit.model.device.VirtualDeviceLog;
 import cc.iotkit.temporal.IVirtualDeviceLogData;

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/AlertService.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Request;
 import cc.iotkit.data.manager.IAlertConfigData;
 import cc.iotkit.data.manager.IAlertRecordData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.alert.AlertConfig;
 import cc.iotkit.model.alert.AlertRecord;
 import lombok.extern.slf4j.Slf4j;

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

@@ -12,7 +12,7 @@ package cc.iotkit.ruleengine.rule;
 import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.manager.IRuleInfoData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.RuleAction;
 import cc.iotkit.model.rule.RuleInfo;
 import cc.iotkit.ruleengine.action.*;

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

@@ -12,7 +12,7 @@ package cc.iotkit.ruleengine.task;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.data.manager.ITaskInfoData;
-import cc.iotkit.model.Paging;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.rule.TaskInfo;
 import cc.iotkit.model.rule.TaskLog;
 import cc.iotkit.temporal.ITaskLogData;

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java

@@ -3,8 +3,6 @@ package cc.iotkit.system.controller;
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.undefined.PagedDataVo;
 import cc.iotkit.common.excel.utils.ExcelUtil;
-import cc.iotkit.common.log.annotation.Log;
-import cc.iotkit.common.log.enums.BusinessType;
 import cc.iotkit.common.web.core.BaseController;
 import cc.iotkit.system.dto.bo.SysConfigBo;
 import cc.iotkit.system.dto.vo.SysConfigVo;