diff --git a/nl-iot/src/main/java/org/nl/iot/core/package-info.java b/nl-iot/src/main/java/org/nl/iot/core/package-info.java new file mode 100644 index 0000000..8e5b81d --- /dev/null +++ b/nl-iot/src/main/java/org/nl/iot/core/package-info.java @@ -0,0 +1,6 @@ +/** + * 核心包（通信协议工具、配置等） + * @author: lyd + * @date: 2026/2/28 + */ +package org.nl.iot.core; \ No newline at end of file diff --git a/nl-iot/src/main/java/org/nl/module/iot/controller/IotConfigController.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotConfigController.java similarity index 93% rename from nl-iot/src/main/java/org/nl/module/iot/controller/IotConfigController.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotConfigController.java index 128190f..558bd1c 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/controller/IotConfigController.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotConfigController.java @@ -10,7 +10,7 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.module.iot.controller; +package org.nl.iot.modular.iot.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,9 +18,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.nl.common.pojo.CommonResult; -import org.nl.module.iot.entity.IotConfig; -import org.nl.module.iot.service.IotDeviceService; -import org.nl.module.iot.service.IotConfigService; +import org.nl.iot.modular.iot.entity.IotConfig; +import org.nl.iot.modular.iot.entity.IotDevice; +import org.nl.iot.modular.iot.service.IotDeviceService; +import org.nl.iot.modular.iot.service.IotConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -114,8 +115,8 @@ public class IotConfigController { .collect(java.util.stream.Collectors.toSet()); if (!deviceIds.isEmpty()) { iotDeviceService.lambdaUpdate() - .in(org.nl.module.iot.entity.IotDevice::getId, deviceIds) - .set(org.nl.module.iot.entity.IotDevice::getIsConfig, true) + .in(IotDevice::getId, deviceIds) + .set(IotDevice::getIsConfig, true) .update(); } } diff --git a/nl-iot/src/main/java/org/nl/module/iot/controller/IotConnectController.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotConnectController.java similarity index 95% rename from nl-iot/src/main/java/org/nl/module/iot/controller/IotConnectController.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotConnectController.java index 6459493..b491693 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/controller/IotConnectController.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotConnectController.java @@ -10,7 +10,7 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.module.iot.controller; +package org.nl.iot.modular.iot.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,10 +18,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.nl.common.pojo.CommonResult; -import org.nl.module.iot.entity.IotConnect; -import org.nl.module.iot.entity.IotConfig; -import org.nl.module.iot.service.IotConfigService; -import org.nl.module.iot.service.IotConnectService; +import org.nl.iot.modular.iot.entity.IotConnect; +import org.nl.iot.modular.iot.entity.IotConfig; +import org.nl.iot.modular.iot.service.IotConfigService; +import org.nl.iot.modular.iot.service.IotConnectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/nl-iot/src/main/java/org/nl/module/iot/controller/IotDeviceController.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotDeviceController.java similarity index 95% rename from nl-iot/src/main/java/org/nl/module/iot/controller/IotDeviceController.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotDeviceController.java index aafea76..b0b7ebc 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/controller/IotDeviceController.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotDeviceController.java @@ -10,7 +10,7 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.module.iot.controller; +package org.nl.iot.modular.iot.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,10 +18,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.nl.common.pojo.CommonResult; -import org.nl.module.iot.entity.IotDevice; -import org.nl.module.iot.entity.IotConfig; -import org.nl.module.iot.service.IotDeviceService; -import org.nl.module.iot.service.IotConfigService; +import org.nl.iot.modular.iot.entity.IotDevice; +import org.nl.iot.modular.iot.entity.IotConfig; +import org.nl.iot.modular.iot.service.IotDeviceService; +import org.nl.iot.modular.iot.service.IotConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/nl-iot/src/main/java/org/nl/module/iot/controller/IotModelController.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotModelController.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/controller/IotModelController.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotModelController.java index c4d4db3..8df1608 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/controller/IotModelController.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotModelController.java @@ -10,7 +10,7 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.module.iot.controller; +package org.nl.iot.modular.iot.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,10 +18,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.nl.common.pojo.CommonResult; -import org.nl.module.iot.entity.IotModel; -import org.nl.module.iot.entity.IotModelTags; -import org.nl.module.iot.service.IotModelService; -import org.nl.module.iot.service.IotModelTagsService; +import org.nl.iot.modular.iot.entity.IotModel; +import org.nl.iot.modular.iot.entity.IotModelTags; +import org.nl.iot.modular.iot.service.IotModelService; +import org.nl.iot.modular.iot.service.IotModelTagsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; diff --git a/nl-iot/src/main/java/org/nl/module/iot/controller/IotModelTagsController.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotModelTagsController.java similarity index 96% rename from nl-iot/src/main/java/org/nl/module/iot/controller/IotModelTagsController.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotModelTagsController.java index 321ede0..3a63146 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/controller/IotModelTagsController.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/controller/IotModelTagsController.java @@ -10,7 +10,7 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.module.iot.controller; +package org.nl.iot.modular.iot.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -18,8 +18,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.nl.common.pojo.CommonResult; -import org.nl.module.iot.entity.IotModelTags; -import org.nl.module.iot.service.IotModelTagsService; +import org.nl.iot.modular.iot.entity.IotModelTags; +import org.nl.iot.modular.iot.service.IotModelTagsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/nl-iot/src/main/java/org/nl/module/iot/entity/IotConfig.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotConfig.java similarity index 97% rename from nl-iot/src/main/java/org/nl/module/iot/entity/IotConfig.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotConfig.java index 763c5fc..e52819b 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/entity/IotConfig.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotConfig.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.entity; +package org.nl.iot.modular.iot.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-iot/src/main/java/org/nl/module/iot/entity/IotConnect.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotConnect.java similarity index 97% rename from nl-iot/src/main/java/org/nl/module/iot/entity/IotConnect.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotConnect.java index 4bcd3fc..fc8563b 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/entity/IotConnect.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotConnect.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.entity; +package org.nl.iot.modular.iot.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-iot/src/main/java/org/nl/module/iot/entity/IotDevice.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotDevice.java similarity index 97% rename from nl-iot/src/main/java/org/nl/module/iot/entity/IotDevice.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotDevice.java index e58fc62..c36750c 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/entity/IotDevice.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotDevice.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.entity; +package org.nl.iot.modular.iot.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nl-iot/src/main/java/org/nl/module/iot/entity/IotModel.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotModel.java similarity index 96% rename from nl-iot/src/main/java/org/nl/module/iot/entity/IotModel.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotModel.java index a920a65..0f6d15f 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/entity/IotModel.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotModel.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.entity; +package org.nl.iot.modular.iot.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-iot/src/main/java/org/nl/module/iot/entity/IotModelTags.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotModelTags.java similarity index 97% rename from nl-iot/src/main/java/org/nl/module/iot/entity/IotModelTags.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotModelTags.java index 2013a10..474e007 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/entity/IotModelTags.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/entity/IotModelTags.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.entity; +package org.nl.iot.modular.iot.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotConfigMapper.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotConfigMapper.java similarity index 70% rename from nl-iot/src/main/java/org/nl/module/iot/mapper/IotConfigMapper.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotConfigMapper.java index 7981959..ef5c63e 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotConfigMapper.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotConfigMapper.java @@ -1,8 +1,8 @@ -package org.nl.module.iot.mapper; +package org.nl.iot.modular.iot.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.module.iot.entity.IotConfig; +import org.nl.iot.modular.iot.entity.IotConfig; /** * 信号配置表Mapper diff --git a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotConnectMapper.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotConnectMapper.java similarity index 70% rename from nl-iot/src/main/java/org/nl/module/iot/mapper/IotConnectMapper.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotConnectMapper.java index 42570d4..f81cb97 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotConnectMapper.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotConnectMapper.java @@ -1,8 +1,8 @@ -package org.nl.module.iot.mapper; +package org.nl.iot.modular.iot.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.module.iot.entity.IotConnect; +import org.nl.iot.modular.iot.entity.IotConnect; /** * 连接表Mapper diff --git a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotDeviceMapper.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotDeviceMapper.java similarity index 70% rename from nl-iot/src/main/java/org/nl/module/iot/mapper/IotDeviceMapper.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotDeviceMapper.java index aca4367..2d20210 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotDeviceMapper.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotDeviceMapper.java @@ -1,8 +1,8 @@ -package org.nl.module.iot.mapper; +package org.nl.iot.modular.iot.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.module.iot.entity.IotDevice; +import org.nl.iot.modular.iot.entity.IotDevice; /** * 子设备表Mapper diff --git a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotModelMapper.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotModelMapper.java similarity index 70% rename from nl-iot/src/main/java/org/nl/module/iot/mapper/IotModelMapper.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotModelMapper.java index c740a9b..42f78f5 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotModelMapper.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotModelMapper.java @@ -1,8 +1,8 @@ -package org.nl.module.iot.mapper; +package org.nl.iot.modular.iot.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.module.iot.entity.IotModel; +import org.nl.iot.modular.iot.entity.IotModel; /** * 模型表Mapper diff --git a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotModelTagsMapper.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotModelTagsMapper.java similarity index 70% rename from nl-iot/src/main/java/org/nl/module/iot/mapper/IotModelTagsMapper.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotModelTagsMapper.java index 430b3d5..cf7bbf9 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/mapper/IotModelTagsMapper.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/mapper/IotModelTagsMapper.java @@ -1,8 +1,8 @@ -package org.nl.module.iot.mapper; +package org.nl.iot.modular.iot.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.module.iot.entity.IotModelTags; +import org.nl.iot.modular.iot.entity.IotModelTags; /** * 模型信号表Mapper diff --git a/nl-iot/src/main/java/org/nl/module/iot/param/IotConfigImportParam.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotConfigImportParam.java similarity index 95% rename from nl-iot/src/main/java/org/nl/module/iot/param/IotConfigImportParam.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotConfigImportParam.java index 3cdfac7..04d1130 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/param/IotConfigImportParam.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotConfigImportParam.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.param; +package org.nl.iot.modular.iot.param; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Getter; diff --git a/nl-iot/src/main/java/org/nl/module/iot/param/IotConnectImportParam.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotConnectImportParam.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/param/IotConnectImportParam.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotConnectImportParam.java index a36900c..b1c0624 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/param/IotConnectImportParam.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotConnectImportParam.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.param; +package org.nl.iot.modular.iot.param; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Getter; diff --git a/nl-iot/src/main/java/org/nl/module/iot/param/IotDeviceImportParam.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotDeviceImportParam.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/param/IotDeviceImportParam.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotDeviceImportParam.java index 827ad2c..6b64003 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/param/IotDeviceImportParam.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotDeviceImportParam.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.param; +package org.nl.iot.modular.iot.param; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Getter; diff --git a/nl-iot/src/main/java/org/nl/module/iot/param/IotModelTagsImportParam.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotModelTagsImportParam.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/param/IotModelTagsImportParam.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotModelTagsImportParam.java index f463d7f..6985164 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/param/IotModelTagsImportParam.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/param/IotModelTagsImportParam.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.param; +package org.nl.iot.modular.iot.param; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Getter; diff --git a/nl-iot/src/main/java/org/nl/iot/modular/iot/provider/package-info.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/provider/package-info.java new file mode 100644 index 0000000..ad5351c --- /dev/null +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/provider/package-info.java @@ -0,0 +1,6 @@ +/** + * 接口实现提供者 + * @author: lyd + * @date: 2026/2/28 + */ +package org.nl.iot.modular.iot.provider; \ No newline at end of file diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/IotConfigService.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotConfigService.java similarity index 85% rename from nl-iot/src/main/java/org/nl/module/iot/service/IotConfigService.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotConfigService.java index 814491b..6121d1f 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/IotConfigService.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotConfigService.java @@ -1,9 +1,9 @@ -package org.nl.module.iot.service; +package org.nl.iot.modular.iot.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.hutool.json.JSONObject; import jakarta.servlet.http.HttpServletResponse; -import org.nl.module.iot.entity.IotConfig; +import org.nl.iot.modular.iot.entity.IotConfig; import org.springframework.web.multipart.MultipartFile; /** diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/IotConnectService.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotConnectService.java similarity index 84% rename from nl-iot/src/main/java/org/nl/module/iot/service/IotConnectService.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotConnectService.java index 4ff46ca..0fd5014 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/IotConnectService.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotConnectService.java @@ -1,9 +1,9 @@ -package org.nl.module.iot.service; +package org.nl.iot.modular.iot.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.hutool.json.JSONObject; import jakarta.servlet.http.HttpServletResponse; -import org.nl.module.iot.entity.IotConnect; +import org.nl.iot.modular.iot.entity.IotConnect; import org.springframework.web.multipart.MultipartFile; /** diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/IotDeviceService.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotDeviceService.java similarity index 85% rename from nl-iot/src/main/java/org/nl/module/iot/service/IotDeviceService.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotDeviceService.java index b01e60e..fe2665e 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/IotDeviceService.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotDeviceService.java @@ -1,9 +1,9 @@ -package org.nl.module.iot.service; +package org.nl.iot.modular.iot.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.hutool.json.JSONObject; import jakarta.servlet.http.HttpServletResponse; -import org.nl.module.iot.entity.IotDevice; +import org.nl.iot.modular.iot.entity.IotDevice; import org.springframework.web.multipart.MultipartFile; /** diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/IotModelService.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotModelService.java similarity index 73% rename from nl-iot/src/main/java/org/nl/module/iot/service/IotModelService.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotModelService.java index 43678f3..5d8d96e 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/IotModelService.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotModelService.java @@ -1,7 +1,7 @@ -package org.nl.module.iot.service; +package org.nl.iot.modular.iot.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.module.iot.entity.IotModel; +import org.nl.iot.modular.iot.entity.IotModel; /** * 模型表Service接口 diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/IotModelTagsService.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotModelTagsService.java similarity index 85% rename from nl-iot/src/main/java/org/nl/module/iot/service/IotModelTagsService.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotModelTagsService.java index ce1d87c..f25fe9e 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/IotModelTagsService.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/IotModelTagsService.java @@ -1,9 +1,9 @@ -package org.nl.module.iot.service; +package org.nl.iot.modular.iot.service; import com.baomidou.mybatisplus.extension.service.IService; import cn.hutool.json.JSONObject; import jakarta.servlet.http.HttpServletResponse; -import org.nl.module.iot.entity.IotModelTags; +import org.nl.iot.modular.iot.entity.IotModelTags; import org.springframework.web.multipart.MultipartFile; /** diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotConfigServiceImpl.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotConfigServiceImpl.java similarity index 95% rename from nl-iot/src/main/java/org/nl/module/iot/service/impl/IotConfigServiceImpl.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotConfigServiceImpl.java index f6a26ed..a5ac7c6 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotConfigServiceImpl.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.service.impl; +package org.nl.iot.modular.iot.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,10 +10,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.nl.common.exception.CommonException; import org.nl.common.util.CommonDownloadUtil; import org.nl.common.util.CommonResponseUtil; -import org.nl.module.iot.entity.IotConfig; -import org.nl.module.iot.mapper.IotConfigMapper; -import org.nl.module.iot.param.IotConfigImportParam; -import org.nl.module.iot.service.IotConfigService; +import org.nl.iot.modular.iot.entity.IotConfig; +import org.nl.iot.modular.iot.mapper.IotConfigMapper; +import org.nl.iot.modular.iot.param.IotConfigImportParam; +import org.nl.iot.modular.iot.service.IotConfigService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotConnectServiceImpl.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotConnectServiceImpl.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/service/impl/IotConnectServiceImpl.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotConnectServiceImpl.java index bda95ed..2744a7b 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotConnectServiceImpl.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotConnectServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.service.impl; +package org.nl.iot.modular.iot.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,10 +10,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.nl.common.exception.CommonException; import org.nl.common.util.CommonDownloadUtil; import org.nl.common.util.CommonResponseUtil; -import org.nl.module.iot.entity.IotConnect; -import org.nl.module.iot.mapper.IotConnectMapper; -import org.nl.module.iot.param.IotConnectImportParam; -import org.nl.module.iot.service.IotConnectService; +import org.nl.iot.modular.iot.entity.IotConnect; +import org.nl.iot.modular.iot.mapper.IotConnectMapper; +import org.nl.iot.modular.iot.param.IotConnectImportParam; +import org.nl.iot.modular.iot.service.IotConnectService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotDeviceServiceImpl.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotDeviceServiceImpl.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/service/impl/IotDeviceServiceImpl.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotDeviceServiceImpl.java index 94a7c78..14ed7ee 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotDeviceServiceImpl.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotDeviceServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.service.impl; +package org.nl.iot.modular.iot.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,10 +10,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.nl.common.exception.CommonException; import org.nl.common.util.CommonDownloadUtil; import org.nl.common.util.CommonResponseUtil; -import org.nl.module.iot.entity.IotDevice; -import org.nl.module.iot.mapper.IotDeviceMapper; -import org.nl.module.iot.param.IotDeviceImportParam; -import org.nl.module.iot.service.IotDeviceService; +import org.nl.iot.modular.iot.entity.IotDevice; +import org.nl.iot.modular.iot.mapper.IotDeviceMapper; +import org.nl.iot.modular.iot.param.IotDeviceImportParam; +import org.nl.iot.modular.iot.service.IotDeviceService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotModelServiceImpl.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotModelServiceImpl.java similarity index 85% rename from nl-iot/src/main/java/org/nl/module/iot/service/impl/IotModelServiceImpl.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotModelServiceImpl.java index 4ae966c..88855c4 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotModelServiceImpl.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotModelServiceImpl.java @@ -1,10 +1,10 @@ -package org.nl.module.iot.service.impl; +package org.nl.iot.modular.iot.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.nl.module.iot.entity.IotModel; -import org.nl.module.iot.mapper.IotModelMapper; -import org.nl.module.iot.service.IotModelService; +import org.nl.iot.modular.iot.entity.IotModel; +import org.nl.iot.modular.iot.mapper.IotModelMapper; +import org.nl.iot.modular.iot.service.IotModelService; import org.springframework.stereotype.Service; /** diff --git a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotModelTagsServiceImpl.java b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotModelTagsServiceImpl.java similarity index 94% rename from nl-iot/src/main/java/org/nl/module/iot/service/impl/IotModelTagsServiceImpl.java rename to nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotModelTagsServiceImpl.java index 2be9c60..dc7beeb 100644 --- a/nl-iot/src/main/java/org/nl/module/iot/service/impl/IotModelTagsServiceImpl.java +++ b/nl-iot/src/main/java/org/nl/iot/modular/iot/service/impl/IotModelTagsServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.module.iot.service.impl; +package org.nl.iot.modular.iot.service.impl; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,10 +10,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.nl.common.exception.CommonException; import org.nl.common.util.CommonDownloadUtil; import org.nl.common.util.CommonResponseUtil; -import org.nl.module.iot.entity.IotModelTags; -import org.nl.module.iot.mapper.IotModelTagsMapper; -import org.nl.module.iot.param.IotModelTagsImportParam; -import org.nl.module.iot.service.IotModelTagsService; +import org.nl.iot.modular.iot.entity.IotModelTags; +import org.nl.iot.modular.iot.mapper.IotModelTagsMapper; +import org.nl.iot.modular.iot.param.IotModelTagsImportParam; +import org.nl.iot.modular.iot.service.IotModelTagsService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/nl-iot/src/main/java/org/nl/iot/modular/package-info.java b/nl-iot/src/main/java/org/nl/iot/modular/package-info.java new file mode 100644 index 0000000..5a6475c --- /dev/null +++ b/nl-iot/src/main/java/org/nl/iot/modular/package-info.java @@ -0,0 +1,6 @@ +/** + * 业务领域包 + * @author: lyd + * @date: 2026/2/28 + */ +package org.nl.iot.modular; \ No newline at end of file diff --git a/nl-vue/package.json b/nl-vue/package.json index f2dc4b2..0d1de68 100644 --- a/nl-vue/package.json +++ b/nl-vue/package.json @@ -10,6 +10,7 @@ "license": "Apache-2.0", "author": "yubaoshan", "scripts": { + "install": "npm i", "serve": "vite --host 0.0.0.0", "dev": "vite --mode development --host 0.0.0.0", "preview": "vite preview",