diff --git a/iot-common/iot-common-core/pom.xml b/iot-common/iot-common-core/pom.xml index cb84280c..70c5a31e 100644 --- a/iot-common/iot-common-core/pom.xml +++ b/iot-common/iot-common-core/pom.xml @@ -106,6 +106,11 @@ jakarta.validation-api + + org.lionsoul + ip2region + + org.projectlombok lombok diff --git a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ip/AddressUtils.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ip/AddressUtils.java new file mode 100644 index 00000000..dd741dd4 --- /dev/null +++ b/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); + } +} diff --git a/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ip/RegionUtils.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ip/RegionUtils.java new file mode 100644 index 00000000..32abcd25 --- /dev/null +++ b/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地址定位工具类，离线方式 + * 参考地址：集成 ip2region 实现离线IP地址定位库 + * + * @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 "未知"; + } + } + +} diff --git a/iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java b/iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/config/CrossConfig.java similarity index 96% rename from iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java rename to iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/config/CrossConfig.java index 1f1d0f4d..6ae6aa7a 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java b/iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/handler/GlobalExceptionHandler.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java rename to iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/handler/GlobalExceptionHandler.java index de830711..8bd1c404 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java b/iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/handler/ResponseResultHandler.java similarity index 96% rename from iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java rename to iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/handler/ResponseResultHandler.java index 9500b486..59f7bcf5 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java +++ b/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; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java index 29f2affe..548c3479 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java +++ b/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; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java index a4cc406d..afba02b8 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java +++ b/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; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java index be3811e3..35b859cd 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java +++ b/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; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceConfigConsumer.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceConfigConsumer.java index bec04436..f6e23173 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceConfigConsumer.java +++ b/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; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java index e75b1daa..65fcd2d4 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java +++ b/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; diff --git a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DevicePropertyConsumer.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DevicePropertyConsumer.java index 3bb457b5..4ba40733 100755 --- a/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DevicePropertyConsumer.java +++ b/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; diff --git a/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java index 26851ae5..451c4582 100755 --- a/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java +++ b/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; diff --git a/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java index f6731767..9e986f77 100755 --- a/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java +++ b/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; diff --git a/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java index 12168b5a..67675758 100755 --- a/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/CategoryDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/CategoryDataCache.java index 1fe9372f..09522f4f 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/CategoryDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java index b3434446..f26237f6 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java index 95985ff8..86091898 100644 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/OauthClientDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/OauthClientDataCache.java index af00e863..5c485f2c 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/OauthClientDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ProductDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ProductDataCache.java index 22dd62fa..4a3d79bd 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ProductDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ProductModelDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ProductModelDataCache.java index 4f91511d..a794dde6 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ProductModelDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/SpaceDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/SpaceDataCache.java index 4577447a..195a7d24 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/SpaceDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ThingModelDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ThingModelDataCache.java index a13d17b8..1310835d 100644 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/ThingModelDataCache.java +++ b/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; diff --git a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/UserInfoDataCache.java b/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/UserInfoDataCache.java index 14885f22..f3cf8d95 100755 --- a/iot-data/iot-data-cache/src/main/java/cc/iotkit/data/service/UserInfoDataCache.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IAlertConfigData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertConfigData.java similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IAlertConfigData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertConfigData.java index 9cbc1413..10396808 100644 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IAlertConfigData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IAlertRecordData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertRecordData.java similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IAlertRecordData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertRecordData.java index d6523180..e1b845b2 100644 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IAlertRecordData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICategoryData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICategoryData.java old mode 100755 new mode 100644 similarity index 94% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICategoryData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICategoryData.java index 3a8aa250..af612cc1 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICategoryData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelConfigData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelConfigData.java similarity index 86% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelConfigData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelConfigData.java index 58d60d8a..1222034e 100644 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelConfigData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelData.java similarity index 85% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelData.java index c49d4c2d..cbe8fda3 100644 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelTemplateData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelTemplateData.java similarity index 86% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelTemplateData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelTemplateData.java index 2aef682b..51e84d88 100644 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IChannelTemplateData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICommonData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICommonData.java old mode 100755 new mode 100644 similarity index 97% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICommonData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICommonData.java index bf3ee466..8378e5da --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ICommonData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceConfigData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceConfigData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceConfigData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceConfigData.java index 0c971ede..1d115bd1 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceConfigData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceGroupData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceGroupData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceGroupData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceGroupData.java index 93c7664f..1f0d93a4 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceGroupData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceInfoData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java old mode 100755 new mode 100644 similarity index 99% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceInfoData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java index cec4fcf5..a8e0ca6a --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IDeviceInfoData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IHomeData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IHomeData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IHomeData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IHomeData.java index ed405358..6bc06c71 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IHomeData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOauthClientData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOauthClientData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOauthClientData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOauthClientData.java index 6d92c7ab..fea0b5b5 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOauthClientData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOwnedData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOwnedData.java old mode 100755 new mode 100644 similarity index 96% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOwnedData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOwnedData.java index ef7f26a8..fb1be305 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IOwnedData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java index f3f7589a..a0fbf18d --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductModelData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductModelData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductModelData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductModelData.java index 8656ca63..5b716f27 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProductModelData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolComponentData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolComponentData.java old mode 100755 new mode 100644 similarity index 90% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolComponentData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolComponentData.java index 0f459f5f..80d96d22 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolComponentData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolConverterData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolConverterData.java old mode 100755 new mode 100644 similarity index 81% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolConverterData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolConverterData.java index 8a2e91c1..6642fd2a --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IProtocolConverterData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IRuleInfoData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IRuleInfoData.java old mode 100755 new mode 100644 similarity index 92% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IRuleInfoData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IRuleInfoData.java index 2df46d17..f97138bc --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IRuleInfoData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceData.java old mode 100755 new mode 100644 similarity index 96% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceData.java index de395d24..8afbdb37 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceDeviceData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceDeviceData.java old mode 100755 new mode 100644 similarity index 97% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceDeviceData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceDeviceData.java index b376f4bc..dcbe91b3 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ISpaceDeviceData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ITaskInfoData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ITaskInfoData.java old mode 100755 new mode 100644 similarity index 77% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/ITaskInfoData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ITaskInfoData.java index 6686fad3..4fa0a8cb --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/ITaskInfoData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IThingModelData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IThingModelData.java old mode 100755 new mode 100644 similarity index 79% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IThingModelData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IThingModelData.java index 0e866fca..d41b80cb --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IThingModelData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IUserInfoData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IUserInfoData.java old mode 100755 new mode 100644 similarity index 95% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IUserInfoData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IUserInfoData.java index 4882dbb3..8d19f5dc --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IUserInfoData.java +++ b/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; diff --git a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IVirtualDeviceData.java b/iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IVirtualDeviceData.java old mode 100755 new mode 100644 similarity index 96% rename from iot-data/iot-data-service/src/main/java/cc/iotkit/data/IVirtualDeviceData.java rename to iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IVirtualDeviceData.java index c8abefec..c95f8f83 --- a/iot-data/iot-data-service/src/main/java/cc/iotkit/data/IVirtualDeviceData.java +++ b/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; diff --git a/iot-data/iot-es-temporal-service/src/main/java/cc/iotkit/temporal/es/service/DevicePropertyDataImpl.java b/iot-data/iot-es-temporal-service/src/main/java/cc/iotkit/temporal/es/service/DevicePropertyDataImpl.java index ded0e9f4..9c89e6bf 100755 --- a/iot-data/iot-es-temporal-service/src/main/java/cc/iotkit/temporal/es/service/DevicePropertyDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/AlertConfigDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/AlertConfigDataImpl.java index 468663c4..36256643 100644 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/AlertConfigDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/AlertRecordDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/AlertRecordDataImpl.java index a988a930..2906e4a4 100644 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/AlertRecordDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/CategoryDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/CategoryDataImpl.java index 668c3164..ea7f6b09 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/CategoryDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelConfigDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelConfigDataImpl.java index cfe1c1bb..62932b95 100644 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelConfigDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelDataImpl.java index 695ca6a6..23445a52 100644 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelTemplateDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelTemplateDataImpl.java index 477a13e8..0a2cfaca 100644 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ChannelTemplateDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/CommonService.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/CommonService.java index a7c586e1..fe55e36d 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/CommonService.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceConfigDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceConfigDataImpl.java index fa1bf366..d8e08d1c 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceConfigDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceGroupDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceGroupDataImpl.java index bca13cc1..87ced49a 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceGroupDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java index cb08facf..812f09c2 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java +++ b/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.*; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/HomeDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/HomeDataImpl.java index eec60742..8180ddf3 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/HomeDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/OauthClientDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/OauthClientDataImpl.java index ce9386f9..394e285a 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/OauthClientDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProductDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProductDataImpl.java index e54f31ff..a6241df9 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProductDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProductModelDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProductModelDataImpl.java index 5d121c64..92a74c8b 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProductModelDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProtocolComponentDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProtocolComponentDataImpl.java index df1d5f06..fb04d224 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProtocolComponentDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProtocolConverterDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProtocolConverterDataImpl.java index 53611c97..830738d1 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ProtocolConverterDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/RuleInfoDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/RuleInfoDataImpl.java index e0d4b625..b42c6dfa 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/RuleInfoDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/SpaceDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/SpaceDataImpl.java index cf11c07e..6031c91d 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/SpaceDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/SpaceDeviceDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/SpaceDeviceDataImpl.java index 500a0622..003f7a99 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/SpaceDeviceDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java index 579f2eed..df08ddf6 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ThingModelDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ThingModelDataImpl.java index 14cc90e1..d3a3f866 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/ThingModelDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/UserInfoDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/UserInfoDataImpl.java index 83e2edde..a71bcae0 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/UserInfoDataImpl.java +++ b/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; diff --git a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java b/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java index 52fad900..f52c07c2 100755 --- a/iot-data/iot-rdb-data-service/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java +++ b/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; diff --git a/iot-data/iot-td-temporal-service/src/main/java/cc/iotkit/temporal/td/service/DevicePropertyDataImpl.java b/iot-data/iot-td-temporal-service/src/main/java/cc/iotkit/temporal/td/service/DevicePropertyDataImpl.java index 0c244b58..3068de45 100644 --- a/iot-data/iot-td-temporal-service/src/main/java/cc/iotkit/temporal/td/service/DevicePropertyDataImpl.java +++ b/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; diff --git a/iot-data/iot-ts-temporal-service/src/main/java/cc/iotkit/temporal/ts/service/DevicePropertyDataImpl.java b/iot-data/iot-ts-temporal-service/src/main/java/cc/iotkit/temporal/ts/service/DevicePropertyDataImpl.java index c414ac59..84bb1b9d 100644 --- a/iot-data/iot-ts-temporal-service/src/main/java/cc/iotkit/temporal/ts/service/DevicePropertyDataImpl.java +++ b/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; diff --git a/iot-module/iot-manager/pom.xml b/iot-module/iot-manager/pom.xml index 0da51ded..9217bc74 100644 --- a/iot-module/iot-manager/pom.xml +++ b/iot-module/iot-manager/pom.xml @@ -11,6 +11,95 @@ iot-manager + + + + org.bouncycastle + bcprov-jdk15on + + + + com.aliyun.oss + aliyun-sdk-oss + + + + joda-time + joda-time + + + + it.ozimov + embedded-redis + + + slf4j-simple + org.slf4j + + + + + + cc.iotkit + iot-model + + + + cc.iotkit + iot-common-core + + + + cc.iotkit + iot-rule-engine + + + + cc.iotkit + iot-component-server + + + + cc.iotkit + iot-component-converter + + + + cc.iotkit + iot-virtual-device + + + + cc.iotkit + iot-message-core + + + + cc.iotkit + iot-temporal-service + + + + cc.iotkit + iot-rdb-data-service + + + + cc.iotkit + iot-data-cache + + + + cc.iotkit + iot-common-web + + + + cc.iotkit + iot-common-doc + + + diff --git a/iot-starter/src/main/java/cc/iotkit/manager/config/AliyunConfig.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/config/AliyunConfig.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/config/AliyunConfig.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/config/AliyunConfig.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/AlertController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/AlertController.java similarity index 99% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/AlertController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/AlertController.java index beae9695..421c42f7 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/AlertController.java +++ b/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 diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/DeviceController.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/DeviceController.java index 6aa76851..59be49a5 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/NotifyController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/NotifyController.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/NotifyController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/NotifyController.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java similarity index 97% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java index c0d9dfcb..8028b98d 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java index 2ea88dbc..5f68b2e8 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java index b01bedee..3f4c7a95 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceController.java similarity index 97% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceController.java index 08f9d02f..10b2affd 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java similarity index 99% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java index ccc77d72..04b10011 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/StatsController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/StatsController.java similarity index 95% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/StatsController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/StatsController.java index 30a0d9dc..55759728 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/StatsController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/UserInfoController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java similarity index 97% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/UserInfoController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java index 57fd186a..f98f9819 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/UserInfoController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java index 9f6eef19..1c341cfd 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/stats/MainStats.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/stats/MainStats.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/stats/MainStats.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/stats/MainStats.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/AlertService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/AlertService.java similarity index 94% rename from iot-starter/src/main/java/cc/iotkit/manager/service/AlertService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/AlertService.java index 582f5c44..f849646d 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/AlertService.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/DataOwnerService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DataOwnerService.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/service/DataOwnerService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DataOwnerService.java index 252c4b4e..a3a01db2 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/DataOwnerService.java +++ b/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; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java index 8890a12e..53885878 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java +++ b/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.*; /** diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/DeviceService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceService.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/service/DeviceService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceService.java index bd04f5c1..7ee44cb0 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/DeviceService.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceService.java @@ -9,28 +9,29 @@ */ package cc.iotkit.manager.service; -import static cc.iotkit.common.enums.ErrCode.DEVICE_NOT_FOUND; -import static cc.iotkit.common.enums.ErrCode.DEVICE_OFFLINE; - import cc.iotkit.common.exception.BizException; import cc.iotkit.common.thing.ThingService; import cc.iotkit.common.utils.JsonUtils; import cc.iotkit.common.utils.UniqueIdUtil; import cc.iotkit.comps.DeviceComponentManager; -import cc.iotkit.data.IDeviceConfigData; -import cc.iotkit.data.IDeviceInfoData; +import cc.iotkit.data.manager.IDeviceConfigData; +import cc.iotkit.data.manager.IDeviceInfoData; import cc.iotkit.model.device.DeviceConfig; import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.model.device.message.ThingModelMessage; import cc.iotkit.temporal.IThingModelMessageData; import cc.iotkit.virtualdevice.VirtualManager; -import java.util.List; -import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + +import static cc.iotkit.common.enums.ErrCode.DEVICE_NOT_FOUND; +import static cc.iotkit.common.enums.ErrCode.DEVICE_OFFLINE; + @Slf4j @Service public class DeviceService { diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java similarity index 100% rename from iot-starter/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java similarity index 99% rename from iot-starter/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java index 52086566..3733b185 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java @@ -10,7 +10,6 @@ package cc.iotkit.manager.service; import cc.iotkit.common.utils.JsonUtil; -import cc.iotkit.data.*; import cc.iotkit.model.Id; import cc.iotkit.model.OauthClient; import cc.iotkit.model.UserInfo; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/NotifyService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/NotifyService.java similarity index 93% rename from iot-starter/src/main/java/cc/iotkit/manager/service/NotifyService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/NotifyService.java index 260b8cd5..a3ff810f 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/NotifyService.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/NotifyService.java @@ -1,8 +1,8 @@ package cc.iotkit.manager.service; -import cc.iotkit.data.IChannelConfigData; -import cc.iotkit.data.IChannelData; -import cc.iotkit.data.IChannelTemplateData; +import cc.iotkit.data.manager.IChannelConfigData; +import cc.iotkit.data.manager.IChannelData; +import cc.iotkit.data.manager.IChannelTemplateData; import cc.iotkit.model.notify.Channel; import cc.iotkit.model.notify.ChannelConfig; import cc.iotkit.model.notify.ChannelTemplate; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java similarity index 94% rename from iot-starter/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java index 12684ed4..df62d86a 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java @@ -9,9 +9,9 @@ */ package cc.iotkit.manager.service; -import cc.iotkit.data.IDeviceInfoData; -import cc.iotkit.data.IProductData; -import cc.iotkit.data.ISpaceDeviceData; +import cc.iotkit.data.manager.IDeviceInfoData; +import cc.iotkit.data.manager.IProductData; +import cc.iotkit.data.manager.ISpaceDeviceData; import cc.iotkit.manager.model.vo.SpaceDeviceVo; import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.model.product.Product; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/ThingModelService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ThingModelService.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/service/ThingModelService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ThingModelService.java index 25c5328f..fc2396c3 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/ThingModelService.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ThingModelService.java @@ -10,7 +10,7 @@ package cc.iotkit.manager.service; import cc.iotkit.common.thing.ThingService; -import cc.iotkit.data.IThingModelData; +import cc.iotkit.data.manager.IThingModelData; import cc.iotkit.model.device.message.ThingModelMessage; import cc.iotkit.model.product.ThingModel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/iot-starter/src/main/java/cc/iotkit/manager/service/WeChatService.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/WeChatService.java similarity index 98% rename from iot-starter/src/main/java/cc/iotkit/manager/service/WeChatService.java rename to iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/WeChatService.java index 7b3341a1..f2e4cdee 100644 --- a/iot-starter/src/main/java/cc/iotkit/manager/service/WeChatService.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/WeChatService.java @@ -13,7 +13,7 @@ import cc.iotkit.common.Constants; import cc.iotkit.common.exception.BizException; import cc.iotkit.common.utils.CodecUtil; import cc.iotkit.common.utils.JsonUtil; -import cc.iotkit.data.IUserInfoData; +import cc.iotkit.data.manager.IUserInfoData; import cc.iotkit.manager.utils.WeChatUtil; import cc.iotkit.model.UserInfo; import lombok.Data; diff --git a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java index 3c2b63aa..8e98cedb 100644 --- a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java +++ b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java @@ -9,7 +9,7 @@ */ package cc.iotkit.ruleengine.action; -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.script.IScriptEngine; diff --git a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java index a829bc9e..5fc155de 100644 --- a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java +++ b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java @@ -9,7 +9,7 @@ */ package cc.iotkit.ruleengine.filter; -import cc.iotkit.data.IDeviceInfoData; +import cc.iotkit.data.manager.IDeviceInfoData; import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.ruleengine.expression.Expression; import lombok.Data; diff --git a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java index 84907600..a3ed66cc 100644 --- a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java +++ b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java @@ -9,7 +9,7 @@ */ package cc.iotkit.ruleengine.filter; -import cc.iotkit.data.IDeviceInfoData; +import cc.iotkit.data.manager.IDeviceInfoData; import cc.iotkit.model.device.message.ThingModelMessage; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java index 6eada641..32017544 100644 --- a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java +++ b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java @@ -10,8 +10,8 @@ package cc.iotkit.ruleengine.rule; import cc.iotkit.common.utils.JsonUtil; -import cc.iotkit.data.IDeviceInfoData; -import cc.iotkit.data.IRuleInfoData; +import cc.iotkit.data.manager.IDeviceInfoData; +import cc.iotkit.data.manager.IRuleInfoData; import cc.iotkit.model.Paging; import cc.iotkit.model.rule.RuleAction; import cc.iotkit.model.rule.RuleInfo; diff --git a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java index f768465f..1691a17f 100644 --- a/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java +++ b/iot-module/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java @@ -11,7 +11,7 @@ package cc.iotkit.ruleengine.task; import cc.iotkit.common.enums.ErrCode; import cc.iotkit.common.exception.BizException; -import cc.iotkit.data.ITaskInfoData; +import cc.iotkit.data.manager.ITaskInfoData; import cc.iotkit.model.Paging; import cc.iotkit.model.rule.TaskInfo; import cc.iotkit.model.rule.TaskLog; diff --git a/iot-module/iot-system/pom.xml b/iot-module/iot-system/pom.xml index 9a4def5d..5899912d 100644 --- a/iot-module/iot-system/pom.xml +++ b/iot-module/iot-system/pom.xml @@ -48,6 +48,11 @@ iot-model + + cc.iotkit + iot-rdb-data-service + + diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysConfigController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysConfigController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java index 09ff066a..c8e616a1 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysConfigController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDeptController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDeptController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java index b84a1517..3029a643 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDeptController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDeptController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.constant.UserConstants; import cc.iotkit.common.log.annotation.Log; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDictDataController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDictDataController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java index 6bf47cdc..248b9388 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDictDataController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDictTypeController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDictTypeController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java index ccbad46d..bdaf36e1 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysDictTypeController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysMenuController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysMenuController.java similarity index 99% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysMenuController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysMenuController.java index 006c4aae..f14cd9e6 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysMenuController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.constant.TenantConstants; import cc.iotkit.common.constant.UserConstants; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysNoticeController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysNoticeController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java index f3ae3e5c..07fc1bef 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysNoticeController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysOssConfigController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysOssConfigController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java index 73e3274f..33cd5201 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysOssConfigController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysOssController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysOssController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java index bed8151e..3dea96b3 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysOssController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysPostController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java similarity index 98% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysPostController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java index 15f7b844..57d07353 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysPostController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysProfileController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysProfileController.java similarity index 99% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysProfileController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysProfileController.java index 4cef621b..f4fef2e8 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysProfileController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysProfileController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.log.annotation.Log; import cc.iotkit.common.log.enums.BusinessType; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysRoleController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java similarity index 99% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysRoleController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java index c1c8fa5a..9e5d00c8 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysRoleController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysTenantController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java similarity index 99% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysTenantController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java index 8a3f7997..08b6f9f5 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysTenantController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.TenantConstants; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysTenantPackageController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java similarity index 99% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysTenantPackageController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java index 678e4636..ca152af1 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysTenantPackageController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantPackageController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.constant.TenantConstants; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysUserController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java similarity index 99% rename from iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysUserController.java rename to iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java index 7426d111..37384ca6 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/system/SysUserController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java @@ -1,4 +1,4 @@ -package cc.iotkit.system.controller.system; +package cc.iotkit.system.controller; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.model.LoginUser; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysRoleDept.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysRoleDept.java new file mode 100644 index 00000000..50eed1e9 --- /dev/null +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysRoleDept.java @@ -0,0 +1,24 @@ +package cc.iotkit.system.domain; + +import lombok.Data; + +/** + * 角色和部门关联 + * + * @author Lion Li + */ + +@Data +public class SysRoleDept { + + /** + * 角色ID + */ + private Long roleId; + + /** + * 部门ID + */ + private Long deptId; + +} diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysRoleMenu.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysRoleMenu.java new file mode 100644 index 00000000..fe295714 --- /dev/null +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysRoleMenu.java @@ -0,0 +1,24 @@ +package cc.iotkit.system.domain; + +import lombok.Data; + +/** + * 角色和菜单关联 + * + * @author Lion Li + */ + +@Data +public class SysRoleMenu { + + /** + * 角色ID + */ + private Long roleId; + + /** + * 菜单ID + */ + private Long menuId; + +} diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysUserPost.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysUserPost.java new file mode 100644 index 00000000..562b0a44 --- /dev/null +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysUserPost.java @@ -0,0 +1,24 @@ +package cc.iotkit.system.domain; + +import lombok.Data; + +/** + * 用户和岗位关联 + * + * @author Lion Li + */ + +@Data +public class SysUserPost { + + /** + * 用户ID + */ + private Long userId; + + /** + * 岗位ID + */ + private Long postId; + +} diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysUserRole.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysUserRole.java new file mode 100644 index 00000000..c3ce8679 --- /dev/null +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/domain/SysUserRole.java @@ -0,0 +1,24 @@ +package cc.iotkit.system.domain; + +import lombok.Data; + +/** + * 用户和角色关联 + * + * @author Lion Li + */ + +@Data +public class SysUserRole { + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + +} diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/mapper/SysDeptMapper.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/mapper/SysDeptMapper.java index 1c7d6d7b..da4028a0 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/mapper/SysDeptMapper.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/mapper/SysDeptMapper.java @@ -1,13 +1,6 @@ package cc.iotkit.system.mapper; import cc.iotkit.system.domain.vo.SysDeptVo; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import cc.iotkit.system.domain.SysDept; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java index d26b527c..4593bda9 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysRoleService.java @@ -2,6 +2,7 @@ package cc.iotkit.system.service; import cc.iotkit.common.api.PageRequest; import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.system.domain.SysUserRole; import cc.iotkit.system.domain.bo.SysRoleBo; import cc.iotkit.system.domain.vo.SysRoleVo; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java index 380b56ec..792d17d8 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.service.DeptService; import cc.iotkit.system.domain.bo.SysDeptBo; import cc.iotkit.system.domain.vo.SysDeptVo; import cc.iotkit.system.mapper.SysDeptMapper; @@ -9,23 +10,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import cc.iotkit.system.domain.SysDept; -import cc.iotkit.system.domain.SysRole; -import cc.iotkit.system.domain.SysUser; import cc.iotkit.system.service.ISysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java index 672443bb..d7e8d66c 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictDataServiceImpl.java @@ -1,19 +1,15 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.SysDictData; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.CacheNames; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.redis.utils.CacheUtils; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.model.system.SysDictData; import cc.iotkit.system.domain.bo.SysDictDataBo; import cc.iotkit.system.domain.vo.SysDictDataVo; import cc.iotkit.system.mapper.SysDictDataMapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.utils.CacheUtils; import cc.iotkit.system.service.ISysDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; @@ -33,9 +29,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService { private final SysDictDataMapper baseMapper; @Override - public TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { + public PagedDataVo selectPageDictDataList(SysDictDataBo dictData, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); } @@ -116,7 +112,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); } - throw new ServiceException("操作失败"); + throw new BizException("操作失败"); } /** @@ -133,7 +129,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); } - throw new ServiceException("操作失败"); + throw new BizException("操作失败"); } } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java index 48e82ee6..5e8f142d 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java @@ -1,30 +1,25 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.SysDictData; -import cc.iotkit.system.domain.SysDictType; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.CacheConstants; +import cc.iotkit.common.constant.CacheNames; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.redis.utils.CacheUtils; +import cc.iotkit.common.service.DictService; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.SpringUtils; +import cc.iotkit.common.utils.StreamUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.SysDictData; +import cc.iotkit.model.system.SysDictType; import cc.iotkit.system.domain.bo.SysDictTypeBo; import cc.iotkit.system.domain.vo.SysDictDataVo; import cc.iotkit.system.domain.vo.SysDictTypeVo; import cc.iotkit.system.mapper.SysDictDataMapper; -import cc.iotkit.system.mapper.SysDictTypeMapper; import cn.dev33.satoken.context.SaHolder; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; import cc.iotkit.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; @@ -51,9 +46,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService private final SysDictDataMapper dictDataMapper; @Override - public TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { + public PagedDataVo selectPageDictTypeList(SysDictTypeBo dictType, PageRequest pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); } @@ -169,7 +164,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService if (row > 0) { return new ArrayList<>(); } - throw new ServiceException("操作失败"); + throw new BizException("操作失败"); } /** @@ -192,7 +187,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); return dictDataMapper.selectDictDataByType(dict.getDictType()); } - throw new ServiceException("操作失败"); + throw new BizException("操作失败"); } /** diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java index 10b5d246..c71423c2 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java @@ -1,21 +1,18 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.SysLogininfor; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.Constants; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.log.event.LogininforEvent; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.ServletUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.common.utils.ip.AddressUtils; +import cc.iotkit.model.system.SysLogininfor; import cc.iotkit.system.domain.bo.SysLogininforBo; import cc.iotkit.system.domain.vo.SysLogininforVo; -import cc.iotkit.system.mapper.SysLogininforMapper; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; import cc.iotkit.system.service.ISysLogininforService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -93,7 +90,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService { } @Override - public TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery) { + public PagedDataVo selectPageLogininforList(SysLogininforBo logininfor, PageRequest query) { Map params = logininfor.getParams(); LambdaQueryWrapper lqw = new LambdaQueryWrapper() .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) @@ -101,7 +98,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService { .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) .between(params.get("beginTime") != null && params.get("endTime") != null, SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); - if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { + if (StringUtils.isBlank(query.getOrderByColumn())) { pageQuery.setOrderByColumn("info_id"); pageQuery.setIsAsc("desc"); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysMenuServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysMenuServiceImpl.java index c7a48944..960d3f2e 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysMenuServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysMenuServiceImpl.java @@ -1,30 +1,23 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.constant.UserConstants; +import cc.iotkit.common.satoken.utils.LoginHelper; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StreamUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.SysMenu; +import cc.iotkit.model.system.SysRole; +import cc.iotkit.model.system.SysTenantPackage; import cc.iotkit.system.domain.bo.SysMenuBo; import cc.iotkit.system.domain.vo.MetaVo; import cc.iotkit.system.domain.vo.RouterVo; import cc.iotkit.system.domain.vo.SysMenuVo; import cc.iotkit.system.mapper.SysMenuMapper; import cc.iotkit.system.mapper.SysRoleMapper; -import cc.iotkit.system.mapper.SysRoleMenuMapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import cc.iotkit.system.domain.SysMenu; -import cc.iotkit.system.domain.SysRole; -import cc.iotkit.system.domain.SysRoleMenu; -import cc.iotkit.system.domain.SysTenantPackage; -import cc.iotkit.system.mapper.SysTenantPackageMapper; import cc.iotkit.system.service.ISysMenuService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java index acc9c436..bd290cd2 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysNoticeServiceImpl.java @@ -1,19 +1,14 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.model.system.SysNotice; import cc.iotkit.system.domain.bo.SysNoticeBo; import cc.iotkit.system.domain.vo.SysNoticeVo; import cc.iotkit.system.domain.vo.SysUserVo; -import cc.iotkit.system.mapper.SysNoticeMapper; import cc.iotkit.system.mapper.SysUserMapper; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import cc.iotkit.system.domain.SysNotice; import cc.iotkit.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,9 +29,9 @@ public class SysNoticeServiceImpl implements ISysNoticeService { private final SysUserMapper userMapper; @Override - public TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { + public PagedDataVo selectPageNoticeList(SysNoticeBo notice, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(notice); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java index 30249abb..ad7cac4c 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOperLogServiceImpl.java @@ -1,18 +1,15 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.SysOperLog; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.log.event.OperLogEvent; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.common.utils.ip.AddressUtils; +import cc.iotkit.model.system.SysOperLog; import cc.iotkit.system.domain.bo.SysOperLogBo; import cc.iotkit.system.domain.vo.SysOperLogVo; -import cc.iotkit.system.mapper.SysOperLogMapper; import cn.hutool.core.util.ArrayUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.OperLogEvent; import cc.iotkit.system.service.ISysOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; @@ -50,7 +47,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { } @Override - public TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { + public PagedDataVo selectPageOperLogList(SysOperLogBo operLog, PageRequest query) { Map params = operLog.getParams(); LambdaQueryWrapper lqw = new LambdaQueryWrapper() .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) @@ -66,7 +63,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) .between(params.get("beginTime") != null && params.get("endTime") != null, SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")); - if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { + if (StringUtils.isBlank(query.getOrderByColumn())) { pageQuery.setOrderByColumn("oper_id"); pageQuery.setIsAsc("desc"); } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java index 144c34f3..228f7ddd 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssConfigServiceImpl.java @@ -1,30 +1,24 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.SysOssConfig; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.CacheNames; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.redis.utils.CacheUtils; +import cc.iotkit.common.redis.utils.RedisUtils; +import cc.iotkit.common.tenant.core.TenantEntity; +import cc.iotkit.common.tenant.helper.TenantHelper; +import cc.iotkit.common.utils.JsonUtils; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StreamUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.SysOssConfig; import cc.iotkit.system.domain.bo.SysOssConfigBo; import cc.iotkit.system.domain.vo.SysOssConfigVo; -import cc.iotkit.system.mapper.SysOssConfigMapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.common.tenant.helper.TenantHelper; import cc.iotkit.system.service.ISysOssConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,9 +74,9 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { } @Override - public TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { + public PagedDataVo queryPageList(SysOssConfigBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(result); } @@ -129,7 +123,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { private void validEntityBeforeSave(SysOssConfig entity) { if (StringUtils.isNotEmpty(entity.getConfigKey()) && !checkConfigKeyUnique(entity)) { - throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); + throw new BizException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); } } @@ -137,7 +131,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) { - throw new ServiceException("系统内置, 不可删除!"); + throw new BizException("系统内置, 不可删除!"); } } List list = CollUtil.newArrayList(); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java index afac795f..c933bcc8 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysOssServiceImpl.java @@ -1,29 +1,20 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.CacheNames; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.service.OssService; +import cc.iotkit.common.utils.SpringUtils; +import cc.iotkit.common.utils.StreamUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.common.utils.file.FileUtils; +import cc.iotkit.model.system.SysOss; import cc.iotkit.system.domain.bo.SysOssBo; import cc.iotkit.system.domain.vo.SysOssVo; -import cc.iotkit.system.mapper.SysOssMapper; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enumd.AccessPolicyType; -import org.dromara.common.oss.factory.OssFactory; -import cc.iotkit.system.domain.SysOss; import cc.iotkit.system.service.ISysOssService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -48,9 +39,9 @@ public class SysOssServiceImpl implements ISysOssService, OssService { private final SysOssMapper baseMapper; @Override - public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { + public PagedDataVo queryPageList(SysOssBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPage(query.build(), lqw); List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); result.setRecords(filterResult); return TableDataInfo.build(result); @@ -104,7 +95,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { public void download(Long ossId, HttpServletResponse response) throws IOException { SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); if (ObjectUtil.isNull(sysOss)) { - throw new ServiceException("文件数据不存在!"); + throw new BizException("文件数据不存在!"); } FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); @@ -114,7 +105,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { IoUtil.copy(inputStream, response.getOutputStream(), available); response.setContentLength(available); } catch (Exception e) { - throw new ServiceException(e.getMessage()); + throw new BizException(e.getMessage()); } } diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPermissionServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPermissionServiceImpl.java index d91cd021..2ccbc77a 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPermissionServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPermissionServiceImpl.java @@ -1,9 +1,9 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.constant.TenantConstants; +import cc.iotkit.common.satoken.utils.LoginHelper; import cc.iotkit.system.service.ISysMenuService; import cc.iotkit.system.service.ISysRoleService; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.satoken.utils.LoginHelper; import cc.iotkit.system.service.ISysPermissionService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java index aec82ee3..519ef23e 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysPostServiceImpl.java @@ -1,21 +1,14 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.model.system.SysPost; import cc.iotkit.system.domain.bo.SysPostBo; import cc.iotkit.system.domain.vo.SysPostVo; import cc.iotkit.system.mapper.SysPostMapper; -import cc.iotkit.system.mapper.SysUserPostMapper; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import cc.iotkit.system.domain.SysPost; -import cc.iotkit.system.domain.SysUserPost; import cc.iotkit.system.service.ISysPostService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -36,9 +29,9 @@ public class SysPostServiceImpl implements ISysPostService { private final SysUserPostMapper userPostMapper; @Override - public TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery) { + public PagedDataVo selectPagePostList(SysPostBo post, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(post); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(page); } @@ -156,7 +149,7 @@ public class SysPostServiceImpl implements ISysPostService { for (Long postId : postIds) { SysPost post = baseMapper.selectById(postId); if (countUserPostById(postId) > 0) { - throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); + throw new BizException(String.format("%1$s已分配,不能删除", post.getPostName())); } } return baseMapper.deleteBatchIds(Arrays.asList(postIds)); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java index 7f1ad858..6e95674a 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java @@ -1,33 +1,24 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.domain.model.LoginUser; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.satoken.utils.LoginHelper; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StreamUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.SysRole; +import cc.iotkit.system.domain.SysRoleDept; +import cc.iotkit.system.domain.SysRoleMenu; +import cc.iotkit.system.domain.SysUserRole; import cc.iotkit.system.domain.bo.SysRoleBo; import cc.iotkit.system.domain.vo.SysRoleVo; -import cc.iotkit.system.mapper.SysRoleDeptMapper; import cc.iotkit.system.mapper.SysRoleMapper; -import cc.iotkit.system.mapper.SysRoleMenuMapper; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import cc.iotkit.system.domain.SysRole; -import cc.iotkit.system.domain.SysRoleDept; -import cc.iotkit.system.domain.SysRoleMenu; -import cc.iotkit.system.domain.SysUserRole; import cc.iotkit.system.mapper.SysUserRoleMapper; import cc.iotkit.system.service.ISysRoleService; import lombok.RequiredArgsConstructor; @@ -51,8 +42,8 @@ public class SysRoleServiceImpl implements ISysRoleService { private final SysRoleDeptMapper roleDeptMapper; @Override - public TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { - Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); + public PagedDataVo selectPageRoleList(SysRoleBo role, PageRequest query) { + Page page = baseMapper.selectPageRoleList(query.build(), this.buildQueryWrapper(role)); return TableDataInfo.build(page); } @@ -188,7 +179,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override public void checkRoleAllowed(Long roleId) { if (ObjectUtil.isNotNull(roleId) && LoginHelper.isSuperAdmin(roleId)) { - throw new ServiceException("不允许操作超级管理员角色"); + throw new BizException("不允许操作超级管理员角色"); } } @@ -207,7 +198,7 @@ public class SysRoleServiceImpl implements ISysRoleService { } List roles = this.selectRoleList(new SysRoleBo(roleId)); if (CollUtil.isEmpty(roles)) { - throw new ServiceException("没有权限访问角色数据！"); + throw new BizException("没有权限访问角色数据！"); } } @@ -361,7 +352,7 @@ public class SysRoleServiceImpl implements ISysRoleService { checkRoleDataScope(roleId); SysRole role = baseMapper.selectById(roleId); if (countUserRoleByRoleId(roleId) > 0) { - throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName())); + throw new BizException(String.format("%1$s已分配,不能删除", role.getRoleName())); } } List ids = Arrays.asList(roleIds); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysSensitiveServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysSensitiveServiceImpl.java deleted file mode 100644 index 02182081..00000000 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysSensitiveServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package cc.iotkit.system.service.impl; - -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sensitive.core.SensitiveService; -import org.springframework.stereotype.Service; - -/** - * 脱敏服务 - * 默认管理员不过滤 - * 需自行根据业务重写实现 - * - * @author Lion Li - * @version 3.6.0 - */ -@Service -public class SysSensitiveServiceImpl implements SensitiveService { - - /** - * 是否脱敏 - */ - @Override - public boolean isSensitive() { - return !LoginHelper.isSuperAdmin() || !LoginHelper.isTenantAdmin(); - } - -} diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java index 6d952c9e..f01615c2 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantPackageServiceImpl.java @@ -1,21 +1,15 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.SysTenant; -import cc.iotkit.system.domain.SysTenantPackage; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.SysTenant; +import cc.iotkit.model.system.SysTenantPackage; import cc.iotkit.system.domain.bo.SysTenantPackageBo; import cc.iotkit.system.domain.vo.SysTenantPackageVo; -import cc.iotkit.system.mapper.SysTenantMapper; -import cc.iotkit.system.mapper.SysTenantPackageMapper; import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import cc.iotkit.system.service.ISysTenantPackageService; @@ -50,7 +44,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 查询租户套餐列表 */ @Override - public TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery) { + public PagedDataVo queryPageList(SysTenantPackageBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); @@ -138,7 +132,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { if(isValid){ boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(SysTenant::getPackageId, ids)); if (exists) { - throw new ServiceException("租户套餐已被使用"); + throw new BizException("租户套餐已被使用"); } } return baseMapper.deleteBatchIds(ids) > 0; diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java index 1cd90b47..daf8469f 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysTenantServiceImpl.java @@ -1,6 +1,17 @@ package cc.iotkit.system.service.impl; -import cc.iotkit.system.domain.*; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.CacheNames; +import cc.iotkit.common.constant.Constants; +import cc.iotkit.common.constant.TenantConstants; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.*; +import cc.iotkit.system.domain.SysRoleDept; +import cc.iotkit.system.domain.SysRoleMenu; +import cc.iotkit.system.domain.SysUserRole; import cc.iotkit.system.domain.bo.SysTenantBo; import cc.iotkit.system.domain.vo.SysTenantVo; import cc.iotkit.system.mapper.*; @@ -8,21 +19,7 @@ import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.*; -import org.dromara.system.mapper.*; import cc.iotkit.system.service.ISysTenantService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -76,9 +73,9 @@ public class SysTenantServiceImpl implements ISysTenantService { * 查询租户列表 */ @Override - public TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery) { + public PagedDataVo queryPageList(SysTenantBo bo, PageRequest query) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPage(query.build(), lqw); return TableDataInfo.build(result); } @@ -123,7 +120,7 @@ public class SysTenantServiceImpl implements ISysTenantService { add.setTenantId(tenantId); boolean flag = baseMapper.insert(add) > 0; if (!flag) { - throw new ServiceException("创建租户失败"); + throw new BizException("创建租户失败"); } bo.setId(add.getId()); @@ -214,7 +211,7 @@ public class SysTenantServiceImpl implements ISysTenantService { // 获取租户套餐 SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); if (ObjectUtil.isNull(tenantPackage)) { - throw new ServiceException("套餐不存在"); + throw new BizException("套餐不存在"); } // 获取套餐菜单id List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java index 1e687465..50022336 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java @@ -1,5 +1,19 @@ package cc.iotkit.system.service.impl; +import cc.iotkit.common.api.PageRequest; +import cc.iotkit.common.constant.CacheNames; +import cc.iotkit.common.constant.UserConstants; +import cc.iotkit.common.domain.vo.PagedDataVo; +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.satoken.utils.LoginHelper; +import cc.iotkit.common.service.UserService; +import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StreamUtils; +import cc.iotkit.common.utils.StringUtils; +import cc.iotkit.model.system.SysDept; +import cc.iotkit.model.system.SysUser; +import cc.iotkit.system.domain.SysUserPost; +import cc.iotkit.system.domain.SysUserRole; import cc.iotkit.system.domain.bo.SysUserBo; import cc.iotkit.system.domain.vo.SysPostVo; import cc.iotkit.system.domain.vo.SysRoleVo; @@ -8,30 +22,8 @@ import cc.iotkit.system.mapper.*; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import cc.iotkit.system.domain.SysDept; -import cc.iotkit.system.domain.SysUser; -import cc.iotkit.system.domain.SysUserPost; -import cc.iotkit.system.domain.SysUserRole; -import org.dromara.system.mapper.*; import cc.iotkit.system.service.ISysUserService; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -58,8 +50,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService { private final SysUserPostMapper userPostMapper; @Override - public TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery) { - Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); + public PagedDataVo selectPageUserList(SysUserBo user, PageRequest query) { + Page page = baseMapper.selectPageUserList(query.build(), this.buildQueryWrapper(user)); return TableDataInfo.build(page); } @@ -102,14 +94,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery) { + public PagedDataVo selectAllocatedList(SysUserBo user, PageRequest query) { QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId()) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()); - Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); + Page page = baseMapper.selectAllocatedList(query.build(), wrapper); return TableDataInfo.build(page); } @@ -120,7 +112,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { + public PagedDataVo selectUnallocatedList(SysUserBo user, PageRequest query) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) @@ -128,7 +120,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()); - Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); + Page page = baseMapper.selectUnallocatedList(query.build(), wrapper); return TableDataInfo.build(page); } @@ -243,7 +235,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public void checkUserAllowed(Long userId) { if (ObjectUtil.isNotNull(userId) && LoginHelper.isSuperAdmin(userId)) { - throw new ServiceException("不允许操作超级管理员用户"); + throw new BizException("不允许操作超级管理员用户"); } } @@ -261,7 +253,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return; } if (ObjectUtil.isNull(baseMapper.selectUserById(userId))) { - throw new ServiceException("没有权限访问用户数据！"); + throw new BizException("没有权限访问用户数据！"); } } @@ -317,7 +309,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { // 防止错误更新后导致的数据误删除 int flag = baseMapper.updateById(sysUser); if (flag < 1) { - throw new ServiceException("修改用户" + user.getUserName() + "信息失败"); + throw new BizException("修改用户" + user.getUserName() + "信息失败"); } return flag; } @@ -442,7 +434,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { // 判断是否具有此角色的操作权限 List roles = roleMapper.selectRoleList(new LambdaQueryWrapper<>()); if (CollUtil.isEmpty(roles)) { - throw new ServiceException("没有权限访问角色的数据"); + throw new BizException("没有权限访问角色的数据"); } List roleList = StreamUtils.toList(roles, SysRoleVo::getRoleId); if (!LoginHelper.isSuperAdmin(userId)) { @@ -450,7 +442,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } List canDoRoleList = StreamUtils.filter(List.of(roleIds), roleList::contains); if (CollUtil.isEmpty(canDoRoleList)) { - throw new ServiceException("没有权限访问角色的数据"); + throw new BizException("没有权限访问角色的数据"); } if (clear) { // 删除用户与角色关联 @@ -483,7 +475,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { // 防止更新失败导致的数据删除 int flag = baseMapper.deleteById(userId); if (flag < 1) { - throw new ServiceException("删除用户失败!"); + throw new BizException("删除用户失败!"); } return flag; } @@ -509,7 +501,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { // 防止更新失败导致的数据删除 int flag = baseMapper.deleteBatchIds(ids); if (flag < 1) { - throw new ServiceException("删除用户失败!"); + throw new BizException("删除用户失败!"); } return flag; } diff --git a/iot-starter/src/main/.DS_Store b/iot-starter/src/main/.DS_Store new file mode 100644 index 00000000..0e98056e Binary files /dev/null and b/iot-starter/src/main/.DS_Store differ diff --git a/iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java b/iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java deleted file mode 100644 index 7d6d37a6..00000000 --- a/iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.manager.config; - -import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; -import cn.dev33.satoken.interceptor.SaRouteInterceptor; -import cn.dev33.satoken.router.SaRouter; -import cn.dev33.satoken.stp.StpUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.Arrays; -import java.util.List; - -@Slf4j -@Configuration -public class SaTokenConfigure implements WebMvcConfigurer { - - @Override - public void addInterceptors(InterceptorRegistry registry) { - List urls = Arrays.asList("/favicon.ico", - "h2", - "/error", - "*.png", - "*.js", - "/oauth2/**", - "*.html", - "/favicon.ico", - "/swagger-resources/**", - "/webjars/**", "/v2/**", "/doc.html", "**/swagger-ui.html", "/swagger-ui.html/**","/swagger-ui/**"); - - // 注册注解拦截器 - registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); - // 注册路由拦截器，自定义认证规则 - registry.addInterceptor(new SaRouteInterceptor((req, res, handler) -> { - log.info("resource role check,path:{}", req.getRequestPath()); - - //客户端角色能使用的功能 - if (StpUtil.hasRole("iot_client")) { - if (SaRouter - .match("/space/addSpace/**", - "/space/saveSpace/**", - "/space/delSpace/**", - "/space/saveHome/**", - "/space/currentHome/**", - "/space/changCurrentHome/**", - "/space/getUserHomes/**", - "/space/myRecentDevices/**", - "/space/spaces/**", - "/space/myDevices/**", - "/space/findDevice/**", - "/space/addDevice/**", - "/space/collectDevice/**", - "/space/getCollectDevices/**", - "/space/saveDevice", - "/space/removeDevice", - "/space/setOpenUid", - "/space/device/*", - "/device/*/consumer/*", - "/device/*/service/property/set", - "/device/*/service/*/invoke", - "/user/*/modifyPwd" - ).isHit()) { - return; - } - } - - SaRouter - //除了以上所有功能都需要 管理员或系统用户角色 - .match("/**") - .check(c -> StpUtil.checkRoleOr("iot_admin", "iot_system")) - //需要有可写权限的功能 - .match( - "/**/save*", - "/**/save*/**", - "/**/remove*/**", - "/**/del*", - "/**/del*/**", - "/**/add*", - "/**/add*/**", - "/**/create*/**", - "/**/clear*/**", - "/**/set*/**", - "/**/set", - "/**/invoke" - ).check(c -> StpUtil.checkPermission("write")); - - })).addPathPatterns("/**") - .excludePathPatterns(urls); - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - WebMvcConfigurer.super.addResourceHandlers(registry); - } - -} diff --git a/iot-starter/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java b/iot-starter/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java deleted file mode 100644 index cdc5eb45..00000000 --- a/iot-starter/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.manager.utils; - -import lombok.extern.slf4j.Slf4j; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; - -import javax.crypto.Cipher; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import javax.net.ssl.HttpsURLConnection; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.security.Security; - -/** - * 微信小程序工具类 - */ -@Slf4j -public class WeChatUtil { - - public static String httpRequest(String requestUrl, String requestMethod, String output) { - try { - URL url = new URL(requestUrl); - HttpsURLConnection connection = (HttpsURLConnection) url.openConnection(); - connection.setDoOutput(true); - connection.setDoInput(true); - connection.setUseCaches(false); - connection.setRequestMethod(requestMethod); - if (null != output) { - OutputStream outputStream = connection.getOutputStream(); - outputStream.write(output.getBytes(StandardCharsets.UTF_8)); - outputStream.close(); - } - // 从输入流读取返回内容 - InputStream inputStream = connection.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader); - String str; - StringBuilder buffer = new StringBuilder(); - while ((str = bufferedReader.readLine()) != null) { - buffer.append(str); - } - bufferedReader.close(); - inputStreamReader.close(); - inputStream.close(); - connection.disconnect(); - return buffer.toString(); - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } - - public static String decryptData(String encryptDataB64, String sessionKeyB64, String ivB64) { - return new String( - decryptOfDiyIv( - Base64.decode(encryptDataB64), - Base64.decode(sessionKeyB64), - Base64.decode(ivB64) - ) - ); - } - - private static final String KEY_ALGORITHM = "AES"; - private static final String ALGORITHM_STR = "AES/CBC/PKCS7Padding"; - private static Key key; - private static Cipher cipher; - - private static void init(byte[] keyBytes) { - // 如果密钥不足16位，那么就补足. 这个if 中的内容很重要 - int base = 16; - if (keyBytes.length % base != 0) { - int groups = keyBytes.length / base + 1; - byte[] temp = new byte[groups * base]; - Arrays.fill(temp, (byte) 0); - System.arraycopy(keyBytes, 0, temp, 0, keyBytes.length); - keyBytes = temp; - } - // 初始化 - Security.addProvider(new BouncyCastleProvider()); - // 转化成JAVA的密钥格式 - key = new SecretKeySpec(keyBytes, KEY_ALGORITHM); - try { - // 初始化cipher - cipher = Cipher.getInstance(ALGORITHM_STR, "BC"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 解密方法 - * - * @param encryptedData 要解密的字符串 - * @param keyBytes 解密密钥 - * @param ivs 自定义对称解密算法初始向量 iv - * @return 解密后的字节数组 - */ - private static byte[] decryptOfDiyIv(byte[] encryptedData, byte[] keyBytes, byte[] ivs) { - byte[] encryptedText = null; - init(keyBytes); - try { - cipher.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(ivs)); - encryptedText = cipher.doFinal(encryptedData); - } catch (Exception e) { - e.printStackTrace(); - } - return encryptedText; - } - -} \ No newline at end of file diff --git a/iot-starter/src/main/resources/ip2region.xdb b/iot-starter/src/main/resources/ip2region.xdb new file mode 100644 index 00000000..31f96a1f Binary files /dev/null and b/iot-starter/src/main/resources/ip2region.xdb differ diff --git a/iot-starter/src/test/java/JsTest.java b/iot-starter/src/test/java/JsTest.java deleted file mode 100644 index 9e7a23bb..00000000 --- a/iot-starter/src/test/java/JsTest.java +++ /dev/null @@ -1,34 +0,0 @@ -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; -import javax.script.SimpleBindings; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URI; - -import static javax.script.ScriptContext.GLOBAL_SCOPE; - -public class JsTest { - public static void main(String[] args) throws ScriptException, IOException { - ScriptEngineManager manager = new ScriptEngineManager(); - ScriptEngine engine = manager.getEngineByName("nashorn"); - SimpleBindings bindings = new SimpleBindings(); - engine.getContext().setBindings(bindings, GLOBAL_SCOPE); - engine.eval("print('aaaaaa')"); - bindings.put("aa", "test"); - engine.eval("print(aa);", bindings); - - bindings.put("test", (Runnable) () -> System.out.println("test func")); - engine.eval("test()", bindings); - - ScriptEngineManager manager2 = new ScriptEngineManager(); - ScriptEngine engine2 = manager.getEngineByName("nashorn"); - engine2.eval(new InputStreamReader(URI.create("https://requirejs.org/docs/release/2.3.6/minified/require.js").toURL().openStream())); - - ScriptEngineManager manager3 = new ScriptEngineManager(); - ScriptEngine engine3 = manager.getEngineByName("nashorn"); - engine3.eval("print(requirejs);",engine2.getContext()); - - - } -} diff --git a/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java index deeb57f6..aff8289e 100644 --- a/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java +++ b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java @@ -12,8 +12,8 @@ package cc.iotkit.virtualdevice; import cc.iotkit.common.thing.ThingService; import cc.iotkit.common.utils.JsonUtil; import cc.iotkit.comps.service.DeviceBehaviourService; -import cc.iotkit.data.IDeviceInfoData; -import cc.iotkit.data.IVirtualDeviceData; +import cc.iotkit.data.manager.IDeviceInfoData; +import cc.iotkit.data.manager.IVirtualDeviceData; import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.model.device.VirtualDevice; import cc.iotkit.model.device.VirtualDeviceLog; diff --git a/pom.xml b/pom.xml index d1ddfe0e..2b893438 100755 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 2.14.2 5.2.3 3.2.1 + 2.7.0 @@ -308,6 +309,13 @@ + + + org.lionsoul + ip2region + ${ip2region.version} + + cc.iotkit iot-model @@ -469,6 +477,12 @@ ${project.version} + + cc.iotkit + iot-common-doc + ${project.version} + +