refactor:结构和引用调整

iot-common/iot-common-core/pom.xml

@@ -106,6 +106,11 @@
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

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

@@ -0,0 +1,33 @@
+package cc.iotkit.common.utils.ip;
+
+import cc.iotkit.common.utils.StringUtils;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.http.HtmlUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 获取地址类
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class AddressUtils {
+
+    // 未知地址
+    public static final String UNKNOWN = "XX XX";
+
+    public static String getRealAddressByIP(String ip) {
+        if (StringUtils.isBlank(ip)) {
+            return UNKNOWN;
+        }
+        // 内网不查询
+        ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
+        if (NetUtil.isInnerIP(ip)) {
+            return "内网IP";
+        }
+        return RegionUtils.getCityInfo(ip);
+    }
+}

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

@@ -0,0 +1,67 @@
+package cc.iotkit.common.utils.ip;
+
+import cc.iotkit.common.exception.BizException;
+import cc.iotkit.common.utils.file.FileUtils;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ClassPathResource;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.Searcher;
+
+import java.io.File;
+
+/**
+ * 根据ip地址定位工具类，离线方式
+ * 参考地址：<a href="https://gitee.com/lionsoul/ip2region/tree/master/binding/java">集成 ip2region 实现离线IP地址定位库</a>
+ *
+ * @author lishuyan
+ */
+@Slf4j
+public class RegionUtils {
+
+    private static final Searcher SEARCHER;
+
+    static {
+        String fileName = "/ip2region.xdb";
+        File existFile = FileUtils.file(FileUtil.getTmpDir() + FileUtil.FILE_SEPARATOR + fileName);
+        if (!FileUtils.exist(existFile)) {
+            ClassPathResource fileStream = new ClassPathResource(fileName);
+            if (ObjectUtil.isEmpty(fileStream.getStream())) {
+                throw new BizException("RegionUtils初始化失败，原因：IP地址库数据不存在！");
+            }
+            FileUtils.writeFromStream(fileStream.getStream(), existFile);
+        }
+
+        String dbPath = existFile.getPath();
+
+        // 1、从 dbPath 加载整个 xdb 到内存。
+        byte[] cBuff;
+        try {
+            cBuff = Searcher.loadContentFromFile(dbPath);
+        } catch (Exception e) {
+            throw new BizException("RegionUtils初始化失败，原因：从ip2region.xdb文件加载内容失败！" + e.getMessage());
+        }
+        // 2、使用上述的 cBuff 创建一个完全基于内存的查询对象。
+        try {
+            SEARCHER = Searcher.newWithBuffer(cBuff);
+        } catch (Exception e) {
+            throw new BizException("RegionUtils初始化失败，原因：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 根据IP地址离线获取城市
+     */
+    public static String getCityInfo(String ip) {
+        try {
+            ip = ip.trim();
+            // 3、执行查询
+            String region = SEARCHER.search(ip);
+            return region.replace("0|", "").replace("|0", "");
+        } catch (Exception e) {
+            log.error("IP地址离线获取城市异常 {}", ip);
+            return "未知";
+        }
+    }
+
+}

iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java → iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/config/CrossConfig.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.manager.config;
+package cc.iotkit.common.web.config;
 
 
 import org.springframework.context.annotation.Configuration;

iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java → iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/handler/GlobalExceptionHandler.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.manager.config;
+package cc.iotkit.common.web.handler;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.exception.NotPermissionException;

iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java → iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/handler/ResponseResultHandler.java

@@ -7,9 +7,10 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.manager.config;
+package cc.iotkit.common.web.handler;
 
 import cc.iotkit.common.api.Response;
+import cc.iotkit.common.web.handler.GlobalExceptionHandler;
 import cn.dev33.satoken.util.SaResult;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java

@@ -17,7 +17,7 @@ import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.IComponent;
 import cc.iotkit.comps.config.ComponentConfig;
 import cc.iotkit.comps.service.DeviceBehaviourService;
-import cc.iotkit.data.IProtocolComponentData;
+import cc.iotkit.data.manager.IProtocolComponentData;
 import cc.iotkit.model.protocol.ProtocolComponent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java

@@ -25,10 +25,10 @@ import cc.iotkit.converter.Device;
 import cc.iotkit.converter.DeviceMessage;
 import cc.iotkit.converter.IConverter;
 import cc.iotkit.converter.ScriptConvertFactory;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductData;
-import cc.iotkit.data.IProtocolComponentData;
-import cc.iotkit.data.IProtocolConverterData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IProductData;
+import cc.iotkit.data.manager.IProtocolComponentData;
+import cc.iotkit.data.manager.IProtocolConverterData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.product.Product;

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java

@@ -17,9 +17,9 @@ import cc.iotkit.common.utils.JsonUtil;
 import cc.iotkit.common.utils.UniqueIdUtil;
 import cc.iotkit.comp.model.DeviceState;
 import cc.iotkit.comp.model.RegisterInfo;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductData;
-import cc.iotkit.data.IProductModelData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IProductData;
+import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.product.Product;

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceConfigConsumer.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.Constants;
 import cc.iotkit.common.thing.ThingService;
 import cc.iotkit.common.utils.JsonUtil;
 import cc.iotkit.comps.DeviceComponentManager;
-import cc.iotkit.data.IDeviceConfigData;
+import cc.iotkit.data.manager.IDeviceConfigData;
 import cc.iotkit.model.device.DeviceConfig;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.mq.ConsumerHandler;

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java

@@ -10,7 +10,7 @@
 package cc.iotkit.comps.service;
 
 import cc.iotkit.common.Constants;
-import cc.iotkit.data.IDeviceInfoData;
+import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.mq.ConsumerHandler;

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DevicePropertyConsumer.java

@@ -11,8 +11,8 @@ package cc.iotkit.comps.service;
 
 import cc.iotkit.common.Constants;
 import cc.iotkit.common.utils.JsonUtil;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IThingModelData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.product.ThingModel;

iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java

@@ -20,7 +20,7 @@ import cc.iotkit.comp.IMessageHandler;
 import cc.iotkit.comp.model.DeviceState;
 import cc.iotkit.comp.utils.SpringUtils;
 import cc.iotkit.converter.DeviceMessage;
-import cc.iotkit.data.IDeviceInfoData;
+import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import io.netty.handler.codec.mqtt.MqttQoS;

iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java

@@ -16,8 +16,8 @@ import cc.iotkit.common.thing.ThingService;
 import cc.iotkit.comp.utils.SpringUtils;
 import cc.iotkit.converter.Device;
 import cc.iotkit.converter.DeviceMessage;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductModelData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.product.ProductModel;

iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java

@@ -16,8 +16,8 @@ import cc.iotkit.common.thing.ThingService;
 import cc.iotkit.comp.utils.SpringUtils;
 import cc.iotkit.converter.Device;
 import cc.iotkit.converter.DeviceMessage;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductModelData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.product.ProductModel;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.ICategoryData;
+import cc.iotkit.data.manager.ICategoryData;
 import cc.iotkit.data.cache.CategoryCacheEvict;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.Category;

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

@@ -11,7 +11,7 @@ package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.common.utils.JsonUtils;
-import cc.iotkit.data.IDeviceInfoData;
+import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.cache.DeviceInfoCacheEvict;
 import cc.iotkit.data.cache.DeviceInfoCachePut;
 import cc.iotkit.model.Paging;

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

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

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

@@ -10,7 +10,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.IOauthClientData;
+import cc.iotkit.data.manager.IOauthClientData;
 import cc.iotkit.data.cache.OauthClientCacheEvict;
 import cc.iotkit.model.OauthClient;
 import cc.iotkit.model.Paging;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.IProductData;
+import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.cache.ProductCacheEvict;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.Product;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.IProductModelData;
+import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.data.cache.ProductModelCacheEvict;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.ProductModel;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.ISpaceData;
+import cc.iotkit.data.manager.ISpaceData;
 import cc.iotkit.data.cache.SpaceCacheEvict;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.space.Space;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.IThingModelData;
+import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.data.cache.ThingModelCacheEvict;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.ThingModel;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.constant.Constants;
-import cc.iotkit.data.IUserInfoData;
+import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.data.cache.UserInfoCacheEvict;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.UserInfo;

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.model.Paging;

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.model.Paging;

iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICategoryData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICategoryData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.product.Category;
 

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

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.notify.ChannelConfig;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelData.java

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.notify.Channel;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelTemplateData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelTemplateData.java

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.notify.ChannelTemplate;
 

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Id;
 import cc.iotkit.model.Paging;

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceConfigData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceConfigData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.device.DeviceConfig;
 

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.DeviceGroup;

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.DeviceInfo;

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IHomeData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IHomeData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.space.Home;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOauthClientData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOauthClientData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.OauthClient;
 

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Owned;
 import cc.iotkit.model.Paging;

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.product.Product;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductModelData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductModelData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.product.ProductModel;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolComponentData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolComponentData.java

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.protocol.ProtocolComponent;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolConverterData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolConverterData.java

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.protocol.ProtocolConverter;
 

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

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.rule.RuleInfo;

iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.space.Space;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceDeviceData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceDeviceData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.space.SpaceDevice;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/ITaskInfoData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ITaskInfoData.java

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.rule.TaskInfo;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IThingModelData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IThingModelData.java

@@ -1,4 +1,4 @@
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.product.ThingModel;
 

iot-data/iot-data-service/src/main/java/cc/iotkit/data/IUserInfoData.java → iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IUserInfoData.java

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.UserInfo;
 

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

@@ -7,7 +7,7 @@
  * | Author: xw2sy@163.com
  * +----------------------------------------------------------------------
  */
-package cc.iotkit.data;
+package cc.iotkit.data.manager;
 
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.VirtualDevice;

iot-data/iot-es-temporal-service/src/main/java/cc/iotkit/temporal/es/service/DevicePropertyDataImpl.java

@@ -9,13 +9,12 @@
  */
 package cc.iotkit.temporal.es.service;
 
-import cc.iotkit.data.IDeviceInfoData;
+import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.DeviceProperty;
 import cc.iotkit.temporal.IDevicePropertyData;
 import cc.iotkit.temporal.es.document.DevicePropertyMapper;
 import cc.iotkit.temporal.es.document.DocDeviceProperty;
-import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.api.PageRequest;
-import cc.iotkit.data.IAlertConfigData;
+import cc.iotkit.data.manager.IAlertConfigData;
 import cc.iotkit.data.dao.AlertConfigRepository;
 import cc.iotkit.data.convert.AlertConfigMapper;
 import cc.iotkit.data.model.TbAlertConfig;

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

@@ -1,7 +1,7 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.api.PageRequest;
-import cc.iotkit.data.IAlertRecordData;
+import cc.iotkit.data.manager.IAlertRecordData;
 import cc.iotkit.data.dao.AlertRecordRepository;
 import cc.iotkit.data.convert.AlertRecordMapper;
 import cc.iotkit.data.model.TbAlertRecord;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.ICategoryData;
+import cc.iotkit.data.manager.ICategoryData;
 import cc.iotkit.data.dao.CategoryRepository;
 import cc.iotkit.data.convert.CategoryMapper;
 import cc.iotkit.data.model.TbCategory;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IChannelConfigData;
+import cc.iotkit.data.manager.IChannelConfigData;
 import cc.iotkit.data.dao.ChannelConfigRepository;
 import cc.iotkit.data.convert.ChannelConfigMapper;
 import cc.iotkit.data.model.TbChannelConfig;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IChannelData;
+import cc.iotkit.data.manager.IChannelData;
 import cc.iotkit.data.dao.ChannelRepository;
 import cc.iotkit.data.convert.ChannelMapper;
 import cc.iotkit.data.model.TbChannel;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IChannelTemplateData;
+import cc.iotkit.data.manager.IChannelTemplateData;
 import cc.iotkit.data.dao.ChannelTemplateRepository;
 import cc.iotkit.data.convert.ChannelTemplateMapper;
 import cc.iotkit.data.model.TbChannelTemplate;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.ICommonData;
+import cc.iotkit.data.manager.ICommonData;
 import cc.iotkit.model.Id;
 import cc.iotkit.model.Paging;
 import org.springframework.data.domain.Page;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IDeviceConfigData;
+import cc.iotkit.data.manager.IDeviceConfigData;
 import cc.iotkit.data.dao.DeviceConfigRepository;
 import cc.iotkit.data.convert.DeviceConfigMapper;
 import cc.iotkit.data.model.TbDeviceConfig;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IDeviceGroupData;
+import cc.iotkit.data.manager.IDeviceGroupData;
 import cc.iotkit.data.dao.DeviceGroupRepository;
 import cc.iotkit.data.convert.DeviceGroupMapper;
 import cc.iotkit.data.model.TbDeviceGroup;

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

@@ -1,9 +1,9 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.utils.ReflectUtil;
-import cc.iotkit.data.ICategoryData;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductData;
+import cc.iotkit.data.manager.ICategoryData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.convert.DeviceInfoMapper;
 import cc.iotkit.data.dao.*;
 import cc.iotkit.data.model.*;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IHomeData;
+import cc.iotkit.data.manager.IHomeData;
 import cc.iotkit.data.dao.HomeRepository;
 import cc.iotkit.data.convert.HomeMapper;
 import cc.iotkit.model.Paging;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IOauthClientData;
+import cc.iotkit.data.manager.IOauthClientData;
 import cc.iotkit.data.dao.OauthClientRepository;
 import cc.iotkit.data.convert.OauthClientMapper;
 import cc.iotkit.model.OauthClient;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IProductData;
+import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.dao.ProductRepository;
 import cc.iotkit.data.convert.ProductMapper;
 import cc.iotkit.data.model.TbProduct;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IProductModelData;
+import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.data.dao.ProductModelRepository;
 import cc.iotkit.data.convert.ProductModelMapper;
 import cc.iotkit.model.Paging;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IProtocolComponentData;
+import cc.iotkit.data.manager.IProtocolComponentData;
 import cc.iotkit.data.dao.ProtocolComponentRepository;
 import cc.iotkit.data.convert.ProtocolComponentMapper;
 import cc.iotkit.data.model.TbProtocolComponent;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IProtocolConverterData;
+import cc.iotkit.data.manager.IProtocolConverterData;
 import cc.iotkit.data.dao.ProtocolConverterRepository;
 import cc.iotkit.data.convert.ProtocolConverterMapper;
 import cc.iotkit.data.model.TbProtocolConverter;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IRuleInfoData;
+import cc.iotkit.data.manager.IRuleInfoData;
 import cc.iotkit.data.dao.RuleInfoRepository;
 import cc.iotkit.data.convert.RuleInfoMapper;
 import cc.iotkit.data.model.TbRuleInfo;

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

@@ -1,6 +1,6 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.ISpaceData;
+import cc.iotkit.data.manager.ISpaceData;
 import cc.iotkit.data.dao.SpaceRepository;
 import cc.iotkit.data.convert.SpaceMapper;
 import cc.iotkit.data.model.TbSpace;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.ISpaceDeviceData;
+import cc.iotkit.data.manager.ISpaceDeviceData;
 import cc.iotkit.data.dao.SpaceDeviceRepository;
 import cc.iotkit.data.convert.SpaceDeviceMapper;
 import cc.iotkit.model.Paging;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.ITaskInfoData;
+import cc.iotkit.data.manager.ITaskInfoData;
 import cc.iotkit.data.dao.TaskInfoRepository;
 import cc.iotkit.data.convert.TaskInfoMapper;
 import cc.iotkit.data.model.TbTaskInfo;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IThingModelData;
+import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.data.dao.ThingModelRepository;
 import cc.iotkit.data.convert.ThingModelMapper;
 import cc.iotkit.model.Paging;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IUserInfoData;
+import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.data.dao.UserInfoRepository;
 import cc.iotkit.data.model.TbUserInfo;
 import cc.iotkit.data.convert.UserInfoMapper;

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

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.data.service;
 
-import cc.iotkit.data.IVirtualDeviceData;
+import cc.iotkit.data.manager.IVirtualDeviceData;
 import cc.iotkit.data.dao.VirtualDeviceMappingRepository;
 import cc.iotkit.data.dao.VirtualDeviceRepository;
 import cc.iotkit.data.model.TbVirtualDevice;

iot-data/iot-td-temporal-service/src/main/java/cc/iotkit/temporal/td/service/DevicePropertyDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.td.service;
 
-import cc.iotkit.data.IDeviceInfoData;
+import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.DeviceProperty;
 import cc.iotkit.temporal.IDevicePropertyData;

iot-data/iot-ts-temporal-service/src/main/java/cc/iotkit/temporal/ts/service/DevicePropertyDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.ts.service;
 
-import cc.iotkit.data.IDeviceInfoData;
+import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.DeviceProperty;
 import cc.iotkit.temporal.IDevicePropertyData;

iot-module/iot-manager/pom.xml

@@ -11,6 +11,95 @@
 
     <artifactId>iot-manager</artifactId>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>it.ozimov</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-simple</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-model</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-rule-engine</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-component-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-component-converter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-virtual-device</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-message-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-temporal-service</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-rdb-data-service</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-data-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-common-doc</artifactId>
+        </dependency>
+
+    </dependencies>
 
     <build>
         <plugins>

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

@@ -17,7 +17,6 @@ import cc.iotkit.model.alert.AlertConfig;
 import cc.iotkit.model.alert.AlertRecord;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 @Api(tags = {"告警中心"})
 @Slf4j
 @RestController

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

@@ -12,10 +12,10 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.comps.service.DeviceBehaviourService;
-import cc.iotkit.data.IDeviceConfigData;
-import cc.iotkit.data.IDeviceGroupData;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductData;
+import cc.iotkit.data.manager.IDeviceConfigData;
+import cc.iotkit.data.manager.IDeviceGroupData;
+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;
@@ -37,7 +37,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 
 import java.util.ArrayList;

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

@@ -12,10 +12,10 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.JsonUtil;
-import cc.iotkit.data.ICategoryData;
-import cc.iotkit.data.IProductData;
-import cc.iotkit.data.IProductModelData;
-import cc.iotkit.data.IThingModelData;
+import cc.iotkit.data.manager.ICategoryData;
+import cc.iotkit.data.manager.IProductData;
+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;
@@ -34,7 +34,6 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;

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

@@ -14,9 +14,9 @@ import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.ReflectUtil;
 import cc.iotkit.comps.ComponentManager;
 import cc.iotkit.comps.config.ComponentConfig;
-import cc.iotkit.data.IProtocolComponentData;
-import cc.iotkit.data.IProtocolConverterData;
-import cc.iotkit.data.IUserInfoData;
+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.model.protocol.ProtocolComponent;
@@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;

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

@@ -12,8 +12,8 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.ReflectUtil;
-import cc.iotkit.data.IRuleInfoData;
-import cc.iotkit.data.ITaskInfoData;
+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.model.rule.RuleInfo;
@@ -30,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.UUID;

iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java → iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceController.java

@@ -11,8 +11,8 @@ package cc.iotkit.manager.controller;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.data.IHomeData;
-import cc.iotkit.data.ISpaceData;
+import cc.iotkit.data.manager.IHomeData;
+import cc.iotkit.data.manager.ISpaceData;
 import cc.iotkit.manager.service.DataOwnerService;
 import cc.iotkit.model.space.Home;
 import cc.iotkit.model.space.Space;
@@ -20,7 +20,6 @@ import cc.iotkit.utils.AuthUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java → iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java

@@ -12,7 +12,6 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.Constants;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.data.*;
 import cc.iotkit.manager.model.vo.FindDeviceVo;
 import cc.iotkit.manager.model.vo.SpaceDeviceVo;
 import cc.iotkit.manager.service.DataOwnerService;
@@ -28,7 +27,6 @@ import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;

iot-starter/src/main/java/cc/iotkit/manager/controller/StatsController.java → iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/StatsController.java

@@ -9,9 +9,9 @@
  */
 package cc.iotkit.manager.controller;
 
-import cc.iotkit.data.ICategoryData;
-import cc.iotkit.data.IDeviceInfoData;
-import cc.iotkit.data.IProductData;
+import cc.iotkit.data.manager.ICategoryData;
+import cc.iotkit.data.manager.IDeviceInfoData;
+import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.manager.model.stats.MainStats;
 import cc.iotkit.temporal.IThingModelMessageData;
 import cc.iotkit.utils.AuthUtil;

iot-starter/src/main/java/cc/iotkit/manager/controller/UserInfoController.java → iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java

@@ -13,9 +13,9 @@ import cc.iotkit.common.Constants;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.ReflectUtil;
-import cc.iotkit.data.IHomeData;
-import cc.iotkit.data.ISpaceData;
-import cc.iotkit.data.IUserInfoData;
+import cc.iotkit.data.manager.IHomeData;
+import cc.iotkit.data.manager.ISpaceData;
+import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.manager.service.DataOwnerService;
 import cc.iotkit.model.UserInfo;
 import cc.iotkit.model.space.Home;
@@ -24,7 +24,6 @@ import cc.iotkit.utils.AuthUtil;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.Collections;
 import java.util.List;

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

@@ -12,7 +12,7 @@ package cc.iotkit.manager.controller;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.ReflectUtil;
-import cc.iotkit.data.IVirtualDeviceData;
+import cc.iotkit.data.manager.IVirtualDeviceData;
 import cc.iotkit.manager.service.DataOwnerService;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.VirtualDevice;
@@ -23,7 +23,6 @@ import cc.iotkit.virtualdevice.VirtualManager;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

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

@@ -11,8 +11,8 @@ package cc.iotkit.manager.service;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Request;
-import cc.iotkit.data.IAlertConfigData;
-import cc.iotkit.data.IAlertRecordData;
+import cc.iotkit.data.manager.IAlertConfigData;
+import cc.iotkit.data.manager.IAlertRecordData;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.alert.AlertConfig;
 import cc.iotkit.model.alert.AlertRecord;

iot-starter/src/main/java/cc/iotkit/manager/service/DataOwnerService.java → iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DataOwnerService.java

@@ -11,7 +11,7 @@ package cc.iotkit.manager.service;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.data.ICommonData;
+import cc.iotkit.data.manager.ICommonData;
 import cc.iotkit.model.Owned;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.utils.AuthUtil;

iot-starter/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java → iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java

@@ -9,8 +9,7 @@
  */
 package cc.iotkit.manager.service;
 
-import cc.iotkit.common.Constants;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.constant.Constants;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.mq.ConsumerHandler;
@@ -24,7 +23,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.async.DeferredResult;
 
 import javax.annotation.PostConstruct;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.*;
 
 /**