diff --git a/pom.xml b/pom.xml index 7b8731e1..28e08eb1 100644 --- a/pom.xml +++ b/pom.xml @@ -170,16 +170,27 @@ ${ruoyi.version} + + + com.ruoyi + smart-switch-ruoyi + ${ruoyi.version} + + + + + com.ruoyi + smart-switch-service + ${ruoyi.version} + + - smart-switch-admin - smart-switch-framework - smart-switch-system - smart-switch-quartz - smart-switch-generator - smart-switch-common + smart-switch-web + smart-switch-ruoyi + smart-switch-service pom diff --git a/smart-switch-ruoyi/pom.xml b/smart-switch-ruoyi/pom.xml new file mode 100644 index 00000000..b51869b6 --- /dev/null +++ b/smart-switch-ruoyi/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.ruoyi + smart-switch-java + 3.8.7 + + + smart-switch-ruoyi + pom + + + smart-switch-framework + smart-switch-system + smart-switch-quartz + smart-switch-generator + smart-switch-common + + + + 8 + 8 + UTF-8 + + + diff --git a/smart-switch-common/pom.xml b/smart-switch-ruoyi/smart-switch-common/pom.xml similarity index 99% rename from smart-switch-common/pom.xml rename to smart-switch-ruoyi/smart-switch-common/pom.xml index 35cfa05d..f778fe3b 100644 --- a/smart-switch-common/pom.xml +++ b/smart-switch-ruoyi/smart-switch-common/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - smart-switch-java + smart-switch-ruoyi com.ruoyi 3.8.7 diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataScope.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataScope.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataSource.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/DataSource.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excel.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excel.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excels.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Excels.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Log.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Log.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/Log.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/config/WxConfig.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/WxConfig.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/config/WxConfig.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/WxConfig.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/config/WxPayConfig.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/WxPayConfig.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/config/WxPayConfig.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/WxPayConfig.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/config/JacksonConfig.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/config/JacksonConfig.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/config/JacksonConfig.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/config/JacksonConfig.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/serializer/SnowflakeToStringSerializer.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/serializer/SnowflakeToStringSerializer.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/serializer/SnowflakeToStringSerializer.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/config/jackson/serializer/SnowflakeToStringSerializer.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/Constants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/Constants.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/Constants.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/GenConstants.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/GenConstants.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/IotConstants.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/UserConstants.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/UserConstants.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/JsonViewProfile.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/JsonViewProfile.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/JsonViewProfile.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/JsonViewProfile.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/R.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/R.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/R.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/ValidGroup.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/ValidGroup.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/ValidGroup.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/ValidGroup.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmArticleClassify.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmArticleClassify.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmArticleClassify.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmArticleClassify.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/AppRegisterBody.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/AppRegisterBody.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/AppRegisterBody.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/AppRegisterBody.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/WxLoginBody.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/WxLoginBody.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/WxLoginBody.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/model/WxLoginBody.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisLock.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisLock.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisLock.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/RedisLock.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisCacheKey.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisCacheKey.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisCacheKey.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisCacheKey.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/text/Convert.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/text/Convert.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/BusinessType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/LimitType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/LimitType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/LoginType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/LoginType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/LoginType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/LoginType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/OperatorType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/OperatorType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/ServiceCode.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/ServiceCode.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/ServiceCode.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/ServiceCode.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserStatus.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserStatus.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/GlobalException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/GlobalException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/ServiceException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/ServiceException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/UtilException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/UtilException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/XssFilter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/XssFilter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/NotifyEventType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/NotifyEventType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/NotifyEventType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/NotifyEventType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/TransferBatchStatus.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/TransferBatchStatus.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/TransferBatchStatus.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/pay/wx/domain/TransferBatchStatus.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsType.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsType.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsType.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsType.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/sms/SmsUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/Arith.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/Arith.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/Arith.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/Arith.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/DateUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/DateUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/DictUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/DictUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/LogUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/LogUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/LogUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/NumberUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/NumberUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/NumberUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/NumberUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/PageUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/PageUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/PageUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ServiceUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/SnowFlakeUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/SnowFlakeUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/SnowFlakeUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/SnowFlakeUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/StringUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/Threads.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/Threads.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/Threads.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/UserUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/UserUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/UserUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/UserUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/AliHttpUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/AliHttpUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/http/AliHttpUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/AliHttpUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/oneNet/Token.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/oneNet/Token.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/oneNet/Token.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/oneNet/Token.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/qiniu/QiNiuUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/qiniu/QiNiuUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/qiniu/QiNiuUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/qiniu/QiNiuUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValid.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValid.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValid.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValid.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValidator.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValidator.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValidator.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/EnumValidator.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankCardInfo.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankCardInfo.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankCardInfo.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankCardInfo.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResponseBody.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResponseBody.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResponseBody.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResponseBody.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResult.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResult.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResult.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidResult.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidUtils.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidUtils.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/valid/bank/BankValidUtils.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/wx/AccessTokenUtil.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/AccessTokenUtil.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/wx/AccessTokenUtil.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/AccessTokenUtil.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/wx/vo/AccessToken.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/vo/AccessToken.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/wx/vo/AccessToken.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/wx/vo/AccessToken.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/xss/Xss.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/xss/Xss.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/xss/Xss.java diff --git a/smart-switch-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/xss/XssValidator.java similarity index 100% rename from smart-switch-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/xss/XssValidator.java diff --git a/smart-switch-framework/pom.xml b/smart-switch-ruoyi/smart-switch-framework/pom.xml similarity index 92% rename from smart-switch-framework/pom.xml rename to smart-switch-ruoyi/smart-switch-framework/pom.xml index 48b36564..fca542ce 100644 --- a/smart-switch-framework/pom.xml +++ b/smart-switch-ruoyi/smart-switch-framework/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - smart-switch-java + smart-switch-ruoyi com.ruoyi 3.8.7 @@ -53,10 +53,10 @@ oshi-core - + com.ruoyi - smart-switch-system + smart-switch-service diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/CustomLoginAuthenticationProvider.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/CustomLoginAuthenticationProvider.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/CustomLoginAuthenticationProvider.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/CustomLoginAuthenticationProvider.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java similarity index 97% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index f9e40cd1..1651aad4 100644 --- a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -2,8 +2,6 @@ package com.ruoyi.framework.web.service; import javax.annotation.Resource; -import cn.binarywang.wx.miniapp.api.WxMaJsapiService; -import cn.binarywang.wx.miniapp.api.impl.WxMaJsapiServiceImpl; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import com.alibaba.fastjson2.JSON; @@ -16,14 +14,14 @@ import com.ruoyi.common.enums.UserType; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.wx.AccessTokenUtil; -import com.ruoyi.system.domain.SmDeviceGroup; -import com.ruoyi.system.domain.bo.SmAccountBO; -import com.ruoyi.system.domain.enums.account.AccountType; -import com.ruoyi.system.domain.vo.SmUserVo; +import com.ruoyi.ss.deviceGroup.service.ISmDeviceGroupService; +import com.ruoyi.ss.user.service.ISmUserService; +import com.ruoyi.ss.account.service.ISmAccountService; +import com.ruoyi.ss.account.domain.SmAccountBO; +import com.ruoyi.ss.account.domain.enums.AccountType; import com.ruoyi.system.service.*; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -54,7 +52,7 @@ import java.util.Objects; /** * 登录校验方法 - * + * * @author ruoyi */ @Component @@ -68,7 +66,7 @@ public class SysLoginService @Autowired private RedisCache redisCache; - + @Autowired private ISysUserService userService; @@ -89,7 +87,7 @@ public class SysLoginService /** * 登录验证 - * + * * @param username 用户名 * @param password 密码 * @param code 验证码 @@ -139,7 +137,7 @@ public class SysLoginService /** * 校验验证码 - * + * * @param username 用户名 * @param code 验证码 * @param uuid 唯一标识 diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java similarity index 100% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java diff --git a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java similarity index 97% rename from smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java rename to smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index d405d6d9..7801350d 100644 --- a/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -3,8 +3,7 @@ package com.ruoyi.framework.web.service; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.SmUser; import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.system.service.ISmUserService; -import com.ruoyi.system.service.impl.SmUserServiceImpl; +import com.ruoyi.ss.user.service.ISmUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +34,7 @@ public class UserDetailsServiceImpl implements UserDetailsService @Autowired private ISysUserService userService; - + @Autowired private SysPasswordService passwordService; diff --git a/smart-switch-generator/pom.xml b/smart-switch-ruoyi/smart-switch-generator/pom.xml similarity index 95% rename from smart-switch-generator/pom.xml rename to smart-switch-ruoyi/smart-switch-generator/pom.xml index e8915ab6..db853faa 100644 --- a/smart-switch-generator/pom.xml +++ b/smart-switch-ruoyi/smart-switch-generator/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - smart-switch-java + smart-switch-ruoyi com.ruoyi 3.8.7 diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/controller/GenController.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/controller/GenController.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java diff --git a/smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java similarity index 100% rename from smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to smart-switch-ruoyi/smart-switch-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java diff --git a/smart-switch-generator/src/main/resources/generator.yml b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/generator.yml similarity index 100% rename from smart-switch-generator/src/main/resources/generator.yml rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/generator.yml diff --git a/smart-switch-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from smart-switch-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/smart-switch-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from smart-switch-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/smart-switch-generator/src/main/resources/vm/java/controller.java.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/java/controller.java.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/controller.java.vm diff --git a/smart-switch-generator/src/main/resources/vm/java/domain.java.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/java/domain.java.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/domain.java.vm diff --git a/smart-switch-generator/src/main/resources/vm/java/mapper.java.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/java/mapper.java.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/smart-switch-generator/src/main/resources/vm/java/service.java.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/java/service.java.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/service.java.vm diff --git a/smart-switch-generator/src/main/resources/vm/java/serviceImpl.java.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/smart-switch-generator/src/main/resources/vm/java/sub-domain.java.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/java/sub-domain.java.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/java/sub-domain.java.vm diff --git a/smart-switch-generator/src/main/resources/vm/js/api.js.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/js/api.js.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/js/api.js.vm diff --git a/smart-switch-generator/src/main/resources/vm/sql/sql.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/sql/sql.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/sql/sql.vm diff --git a/smart-switch-generator/src/main/resources/vm/vue/index-tree.vue.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/smart-switch-generator/src/main/resources/vm/vue/index.vue.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/vue/index.vue.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/smart-switch-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/smart-switch-generator/src/main/resources/vm/vue/v3/index.vue.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/smart-switch-generator/src/main/resources/vm/xml/mapper.xml.vm b/smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from smart-switch-generator/src/main/resources/vm/xml/mapper.xml.vm rename to smart-switch-ruoyi/smart-switch-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/smart-switch-quartz/pom.xml b/smart-switch-ruoyi/smart-switch-quartz/pom.xml similarity index 95% rename from smart-switch-quartz/pom.xml rename to smart-switch-ruoyi/smart-switch-quartz/pom.xml index 7bcb5c10..235874be 100644 --- a/smart-switch-quartz/pom.xml +++ b/smart-switch-ruoyi/smart-switch-quartz/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - smart-switch-java + smart-switch-ruoyi com.ruoyi 3.8.7 diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java diff --git a/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java similarity index 100% rename from smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to smart-switch-ruoyi/smart-switch-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java diff --git a/smart-switch-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/smart-switch-ruoyi/smart-switch-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 100% rename from smart-switch-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to smart-switch-ruoyi/smart-switch-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml diff --git a/smart-switch-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/smart-switch-ruoyi/smart-switch-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 100% rename from smart-switch-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to smart-switch-ruoyi/smart-switch-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml diff --git a/smart-switch-system/pom.xml b/smart-switch-ruoyi/smart-switch-system/pom.xml similarity index 94% rename from smart-switch-system/pom.xml rename to smart-switch-ruoyi/smart-switch-system/pom.xml index 83f463a5..2626d4b5 100644 --- a/smart-switch-system/pom.xml +++ b/smart-switch-ruoyi/smart-switch-system/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - smart-switch-java + smart-switch-ruoyi com.ruoyi 3.8.7 diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysCache.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysCache.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysCache.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysConfig.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysConfig.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysNotice.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysNotice.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysPost.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysPost.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/VerificationCodeBO.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/VerificationCodeBO.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/VerificationCodeBO.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/VerificationCodeBO.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/verificationCode/CodeBusinessType.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/verificationCode/CodeBusinessType.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/verificationCode/CodeBusinessType.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/verificationCode/CodeBusinessType.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonListTypeHandler.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonListTypeHandler.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonListTypeHandler.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonListTypeHandler.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonTypeHandler.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonTypeHandler.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonTypeHandler.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/AbstractJsonTypeHandler.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/BankCardInfoTypeHandler.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/BankCardInfoTypeHandler.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/BankCardInfoTypeHandler.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/BankCardInfoTypeHandler.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/NonNullDecimalTypeHandler.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/StringListTypeHandler.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/StringListTypeHandler.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/StringListTypeHandler.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/mapper/typehandler/StringListTypeHandler.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysPostService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysPostService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysUserService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/IVerificationCodeService.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/IVerificationCodeService.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/IVerificationCodeService.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/IVerificationCodeService.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java similarity index 97% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index b39a6729..b95fa776 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -23,7 +23,7 @@ import com.ruoyi.system.service.ISysConfigService; /** * 参数配置 服务层实现 - * + * * @author ruoyi */ @Service @@ -46,7 +46,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 查询参数配置信息 - * + * * @param configId 参数配置ID * @return 参数配置信息 */ @@ -61,7 +61,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 根据键名查询参数配置信息 - * + * * @param configKey 参数key * @return 参数键值 */ @@ -86,13 +86,13 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 获取验证码开关 - * + * * @return true开启，false关闭 */ @Override public boolean selectCaptchaEnabled() { - String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled"); + String captchaEnabled = selectConfigByKey("sys.enums.captchaEnabled"); if (StringUtils.isEmpty(captchaEnabled)) { return true; @@ -102,7 +102,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 查询参数配置列表 - * + * * @param config 参数配置信息 * @return 参数配置集合 */ @@ -114,7 +114,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 新增参数配置 - * + * * @param config 参数配置信息 * @return 结果 */ @@ -131,7 +131,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 修改参数配置 - * + * * @param config 参数配置信息 * @return 结果 */ @@ -154,7 +154,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 批量删除参数信息 - * + * * @param configIds 需要删除的参数ID */ @Override @@ -207,7 +207,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 校验参数键名是否唯一 - * + * * @param config 参数配置信息 * @return 结果 */ @@ -239,7 +239,7 @@ public class SysConfigServiceImpl implements ISysConfigService /** * 设置cache key - * + * * @param configKey 参数键 * @return 缓存键key */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/VerificationCodeServiceImpl.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/VerificationCodeServiceImpl.java similarity index 100% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/VerificationCodeServiceImpl.java rename to smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/VerificationCodeServiceImpl.java diff --git a/smart-switch-system/src/main/resources/mapper/system/SysConfigMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysDeptMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysPostMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysPostMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysRoleMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysUserMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysUserMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/smart-switch-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from smart-switch-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to smart-switch-ruoyi/smart-switch-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/smart-switch-service/pom.xml b/smart-switch-service/pom.xml new file mode 100644 index 00000000..47389369 --- /dev/null +++ b/smart-switch-service/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.ruoyi + smart-switch-java + 3.8.7 + + + smart-switch-service + + + 8 + 8 + UTF-8 + + + + + com.ruoyi + smart-switch-system + + + + + + + src/main/java + + **/*.xml + + + + + + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/BodyObj.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/BodyObj.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/BodyObj.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/BodyObj.java index 78841fd3..16cea5f8 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/BodyObj.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/BodyObj.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentData.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentData.java similarity index 81% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentData.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentData.java index b2337c58..5db47d6a 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentData.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentData.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentDatastream.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDatastream.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentDatastream.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDatastream.java index e3f0c536..2024736f 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentDatastream.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDatastream.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentDeviceData.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java similarity index 94% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentDeviceData.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java index c7f5237f..7838a40d 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/CurrentDeviceData.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/CurrentDeviceData.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import com.ruoyi.common.utils.NumberUtils; -import com.ruoyi.system.domain.enums.device.DeviceOutageWay; +import com.ruoyi.ss.device.domain.enums.DeviceOutageWay; import lombok.Data; import org.springframework.util.CollectionUtils; @@ -25,14 +25,14 @@ public class CurrentDeviceData { * @return */ public IotDeviceInfo parseDeviceInfo() { - if (CollectionUtils.isEmpty(datastreams)) { - return null; - } IotDeviceInfo device = IotDeviceInfo.newDefaultInstance(); device.setAt(new Date()); device.setMac(title); device.setId(id); + if (CollectionUtils.isEmpty(datastreams)) { + return device; + } for (CurrentDatastream stream : datastreams) { String value = stream.getValue().toString(); switch (stream.getId()) { diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/Datapoint.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/Datapoint.java similarity index 74% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/Datapoint.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/Datapoint.java index 7d649c52..1faf891f 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/Datapoint.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/Datapoint.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/HistoryDatastream.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/HistoryDatastream.java similarity index 80% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/HistoryDatastream.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/HistoryDatastream.java index fb05a965..2065396d 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/HistoryDatastream.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/HistoryDatastream.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/HistoryDeviceData.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/HistoryDeviceData.java similarity index 83% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/HistoryDeviceData.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/HistoryDeviceData.java index e1f48f7d..15ebe245 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/HistoryDeviceData.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/HistoryDeviceData.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceDetail.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceDetail.java similarity index 98% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceDetail.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceDetail.java index c4520936..3ee7ef62 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceDetail.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceDetail.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceInfo.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java similarity index 92% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceInfo.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java index 9470b7a0..7b508730 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/IotDeviceInfo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.iot.domain; +package com.ruoyi.iot.domain; -import com.ruoyi.system.domain.enums.device.DeviceOutageWay; +import com.ruoyi.ss.device.domain.enums.DeviceOutageWay; import lombok.Builder; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/BaseResponse.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/BaseResponse.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/BaseResponse.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/BaseResponse.java index 07bd896e..6817ca67 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/BaseResponse.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/BaseResponse.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain.response; +package com.ruoyi.iot.domain.response; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/CommandResponse.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/CommandResponse.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/CommandResponse.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/CommandResponse.java index 82ae449e..cc203448 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/CommandResponse.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/CommandResponse.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.domain.response; +package com.ruoyi.iot.domain.response; import lombok.Data; diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/CurrentDataPointResponse.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/CurrentDataPointResponse.java new file mode 100644 index 00000000..ac15e6af --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/CurrentDataPointResponse.java @@ -0,0 +1,13 @@ +package com.ruoyi.iot.domain.response; + +import com.ruoyi.iot.domain.CurrentData; +import lombok.Data; + +/** + * @author wjh + * 2024/3/20 + */ +@Data +public class CurrentDataPointResponse extends BaseResponse { + private CurrentData data; +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/DetailResponse.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/DetailResponse.java similarity index 60% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/DetailResponse.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/DetailResponse.java index d0a5ccc3..b4f15a0d 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/DetailResponse.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/DetailResponse.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.iot.domain.response; +package com.ruoyi.iot.domain.response; -import com.ruoyi.system.iot.domain.IotDeviceDetail; +import com.ruoyi.iot.domain.IotDeviceDetail; import lombok.Data; /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/HistoryDataPointResponse.java b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/HistoryDataPointResponse.java new file mode 100644 index 00000000..77369c9c --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/domain/response/HistoryDataPointResponse.java @@ -0,0 +1,9 @@ +package com.ruoyi.iot.domain.response; + +import com.ruoyi.iot.domain.HistoryDeviceData; +import lombok.Data; + +@Data +public class HistoryDataPointResponse extends BaseResponse { + private HistoryDeviceData data; +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/receive/ReceiveController.java b/smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/receive/ReceiveController.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java index 011e0dfa..dfb02e2b 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/receive/ReceiveController.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java @@ -1,11 +1,10 @@ -package com.ruoyi.system.iot.receive; +package com.ruoyi.iot.receive; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.iot.domain.BodyObj; -import com.ruoyi.system.iot.service.IotService; -import com.ruoyi.system.iot.util.Util; +import com.ruoyi.iot.util.Util; +import com.ruoyi.iot.domain.BodyObj; +import com.ruoyi.iot.service.IotService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/service/IotService.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java similarity index 84% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/service/IotService.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java index 6c736918..805a7453 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/service/IotService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.iot.service; +package com.ruoyi.iot.service; -import com.ruoyi.system.domain.SmDevice; -import com.ruoyi.system.domain.enums.device.DeviceOnlineStatus; -import com.ruoyi.system.iot.domain.CurrentDeviceData; -import com.ruoyi.system.iot.domain.HistoryDeviceData; -import com.ruoyi.system.iot.domain.IotDeviceDetail; -import com.ruoyi.system.iot.domain.IotDeviceInfo; -import com.ruoyi.system.iot.domain.response.CommandResponse; +import com.ruoyi.iot.domain.CurrentDeviceData; +import com.ruoyi.iot.domain.HistoryDeviceData; +import com.ruoyi.iot.domain.IotDeviceDetail; +import com.ruoyi.iot.domain.IotDeviceInfo; +import com.ruoyi.iot.domain.response.CommandResponse; +import com.ruoyi.ss.device.domain.SmDevice; +import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; import java.math.BigDecimal; import java.util.List; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/service/IotServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java similarity index 92% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/service/IotServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java index 2906cc62..0e203e6c 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/service/IotServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.service; +package com.ruoyi.iot.service; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; @@ -6,21 +6,20 @@ import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.oneNet.Token; -import com.ruoyi.system.domain.SmDevice; -import com.ruoyi.system.domain.enums.device.DeviceOnlineStatus; -import com.ruoyi.system.domain.enums.device.DeviceOutageWay; -import com.ruoyi.system.iot.domain.CurrentDeviceData; -import com.ruoyi.system.iot.domain.IotDeviceDetail; -import com.ruoyi.system.iot.domain.IotDeviceInfo; -import com.ruoyi.system.iot.domain.response.CommandResponse; -import com.ruoyi.system.iot.domain.response.CurrentDataPointResponse; -import com.ruoyi.system.iot.domain.response.DetailResponse; -import com.ruoyi.system.iot.domain.response.HistoryDataPointResponse; -import com.ruoyi.system.iot.domain.HistoryDeviceData; -import com.ruoyi.system.iot.util.CommandBuilder; +import com.ruoyi.iot.domain.CurrentDeviceData; +import com.ruoyi.iot.domain.HistoryDeviceData; +import com.ruoyi.iot.domain.IotDeviceDetail; +import com.ruoyi.iot.domain.IotDeviceInfo; +import com.ruoyi.iot.domain.response.CommandResponse; +import com.ruoyi.iot.domain.response.CurrentDataPointResponse; +import com.ruoyi.iot.domain.response.DetailResponse; +import com.ruoyi.iot.domain.response.HistoryDataPointResponse; +import com.ruoyi.iot.util.CommandBuilder; +import com.ruoyi.ss.device.domain.SmDevice; +import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; +import com.ruoyi.ss.device.domain.enums.DeviceOutageWay; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/util/CommandBuilder.java b/smart-switch-service/src/main/java/com/ruoyi/iot/util/CommandBuilder.java similarity index 97% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/util/CommandBuilder.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/util/CommandBuilder.java index bc5d8aca..8badca79 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/util/CommandBuilder.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/util/CommandBuilder.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.iot.util; +package com.ruoyi.iot.util; import com.ruoyi.common.constant.IotConstants; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/util/Util.java b/smart-switch-service/src/main/java/com/ruoyi/iot/util/Util.java similarity index 98% rename from smart-switch-system/src/main/java/com/ruoyi/system/iot/util/Util.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/util/Util.java index bf527546..405189d0 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/util/Util.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/util/Util.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.iot.util; +package com.ruoyi.iot.util; -import com.ruoyi.system.iot.domain.BodyObj; +import com.ruoyi.iot.domain.BodyObj; import org.apache.commons.codec.binary.Base64; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.json.JSONObject; @@ -138,4 +138,4 @@ public class Util { } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmAccount.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmAccount.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java index 13a59c86..94e9ea71 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmAccount.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java @@ -1,27 +1,23 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.account.domain; import com.fasterxml.jackson.annotation.JsonProperty; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.utils.RegexpUtils; import com.ruoyi.common.valid.EnumValid; import com.ruoyi.common.valid.bank.BankCardInfo; -import com.ruoyi.system.domain.enums.account.AccountType; +import com.ruoyi.ss.account.domain.enums.AccountType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; /** * 用户账户对象 sm_account - * + * * @author ruoyi * @date 2024-03-26 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmAccountBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountBO.java similarity index 56% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmAccountBO.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountBO.java index cc2b25b2..82258645 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmAccountBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountBO.java @@ -1,12 +1,7 @@ -package com.ruoyi.system.domain.bo; +package com.ruoyi.ss.account.domain; -import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.system.domain.SmAccount; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; - /** * @author wjh * 2024/3/26 diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmAccountDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountDto.java similarity index 58% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmAccountDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountDto.java index 5457a13e..27092165 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmAccountDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountDto.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.account.domain; -import com.ruoyi.system.domain.SmAccount; import lombok.Data; /** diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmAccountVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java similarity index 58% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmAccountVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java index 9ddcd01f..45863a9c 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmAccountVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.account.domain; -import com.ruoyi.system.domain.SmAccount; import lombok.Data; /** diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/account/AccountType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/account/AccountType.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java index bb648c2a..82be9da6 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/account/AccountType.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain.enums.account; - -import java.util.Objects; +package com.ruoyi.ss.account.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * 账户类型 * @author wjh @@ -30,4 +30,4 @@ public enum AccountType { } throw new RuntimeException("不存在值为" + type + "的账户类型"); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmAccountMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java similarity index 86% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmAccountMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java index 2cde726c..1e820bb6 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmAccountMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java @@ -1,22 +1,23 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.account.mapper; + +import com.ruoyi.ss.account.domain.SmAccount; +import com.ruoyi.ss.account.domain.SmAccountDto; +import com.ruoyi.ss.account.domain.SmAccountVo; +import org.apache.ibatis.annotations.Param; import java.util.List; -import com.ruoyi.system.domain.SmAccount; -import com.ruoyi.system.domain.dto.SmAccountDto; -import com.ruoyi.system.domain.vo.SmAccountVo; -import org.apache.ibatis.annotations.Param; /** * 用户账户Mapper接口 - * + * * @author ruoyi * @date 2024-03-26 */ -public interface SmAccountMapper +public interface SmAccountMapper { /** * 查询用户账户 - * + * * @param accountId 用户账户主键 * @return 用户账户 */ @@ -24,7 +25,7 @@ public interface SmAccountMapper /** * 查询用户账户列表 - * + * * @param smAccount 用户账户 * @return 用户账户集合 */ @@ -32,7 +33,7 @@ public interface SmAccountMapper /** * 新增用户账户 - * + * * @param smAccount 用户账户 * @return 结果 */ @@ -40,7 +41,7 @@ public interface SmAccountMapper /** * 修改用户账户 - * + * * @param smAccount 用户账户 * @return 结果 */ @@ -48,7 +49,7 @@ public interface SmAccountMapper /** * 删除用户账户 - * + * * @param accountId 用户账户主键 * @return 结果 */ @@ -56,7 +57,7 @@ public interface SmAccountMapper /** * 批量删除用户账户 - * + * * @param accountIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmAccountMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml similarity index 97% rename from smart-switch-system/src/main/resources/mapper/system/SmAccountMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml index 0bb85268..84f7dc60 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmAccountMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + and user_balance = #{userBalance} and platform_balance = #{platformBalance} and recharge = #{recharge} @@ -26,12 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and hour(create_time) = #{createHour} - + - + insert into sm_balance_period @@ -64,9 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_balance_period where id in + delete from sm_balance_period where id in #{id} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmBalancePeriodService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/balancePeriod/service/ISmBalancePeriodService.java similarity index 86% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmBalancePeriodService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/balancePeriod/service/ISmBalancePeriodService.java index d45c03ab..4d455104 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmBalancePeriodService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/balancePeriod/service/ISmBalancePeriodService.java @@ -1,21 +1,22 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.balancePeriod.service; + +import com.ruoyi.ss.balancePeriod.domain.SmBalancePeriod; +import com.ruoyi.ss.balancePeriod.domain.SmBalancePeriodDto; import java.util.Date; import java.util.List; -import com.ruoyi.system.domain.SmBalancePeriod; -import com.ruoyi.system.domain.dto.SmBalancePeriodDto; /** * 余额时段记录Service接口 - * + * * @author ruoyi * @date 2024-03-16 */ -public interface ISmBalancePeriodService +public interface ISmBalancePeriodService { /** * 查询余额时段记录 - * + * * @param id 余额时段记录主键 * @return 余额时段记录 */ @@ -23,7 +24,7 @@ public interface ISmBalancePeriodService /** * 查询余额时段记录列表 - * + * * @param smBalancePeriod 余额时段记录 * @return 余额时段记录集合 */ @@ -31,7 +32,7 @@ public interface ISmBalancePeriodService /** * 新增余额时段记录 - * + * * @param smBalancePeriod 余额时段记录 * @return 结果 */ @@ -39,7 +40,7 @@ public interface ISmBalancePeriodService /** * 修改余额时段记录 - * + * * @param smBalancePeriod 余额时段记录 * @return 结果 */ @@ -47,7 +48,7 @@ public interface ISmBalancePeriodService /** * 批量删除余额时段记录 - * + * * @param ids 需要删除的余额时段记录主键集合 * @return 结果 */ @@ -55,7 +56,7 @@ public interface ISmBalancePeriodService /** * 删除余额时段记录信息 - * + * * @param id 余额时段记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmBalancePeriodServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/balancePeriod/service/SmBalancePeriodServiceImpl.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmBalancePeriodServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/balancePeriod/service/SmBalancePeriodServiceImpl.java index defa7dd1..2e28cf63 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmBalancePeriodServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/balancePeriod/service/SmBalancePeriodServiceImpl.java @@ -1,37 +1,33 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.balancePeriod.service; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.dto.SmBalancePeriodDto; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; -import com.ruoyi.system.domain.dto.SmUserDto; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillGroupBy; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.vo.dashboard.BillCountVo; -import com.ruoyi.system.mapper.SmTransactionBillMapper; -import com.ruoyi.system.mapper.SmUserMapper; +import com.ruoyi.ss.balancePeriod.domain.SmBalancePeriod; +import com.ruoyi.ss.balancePeriod.domain.SmBalancePeriodDto; +import com.ruoyi.ss.balancePeriod.mapper.SmBalancePeriodMapper; +import com.ruoyi.ss.dashboard.BillCountVo; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillGroupBy; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.transactionBill.mapper.SmTransactionBillMapper; +import com.ruoyi.ss.user.domain.SmUserDto; +import com.ruoyi.ss.user.mapper.SmUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmBalancePeriodMapper; -import com.ruoyi.system.domain.SmBalancePeriod; -import com.ruoyi.system.service.ISmBalancePeriodService; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + /** * 余额时段记录Service业务层处理 - * + * * @author ruoyi * @date 2024-03-16 */ @Service("smBalancePeriodService") -public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService +public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService { @Autowired private SmBalancePeriodMapper smBalancePeriodMapper; @@ -44,7 +40,7 @@ public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService /** * 查询余额时段记录 - * + * * @param id 余额时段记录主键 * @return 余额时段记录 */ @@ -56,7 +52,7 @@ public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService /** * 查询余额时段记录列表 - * + * * @param smBalancePeriod 余额时段记录 * @return 余额时段记录 */ @@ -68,7 +64,7 @@ public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService /** * 新增余额时段记录 - * + * * @param smBalancePeriod 余额时段记录 * @return 结果 */ @@ -81,7 +77,7 @@ public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService /** * 修改余额时段记录 - * + * * @param smBalancePeriod 余额时段记录 * @return 结果 */ @@ -93,7 +89,7 @@ public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService /** * 批量删除余额时段记录 - * + * * @param ids 需要删除的余额时段记录主键 * @return 结果 */ @@ -105,7 +101,7 @@ public class SmBalancePeriodServiceImpl implements ISmBalancePeriodService /** * 删除余额时段记录信息 - * + * * @param id 余额时段记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmBusinessRecord.java b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecord.java similarity index 88% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmBusinessRecord.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecord.java index aaccf5b2..14e6057e 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmBusinessRecord.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecord.java @@ -1,17 +1,15 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.businessRecord.domain; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; /** * 经营记录对象 sm_business_record - * + * * @author ruoyi * @date 2024-03-19 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmBusinessRecordDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecordDto.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmBusinessRecordDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecordDto.java index 4b2c03c5..bb7cacc2 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmBusinessRecordDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecordDto.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.businessRecord.domain; -import com.ruoyi.system.domain.SmBusinessRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmBusinessRecordVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecordVo.java similarity index 71% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmBusinessRecordVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecordVo.java index f17d8953..55f83413 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmBusinessRecordVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/domain/SmBusinessRecordVo.java @@ -1,10 +1,8 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.businessRecord.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.system.domain.SmBusinessRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmBusinessRecordMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/mapper/SmBusinessRecordMapper.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmBusinessRecordMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/mapper/SmBusinessRecordMapper.java index 3da25f3f..34f346fb 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmBusinessRecordMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/mapper/SmBusinessRecordMapper.java @@ -1,21 +1,22 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.businessRecord.mapper; + +import com.ruoyi.ss.businessRecord.domain.SmBusinessRecord; +import com.ruoyi.ss.businessRecord.domain.SmBusinessRecordDto; +import com.ruoyi.ss.businessRecord.domain.SmBusinessRecordVo; import java.util.List; -import com.ruoyi.system.domain.SmBusinessRecord; -import com.ruoyi.system.domain.dto.SmBusinessRecordDto; -import com.ruoyi.system.domain.vo.SmBusinessRecordVo; /** * 经营记录Mapper接口 - * + * * @author ruoyi * @date 2024-03-19 */ -public interface SmBusinessRecordMapper +public interface SmBusinessRecordMapper { /** * 查询经营记录 - * + * * @param id 经营记录主键 * @return 经营记录 */ @@ -23,7 +24,7 @@ public interface SmBusinessRecordMapper /** * 查询经营记录列表 - * + * * @param smBusinessRecord 经营记录 * @return 经营记录集合 */ @@ -31,7 +32,7 @@ public interface SmBusinessRecordMapper /** * 新增经营记录 - * + * * @param smBusinessRecord 经营记录 * @return 结果 */ @@ -39,7 +40,7 @@ public interface SmBusinessRecordMapper /** * 修改经营记录 - * + * * @param smBusinessRecord 经营记录 * @return 结果 */ @@ -47,7 +48,7 @@ public interface SmBusinessRecordMapper /** * 删除经营记录 - * + * * @param id 经营记录主键 * @return 结果 */ @@ -55,7 +56,7 @@ public interface SmBusinessRecordMapper /** * 批量删除经营记录 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmBusinessRecordMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/mapper/SmBusinessRecordMapper.xml similarity index 97% rename from smart-switch-system/src/main/resources/mapper/system/SmBusinessRecordMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/mapper/SmBusinessRecordMapper.xml index c1d858b5..37d4f300 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmBusinessRecordMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/businessRecord/mapper/SmBusinessRecordMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + and name like concat('%', #{name}, '%') and enabled = #{enabled} and service_rate = #{serviceRate} and cost_rate = #{costRate} - + - + insert into sm_channel @@ -65,9 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_channel where channel_id in + delete from sm_channel where channel_id in #{channelId} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmChannelService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ISmChannelService.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmChannelService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ISmChannelService.java index 74dbaa71..9fbee43a 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmChannelService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ISmChannelService.java @@ -1,21 +1,20 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.channel.service; + +import com.ruoyi.ss.channel.domain.SmChannel; import java.util.List; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domain.SmChannel; - /** * 充值渠道Service接口 - * + * * @author ruoyi * @date 2024-04-15 */ -public interface ISmChannelService +public interface ISmChannelService { /** * 查询充值渠道 - * + * * @param channelId 充值渠道主键 * @return 充值渠道 */ @@ -23,7 +22,7 @@ public interface ISmChannelService /** * 查询充值渠道列表 - * + * * @param smChannel 充值渠道 * @return 充值渠道集合 */ @@ -31,7 +30,7 @@ public interface ISmChannelService /** * 新增充值渠道 - * + * * @param smChannel 充值渠道 * @return 结果 */ @@ -39,7 +38,7 @@ public interface ISmChannelService /** * 修改充值渠道 - * + * * @param smChannel 充值渠道 * @return 结果 */ @@ -47,7 +46,7 @@ public interface ISmChannelService /** * 批量删除充值渠道 - * + * * @param channelIds 需要删除的充值渠道主键集合 * @return 结果 */ @@ -55,7 +54,7 @@ public interface ISmChannelService /** * 删除充值渠道信息 - * + * * @param channelId 充值渠道主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmChannelServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/SmChannelServiceImpl.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmChannelServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/SmChannelServiceImpl.java index 2c4df68c..17957dd9 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmChannelServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/SmChannelServiceImpl.java @@ -1,27 +1,27 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.channel.service; -import java.util.List; +import com.ruoyi.ss.channel.domain.SmChannel; +import com.ruoyi.ss.channel.mapper.SmChannelMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmChannelMapper; -import com.ruoyi.system.domain.SmChannel; -import com.ruoyi.system.service.ISmChannelService; + +import java.util.List; /** * 充值渠道Service业务层处理 - * + * * @author ruoyi * @date 2024-04-15 */ @Service -public class SmChannelServiceImpl implements ISmChannelService +public class SmChannelServiceImpl implements ISmChannelService { @Autowired private SmChannelMapper smChannelMapper; /** * 查询充值渠道 - * + * * @param channelId 充值渠道主键 * @return 充值渠道 */ @@ -33,7 +33,7 @@ public class SmChannelServiceImpl implements ISmChannelService /** * 查询充值渠道列表 - * + * * @param smChannel 充值渠道 * @return 充值渠道 */ @@ -45,7 +45,7 @@ public class SmChannelServiceImpl implements ISmChannelService /** * 新增充值渠道 - * + * * @param smChannel 充值渠道 * @return 结果 */ @@ -57,7 +57,7 @@ public class SmChannelServiceImpl implements ISmChannelService /** * 修改充值渠道 - * + * * @param smChannel 充值渠道 * @return 结果 */ @@ -69,7 +69,7 @@ public class SmChannelServiceImpl implements ISmChannelService /** * 批量删除充值渠道 - * + * * @param channelIds 需要删除的充值渠道主键 * @return 结果 */ @@ -81,7 +81,7 @@ public class SmChannelServiceImpl implements ISmChannelService /** * 删除充值渠道信息 - * + * * @param channelId 充值渠道主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmComplaint.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaint.java similarity index 94% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmComplaint.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaint.java index 0bac249c..970305fd 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmComplaint.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaint.java @@ -1,21 +1,21 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.complaint.domain; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.valid.EnumValid; -import com.ruoyi.system.domain.enums.complaint.ComplaintType; +import com.ruoyi.ss.complaint.domain.enums.ComplaintType; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; /** * 投诉对象 sm_complaint - * + * * @author ruoyi * @date 2024-03-02 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmComplaintDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaintDto.java similarity index 76% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmComplaintDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaintDto.java index 560c7d32..5c3272c7 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmComplaintDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaintDto.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.complaint.domain; -import com.ruoyi.system.domain.SmComplaint; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmComplaintVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaintVo.java similarity index 80% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmComplaintVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaintVo.java index ef6ca0ee..45df7e62 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmComplaintVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/SmComplaintVo.java @@ -1,7 +1,6 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.complaint.domain; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.system.domain.SmComplaint; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/complaint/ComplaintType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/enums/ComplaintType.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/complaint/ComplaintType.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/enums/ComplaintType.java index 12b3f565..666d086e 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/complaint/ComplaintType.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/domain/enums/ComplaintType.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain.enums.complaint; - -import java.util.Objects; +package com.ruoyi.ss.complaint.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * 意见反馈类型 * @author wjh @@ -29,4 +29,4 @@ public enum ComplaintType { } throw new RuntimeException("不存在值为" + type + "的意见反馈类型"); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmComplaintMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/mapper/SmComplaintMapper.java similarity index 78% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmComplaintMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/mapper/SmComplaintMapper.java index 14ed092e..1fce0c33 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmComplaintMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/mapper/SmComplaintMapper.java @@ -1,21 +1,22 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.complaint.mapper; + +import com.ruoyi.ss.complaint.domain.SmComplaint; +import com.ruoyi.ss.complaint.domain.SmComplaintDto; +import com.ruoyi.ss.complaint.domain.SmComplaintVo; import java.util.List; -import com.ruoyi.system.domain.SmComplaint; -import com.ruoyi.system.domain.dto.SmComplaintDto; -import com.ruoyi.system.domain.vo.SmComplaintVo; /** * 投诉Mapper接口 - * + * * @author ruoyi * @date 2024-03-02 */ -public interface SmComplaintMapper +public interface SmComplaintMapper { /** * 查询投诉 - * + * * @param id 投诉主键 * @return 投诉 */ @@ -23,7 +24,7 @@ public interface SmComplaintMapper /** * 查询投诉列表 - * + * * @param smComplaint 投诉 * @return 投诉集合 */ @@ -31,7 +32,7 @@ public interface SmComplaintMapper /** * 新增投诉 - * + * * @param smComplaint 投诉 * @return 结果 */ @@ -39,7 +40,7 @@ public interface SmComplaintMapper /** * 修改投诉 - * + * * @param smComplaint 投诉 * @return 结果 */ @@ -47,7 +48,7 @@ public interface SmComplaintMapper /** * 删除投诉 - * + * * @param id 投诉主键 * @return 结果 */ @@ -55,7 +56,7 @@ public interface SmComplaintMapper /** * 批量删除投诉 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmComplaintMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/mapper/SmComplaintMapper.xml similarity index 95% rename from smart-switch-system/src/main/resources/mapper/system/SmComplaintMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/mapper/SmComplaintMapper.xml index 25498a0a..32bf457f 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmComplaintMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/mapper/SmComplaintMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into sm_complaint @@ -83,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_complaint where id in + delete from sm_complaint where id in #{id} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmComplaintService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/service/ISmComplaintService.java similarity index 78% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmComplaintService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/service/ISmComplaintService.java index 027bcc61..efdfe036 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmComplaintService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/service/ISmComplaintService.java @@ -1,21 +1,22 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.complaint.service; + +import com.ruoyi.ss.complaint.domain.SmComplaint; +import com.ruoyi.ss.complaint.domain.SmComplaintDto; +import com.ruoyi.ss.complaint.domain.SmComplaintVo; import java.util.List; -import com.ruoyi.system.domain.SmComplaint; -import com.ruoyi.system.domain.dto.SmComplaintDto; -import com.ruoyi.system.domain.vo.SmComplaintVo; /** * 投诉Service接口 - * + * * @author ruoyi * @date 2024-03-02 */ -public interface ISmComplaintService +public interface ISmComplaintService { /** * 查询投诉 - * + * * @param id 投诉主键 * @return 投诉 */ @@ -23,7 +24,7 @@ public interface ISmComplaintService /** * 查询投诉列表 - * + * * @param smComplaint 投诉 * @return 投诉集合 */ @@ -31,7 +32,7 @@ public interface ISmComplaintService /** * 新增投诉 - * + * * @param smComplaint 投诉 * @return 结果 */ @@ -39,7 +40,7 @@ public interface ISmComplaintService /** * 修改投诉 - * + * * @param smComplaint 投诉 * @return 结果 */ @@ -47,7 +48,7 @@ public interface ISmComplaintService /** * 批量删除投诉 - * + * * @param ids 需要删除的投诉主键集合 * @return 结果 */ @@ -55,7 +56,7 @@ public interface ISmComplaintService /** * 删除投诉信息 - * + * * @param id 投诉主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmComplaintServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/service/SmComplaintServiceImpl.java similarity index 84% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmComplaintServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/complaint/service/SmComplaintServiceImpl.java index 307fb91d..6ffc0323 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmComplaintServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/complaint/service/SmComplaintServiceImpl.java @@ -1,30 +1,30 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.complaint.service; -import java.util.List; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.system.domain.dto.SmComplaintDto; -import com.ruoyi.system.domain.vo.SmComplaintVo; +import com.ruoyi.ss.complaint.domain.SmComplaint; +import com.ruoyi.ss.complaint.domain.SmComplaintDto; +import com.ruoyi.ss.complaint.domain.SmComplaintVo; +import com.ruoyi.ss.complaint.mapper.SmComplaintMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmComplaintMapper; -import com.ruoyi.system.domain.SmComplaint; -import com.ruoyi.system.service.ISmComplaintService; + +import java.util.List; /** * 投诉Service业务层处理 - * + * * @author ruoyi * @date 2024-03-02 */ @Service -public class SmComplaintServiceImpl implements ISmComplaintService +public class SmComplaintServiceImpl implements ISmComplaintService { @Autowired private SmComplaintMapper smComplaintMapper; /** * 查询投诉 - * + * * @param id 投诉主键 * @return 投诉 */ @@ -36,7 +36,7 @@ public class SmComplaintServiceImpl implements ISmComplaintService /** * 查询投诉列表 - * + * * @param smComplaint 投诉 * @return 投诉 */ @@ -48,7 +48,7 @@ public class SmComplaintServiceImpl implements ISmComplaintService /** * 新增投诉 - * + * * @param smComplaint 投诉 * @return 结果 */ @@ -61,7 +61,7 @@ public class SmComplaintServiceImpl implements ISmComplaintService /** * 修改投诉 - * + * * @param smComplaint 投诉 * @return 结果 */ @@ -73,7 +73,7 @@ public class SmComplaintServiceImpl implements ISmComplaintService /** * 批量删除投诉 - * + * * @param ids 需要删除的投诉主键 * @return 结果 */ @@ -85,7 +85,7 @@ public class SmComplaintServiceImpl implements ISmComplaintService /** * 删除投诉信息 - * + * * @param id 投诉主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/BillCountVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/BillCountVo.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/BillCountVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/BillCountVo.java index d3ecf971..b2cc4d1c 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/BillCountVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/BillCountVo.java @@ -1,7 +1,6 @@ -package com.ruoyi.system.domain.vo.dashboard; +package com.ruoyi.ss.dashboard; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/BriefVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/BriefVo.java similarity index 78% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/BriefVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/BriefVo.java index 7f12dfd0..e5f089bc 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/BriefVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/BriefVo.java @@ -1,7 +1,6 @@ -package com.ruoyi.system.domain.vo.dashboard; +package com.ruoyi.ss.dashboard; -import com.ruoyi.system.domain.SmBusinessRecord; -import com.ruoyi.system.domain.vo.SmBusinessRecordVo; +import com.ruoyi.ss.businessRecord.domain.SmBusinessRecordVo; import lombok.Data; import java.math.BigDecimal; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/SmUserCountVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/SmUserCountVo.java similarity index 71% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/SmUserCountVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/SmUserCountVo.java index 298ff468..419d35a2 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/dashboard/SmUserCountVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/SmUserCountVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo.dashboard; +package com.ruoyi.ss.dashboard; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmDevice.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDevice.java similarity index 95% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmDevice.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDevice.java index a936969c..6d653121 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmDevice.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDevice.java @@ -1,29 +1,25 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.device.domain; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.common.valid.EnumValid; -import com.ruoyi.system.domain.enums.device.DeviceOutageWay; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import org.aspectj.lang.annotation.Before; +import com.ruoyi.common.core.domain.ValidGroup; +import com.ruoyi.common.valid.EnumValid; +import com.ruoyi.ss.device.domain.enums.DeviceOutageWay; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import javax.validation.constraints.Past; +import java.math.BigDecimal; +import java.util.Date; /** * 设备对象 sm_device - * + * * @author 邱贞招 * @date 2024-02-21 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmDeviceDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDeviceDto.java similarity index 84% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmDeviceDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDeviceDto.java index fd818f46..9e9aac24 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmDeviceDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDeviceDto.java @@ -1,8 +1,5 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.device.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.system.domain.SmDevice; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmDeviceVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDeviceVo.java similarity index 78% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmDeviceVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDeviceVo.java index b87baa98..250ab55b 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmDeviceVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/SmDeviceVo.java @@ -1,8 +1,5 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.device.domain; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.system.domain.SmDevice; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceOnlineStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceOnlineStatus.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceOnlineStatus.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceOnlineStatus.java index fec41fd0..76cb5e0d 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceOnlineStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceOnlineStatus.java @@ -1,7 +1,6 @@ -package com.ruoyi.system.domain.enums.device; +package com.ruoyi.ss.device.domain.enums; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.Getter; /** diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceOutageWay.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceOutageWay.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceOutageWay.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceOutageWay.java index 7757d0af..26abcfd6 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceOutageWay.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceOutageWay.java @@ -1,11 +1,10 @@ -package com.ruoyi.system.domain.enums.device; - -import java.math.BigDecimal; -import java.util.Objects; +package com.ruoyi.ss.device.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * 断电方式 * @author wjh @@ -30,4 +29,4 @@ public enum DeviceOutageWay { throw new RuntimeException("不存在值为" + value + "的断电方式"); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DevicePowerStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DevicePowerStatus.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DevicePowerStatus.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DevicePowerStatus.java index e8694a49..175f7fc8 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DevicePowerStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DevicePowerStatus.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain.enums.device; - -import java.util.Objects; +package com.ruoyi.ss.device.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * @author wjh * 2024/3/20 @@ -27,4 +27,4 @@ public enum DevicePowerStatus { } throw new RuntimeException("不存在值为" + status + "的通断电类型"); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceStatus.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceStatus.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceStatus.java index 7474ad55..a4b91ee0 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/device/DeviceStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/enums/DeviceStatus.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain.enums.device; - -import java.util.Objects; +package com.ruoyi.ss.device.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * 设备状态 * @author wjh @@ -29,4 +29,4 @@ public enum DeviceStatus { } throw new RuntimeException("不存在值为" + status + "的状态"); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmDeviceMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmDeviceMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.java index cc347d8e..95a13666 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmDeviceMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.java @@ -1,23 +1,24 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.device.mapper; + +import com.ruoyi.ss.device.domain.SmDevice; +import com.ruoyi.ss.device.domain.SmDeviceDto; +import com.ruoyi.ss.device.domain.SmDeviceVo; +import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; -import com.ruoyi.system.domain.SmDevice; -import com.ruoyi.system.domain.dto.SmDeviceDto; -import com.ruoyi.system.domain.vo.SmDeviceVo; -import org.apache.ibatis.annotations.Param; /** * 设备Mapper接口 - * + * * @author 邱贞招 * @date 2024-02-21 */ -public interface SmDeviceMapper +public interface SmDeviceMapper { /** * 查询设备 - * + * * @param deviceId 设备主键 * @return 设备 */ @@ -25,7 +26,7 @@ public interface SmDeviceMapper /** * 查询设备列表 - * + * * @param smDevice 设备 * @return 设备集合 */ @@ -41,7 +42,7 @@ public interface SmDeviceMapper /** * 修改设备 - * + * * @param smDevice 设备 * @return 结果 */ @@ -49,7 +50,7 @@ public interface SmDeviceMapper /** * 删除设备 - * + * * @param deviceId 设备主键 * @return 结果 */ @@ -57,7 +58,7 @@ public interface SmDeviceMapper /** * 批量删除设备 - * + * * @param deviceIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmDeviceMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.xml similarity index 98% rename from smart-switch-system/src/main/resources/mapper/system/SmDeviceMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.xml index c574df99..8da2fdd4 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmDeviceMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/SmDeviceMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sdt.device_id = #{deviceId} - select su.user_name, su.nick_name, su.user_id @@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by sd.device_id order by sd.create_time desc - + - + and device_id = #{deviceId} and user_id = #{userId} - + - + insert into sm_device_bind_record @@ -62,9 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_device_bind_record where record_id in + delete from sm_device_bind_record where record_id in #{recordId} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmDeviceBindRecordService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceBindRecord/service/ISmDeviceBindRecordService.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmDeviceBindRecordService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceBindRecord/service/ISmDeviceBindRecordService.java index 770cb8e6..d4397be4 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmDeviceBindRecordService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceBindRecord/service/ISmDeviceBindRecordService.java @@ -1,19 +1,20 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.deviceBindRecord.service; + +import com.ruoyi.ss.deviceBindRecord.domain.SmDeviceBindRecord; import java.util.List; -import com.ruoyi.system.domain.SmDeviceBindRecord; /** * 设备绑定记录Service接口 - * + * * @author ruoyi * @date 2024-04-17 */ -public interface ISmDeviceBindRecordService +public interface ISmDeviceBindRecordService { /** * 查询设备绑定记录 - * + * * @param recordId 设备绑定记录主键 * @return 设备绑定记录 */ @@ -21,7 +22,7 @@ public interface ISmDeviceBindRecordService /** * 查询设备绑定记录列表 - * + * * @param smDeviceBindRecord 设备绑定记录 * @return 设备绑定记录集合 */ @@ -29,7 +30,7 @@ public interface ISmDeviceBindRecordService /** * 新增设备绑定记录 - * + * * @param smDeviceBindRecord 设备绑定记录 * @return 结果 */ @@ -37,7 +38,7 @@ public interface ISmDeviceBindRecordService /** * 修改设备绑定记录 - * + * * @param smDeviceBindRecord 设备绑定记录 * @return 结果 */ @@ -45,7 +46,7 @@ public interface ISmDeviceBindRecordService /** * 批量删除设备绑定记录 - * + * * @param recordIds 需要删除的设备绑定记录主键集合 * @return 结果 */ @@ -53,7 +54,7 @@ public interface ISmDeviceBindRecordService /** * 删除设备绑定记录信息 - * + * * @param recordId 设备绑定记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmDeviceBindRecordServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceBindRecord/service/SmDeviceBindRecordServiceImpl.java similarity index 90% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmDeviceBindRecordServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceBindRecord/service/SmDeviceBindRecordServiceImpl.java index 22a174ab..954e796e 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmDeviceBindRecordServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceBindRecord/service/SmDeviceBindRecordServiceImpl.java @@ -1,28 +1,28 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.deviceBindRecord.service; -import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.ss.deviceBindRecord.domain.SmDeviceBindRecord; +import com.ruoyi.ss.deviceBindRecord.mapper.SmDeviceBindRecordMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmDeviceBindRecordMapper; -import com.ruoyi.system.domain.SmDeviceBindRecord; -import com.ruoyi.system.service.ISmDeviceBindRecordService; + +import java.util.List; /** * 设备绑定记录Service业务层处理 - * + * * @author ruoyi * @date 2024-04-17 */ @Service -public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService +public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService { @Autowired private SmDeviceBindRecordMapper smDeviceBindRecordMapper; /** * 查询设备绑定记录 - * + * * @param recordId 设备绑定记录主键 * @return 设备绑定记录 */ @@ -34,7 +34,7 @@ public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService /** * 查询设备绑定记录列表 - * + * * @param smDeviceBindRecord 设备绑定记录 * @return 设备绑定记录 */ @@ -46,7 +46,7 @@ public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService /** * 新增设备绑定记录 - * + * * @param smDeviceBindRecord 设备绑定记录 * @return 结果 */ @@ -59,7 +59,7 @@ public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService /** * 修改设备绑定记录 - * + * * @param smDeviceBindRecord 设备绑定记录 * @return 结果 */ @@ -71,7 +71,7 @@ public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService /** * 批量删除设备绑定记录 - * + * * @param recordIds 需要删除的设备绑定记录主键 * @return 结果 */ @@ -83,7 +83,7 @@ public class SmDeviceBindRecordServiceImpl implements ISmDeviceBindRecordService /** * 删除设备绑定记录信息 - * + * * @param recordId 设备绑定记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmDeviceGroup.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/domain/SmDeviceGroup.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmDeviceGroup.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/domain/SmDeviceGroup.java index 19371df8..1f2ba061 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmDeviceGroup.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/domain/SmDeviceGroup.java @@ -1,15 +1,13 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.deviceGroup.domain; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * 设备分组对象 sm_device_group - * + * * @author 邱贞招 * @date 2024-02-21 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmDeviceGroupVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/domain/SmDeviceGroupVo.java similarity index 79% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmDeviceGroupVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/domain/SmDeviceGroupVo.java index 7bd574a7..0011e2e2 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmDeviceGroupVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/domain/SmDeviceGroupVo.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.deviceGroup.domain; -import com.ruoyi.system.domain.SmDeviceGroup; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmDeviceGroupMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/mapper/SmDeviceGroupMapper.java similarity index 88% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmDeviceGroupMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/mapper/SmDeviceGroupMapper.java index 99158d4c..d497ffac 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmDeviceGroupMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/mapper/SmDeviceGroupMapper.java @@ -1,21 +1,22 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.deviceGroup.mapper; + +import com.ruoyi.ss.deviceGroup.domain.SmDeviceGroup; +import com.ruoyi.ss.deviceGroup.domain.SmDeviceGroupVo; +import org.apache.ibatis.annotations.Param; import java.util.List; -import com.ruoyi.system.domain.SmDeviceGroup; -import com.ruoyi.system.domain.vo.SmDeviceGroupVo; -import org.apache.ibatis.annotations.Param; /** * 设备分组Mapper接口 - * + * * @author 邱贞招 * @date 2024-02-21 */ -public interface SmDeviceGroupMapper +public interface SmDeviceGroupMapper { /** * 查询设备分组 - * + * * @param groupId 设备分组主键 * @return 设备分组 */ @@ -23,7 +24,7 @@ public interface SmDeviceGroupMapper /** * 查询设备分组列表 - * + * * @param smDeviceGroup 设备分组 * @return 设备分组集合 */ @@ -31,7 +32,7 @@ public interface SmDeviceGroupMapper /** * 新增设备分组 - * + * * @param smDeviceGroup 设备分组 * @return 结果 */ @@ -39,7 +40,7 @@ public interface SmDeviceGroupMapper /** * 修改设备分组 - * + * * @param smDeviceGroup 设备分组 * @return 结果 */ @@ -47,7 +48,7 @@ public interface SmDeviceGroupMapper /** * 删除设备分组 - * + * * @param groupId 设备分组主键 * @return 结果 */ @@ -55,7 +56,7 @@ public interface SmDeviceGroupMapper /** * 批量删除设备分组 - * + * * @param groupIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmDeviceGroupMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/mapper/SmDeviceGroupMapper.xml similarity index 97% rename from smart-switch-system/src/main/resources/mapper/system/SmDeviceGroupMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/mapper/SmDeviceGroupMapper.xml index 8d1c933c..e4c36938 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmDeviceGroupMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceGroup/mapper/SmDeviceGroupMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + and device_id = #{deviceId} and tenant_id = #{tenantId} and is_default = #{isDefault} - + - + insert into sm_device_tenant @@ -73,10 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_device_tenant where id in + delete from sm_device_tenant where id in #{id} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmDeviceTenantService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceTenant/service/ISmDeviceTenantService.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmDeviceTenantService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceTenant/service/ISmDeviceTenantService.java index 85a760f3..365e2071 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmDeviceTenantService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceTenant/service/ISmDeviceTenantService.java @@ -1,22 +1,22 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.deviceTenant.service; + +import com.ruoyi.ss.deviceTenant.domain.SmDeviceTenant; +import com.ruoyi.ss.deviceTenant.domain.SmDeviceTenantDto; import java.util.List; import java.util.Map; -import com.ruoyi.system.domain.SmDeviceTenant; -import com.ruoyi.system.domain.dto.SmDeviceTenantDto; - /** * 设备与租户绑定（中间）Service接口 - * + * * @author ruoyi * @date 2024-03-15 */ -public interface ISmDeviceTenantService +public interface ISmDeviceTenantService { /** * 查询设备与租户绑定（中间） - * + * * @param id 设备与租户绑定（中间）主键 * @return 设备与租户绑定（中间） */ @@ -24,7 +24,7 @@ public interface ISmDeviceTenantService /** * 查询设备与租户绑定（中间）列表 - * + * * @param smDeviceTenant 设备与租户绑定（中间） * @return 设备与租户绑定（中间）集合 */ @@ -32,7 +32,7 @@ public interface ISmDeviceTenantService /** * 新增设备与租户绑定（中间） - * + * * @param smDeviceTenant 设备与租户绑定（中间） * @return 结果 */ @@ -40,7 +40,7 @@ public interface ISmDeviceTenantService /** * 修改设备与租户绑定（中间） - * + * * @param smDeviceTenant 设备与租户绑定（中间） * @return 结果 */ @@ -48,7 +48,7 @@ public interface ISmDeviceTenantService /** * 批量删除设备与租户绑定（中间） - * + * * @param ids 需要删除的设备与租户绑定（中间）主键集合 * @return 结果 */ @@ -56,7 +56,7 @@ public interface ISmDeviceTenantService /** * 删除设备与租户绑定（中间）信息 - * + * * @param id 设备与租户绑定（中间）主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmDeviceTenantServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceTenant/service/SmDeviceTenantServiceImpl.java similarity index 91% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmDeviceTenantServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/deviceTenant/service/SmDeviceTenantServiceImpl.java index 55a83a8c..779a49eb 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmDeviceTenantServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/deviceTenant/service/SmDeviceTenantServiceImpl.java @@ -1,35 +1,33 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.deviceTenant.service; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.ss.deviceTenant.domain.SmDeviceTenant; +import com.ruoyi.ss.deviceTenant.domain.SmDeviceTenantDto; +import com.ruoyi.ss.deviceTenant.mapper.SmDeviceTenantMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.dto.SmDeviceTenantDto; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmDeviceTenantMapper; -import com.ruoyi.system.domain.SmDeviceTenant; -import com.ruoyi.system.service.ISmDeviceTenantService; -import org.springframework.util.CollectionUtils; - /** * 设备与租户绑定（中间）Service业务层处理 - * + * * @author ruoyi * @date 2024-03-15 */ @Service -public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService +public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService { @Autowired private SmDeviceTenantMapper smDeviceTenantMapper; /** * 查询设备与租户绑定（中间） - * + * * @param id 设备与租户绑定（中间）主键 * @return 设备与租户绑定（中间） */ @@ -41,7 +39,7 @@ public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService /** * 查询设备与租户绑定（中间）列表 - * + * * @param smDeviceTenant 设备与租户绑定（中间） * @return 设备与租户绑定（中间） */ @@ -53,7 +51,7 @@ public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService /** * 新增设备与租户绑定（中间） - * + * * @param smDeviceTenant 设备与租户绑定（中间） * @return 结果 */ @@ -66,7 +64,7 @@ public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService /** * 修改设备与租户绑定（中间） - * + * * @param smDeviceTenant 设备与租户绑定（中间） * @return 结果 */ @@ -78,7 +76,7 @@ public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService /** * 批量删除设备与租户绑定（中间） - * + * * @param ids 需要删除的设备与租户绑定（中间）主键 * @return 结果 */ @@ -90,7 +88,7 @@ public class SmDeviceTenantServiceImpl implements ISmDeviceTenantService /** * 删除设备与租户绑定（中间）信息 - * + * * @param id 设备与租户绑定（中间）主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmMeterReadingRecord.java b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecord.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmMeterReadingRecord.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecord.java index d78bd9bb..08144e4a 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmMeterReadingRecord.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecord.java @@ -1,16 +1,14 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.meterReadingRecord.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; import java.math.BigDecimal; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - /** * 抄记录对象 sm_meter_reading_record - * + * * @author ruoyi * @date 2024-03-28 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmMeterReadingRecordBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordBO.java similarity index 59% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmMeterReadingRecordBO.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordBO.java index 91940538..51685d53 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmMeterReadingRecordBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordBO.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.bo; +package com.ruoyi.ss.meterReadingRecord.domain; -import com.ruoyi.system.domain.SmMeterReadingRecord; import lombok.Data; /** diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmMeterReadingRecordDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordDto.java similarity index 76% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmMeterReadingRecordDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordDto.java index f1ff8e41..163529d5 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmMeterReadingRecordDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordDto.java @@ -1,13 +1,10 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.meterReadingRecord.domain; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.valid.EnumValid; -import com.ruoyi.system.domain.SmMeterReadingRecord; -import com.ruoyi.system.domain.enums.meterReadingRecord.MeterReadingRecordGroupBy; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillGroupBy; +import com.ruoyi.ss.meterReadingRecord.domain.meterReadingRecord.MeterReadingRecordGroupBy; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.checkerframework.common.value.qual.EnumVal; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmMeterReadingRecordVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordVo.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmMeterReadingRecordVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordVo.java index 628f668e..adeb09bd 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmMeterReadingRecordVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/SmMeterReadingRecordVo.java @@ -1,10 +1,8 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.meterReadingRecord.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.system.domain.SmMeterReadingRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/meterReadingRecord/MeterReadingRecordGroupBy.java b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/meterReadingRecord/MeterReadingRecordGroupBy.java similarity index 76% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/meterReadingRecord/MeterReadingRecordGroupBy.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/meterReadingRecord/MeterReadingRecordGroupBy.java index a73f58e1..9a50de9f 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/meterReadingRecord/MeterReadingRecordGroupBy.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/domain/meterReadingRecord/MeterReadingRecordGroupBy.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.enums.meterReadingRecord; +package com.ruoyi.ss.meterReadingRecord.domain.meterReadingRecord; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmMeterReadingRecordMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/mapper/SmMeterReadingRecordMapper.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmMeterReadingRecordMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/mapper/SmMeterReadingRecordMapper.java index a1d104ff..56b16bf0 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmMeterReadingRecordMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/mapper/SmMeterReadingRecordMapper.java @@ -1,22 +1,23 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.meterReadingRecord.mapper; + +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecord; +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecordDto; +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecordVo; +import org.apache.ibatis.annotations.Param; import java.util.List; -import com.ruoyi.system.domain.SmMeterReadingRecord; -import com.ruoyi.system.domain.dto.SmMeterReadingRecordDto; -import com.ruoyi.system.domain.vo.SmMeterReadingRecordVo; -import org.apache.ibatis.annotations.Param; /** * 抄记录Mapper接口 - * + * * @author ruoyi * @date 2024-03-28 */ -public interface SmMeterReadingRecordMapper +public interface SmMeterReadingRecordMapper { /** * 查询抄记录 - * + * * @param recordId 抄记录主键 * @return 抄记录 */ @@ -24,7 +25,7 @@ public interface SmMeterReadingRecordMapper /** * 查询抄记录列表 - * + * * @param smMeterReadingRecord 抄记录 * @return 抄记录集合 */ @@ -32,7 +33,7 @@ public interface SmMeterReadingRecordMapper /** * 新增抄记录 - * + * * @param smMeterReadingRecord 抄记录 * @return 结果 */ @@ -40,7 +41,7 @@ public interface SmMeterReadingRecordMapper /** * 修改抄记录 - * + * * @param smMeterReadingRecord 抄记录 * @return 结果 */ @@ -48,7 +49,7 @@ public interface SmMeterReadingRecordMapper /** * 删除抄记录 - * + * * @param recordId 抄记录主键 * @return 结果 */ @@ -56,7 +57,7 @@ public interface SmMeterReadingRecordMapper /** * 批量删除抄记录 - * + * * @param recordIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmMeterReadingRecordMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/mapper/SmMeterReadingRecordMapper.xml similarity index 98% rename from smart-switch-system/src/main/resources/mapper/system/SmMeterReadingRecordMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/mapper/SmMeterReadingRecordMapper.xml index 04a6a07a..20a23b95 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmMeterReadingRecordMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/meterReadingRecord/mapper/SmMeterReadingRecordMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY smrr.create_time DESC - + - + - + and srr.device_id = #{deviceId} and srr.surplus_electri_quantity = #{surplusElectriQuantity} and srr.landlord_id = #{landlordId} order by srr.create_time desc - + - + insert into sm_reset_record @@ -82,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_reset_record where id in + delete from sm_reset_record where id in #{id} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmResetRecordService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/resetRecord/service/ISmResetRecordService.java similarity index 79% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmResetRecordService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/resetRecord/service/ISmResetRecordService.java index 41d157d7..e0359e73 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmResetRecordService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/resetRecord/service/ISmResetRecordService.java @@ -1,21 +1,22 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.resetRecord.service; + +import com.ruoyi.ss.resetRecord.domain.SmResetRecord; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordDto; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordVo; import java.util.List; -import com.ruoyi.system.domain.SmResetRecord; -import com.ruoyi.system.domain.dto.SmResetRecordDto; -import com.ruoyi.system.domain.vo.SmResetRecordVo; /** * 归零记录Service接口 - * + * * @author ruoyi * @date 2024-04-01 */ -public interface ISmResetRecordService +public interface ISmResetRecordService { /** * 查询归零记录 - * + * * @param id 归零记录主键 * @return 归零记录 */ @@ -23,7 +24,7 @@ public interface ISmResetRecordService /** * 查询归零记录列表 - * + * * @param smResetRecord 归零记录 * @return 归零记录集合 */ @@ -31,7 +32,7 @@ public interface ISmResetRecordService /** * 新增归零记录 - * + * * @param smResetRecord 归零记录 * @return 结果 */ @@ -39,7 +40,7 @@ public interface ISmResetRecordService /** * 修改归零记录 - * + * * @param smResetRecord 归零记录 * @return 结果 */ @@ -47,7 +48,7 @@ public interface ISmResetRecordService /** * 批量删除归零记录 - * + * * @param ids 需要删除的归零记录主键集合 * @return 结果 */ @@ -55,7 +56,7 @@ public interface ISmResetRecordService /** * 删除归零记录信息 - * + * * @param id 归零记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmResetRecordServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/resetRecord/service/SmResetRecordServiceImpl.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmResetRecordServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/resetRecord/service/SmResetRecordServiceImpl.java index 9ecfad55..918f0f25 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmResetRecordServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/resetRecord/service/SmResetRecordServiceImpl.java @@ -1,30 +1,30 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.resetRecord.service; -import java.util.List; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.system.domain.dto.SmResetRecordDto; -import com.ruoyi.system.domain.vo.SmResetRecordVo; +import com.ruoyi.ss.resetRecord.domain.SmResetRecord; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordDto; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordVo; +import com.ruoyi.ss.resetRecord.mapper.SmResetRecordMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmResetRecordMapper; -import com.ruoyi.system.domain.SmResetRecord; -import com.ruoyi.system.service.ISmResetRecordService; + +import java.util.List; /** * 归零记录Service业务层处理 - * + * * @author ruoyi * @date 2024-04-01 */ @Service -public class SmResetRecordServiceImpl implements ISmResetRecordService +public class SmResetRecordServiceImpl implements ISmResetRecordService { @Autowired private SmResetRecordMapper smResetRecordMapper; /** * 查询归零记录 - * + * * @param id 归零记录主键 * @return 归零记录 */ @@ -36,7 +36,7 @@ public class SmResetRecordServiceImpl implements ISmResetRecordService /** * 查询归零记录列表 - * + * * @param smResetRecord 归零记录 * @return 归零记录 */ @@ -48,7 +48,7 @@ public class SmResetRecordServiceImpl implements ISmResetRecordService /** * 新增归零记录 - * + * * @param smResetRecord 归零记录 * @return 结果 */ @@ -61,7 +61,7 @@ public class SmResetRecordServiceImpl implements ISmResetRecordService /** * 修改归零记录 - * + * * @param smResetRecord 归零记录 * @return 结果 */ @@ -73,7 +73,7 @@ public class SmResetRecordServiceImpl implements ISmResetRecordService /** * 批量删除归零记录 - * + * * @param ids 需要删除的归零记录主键 * @return 结果 */ @@ -85,7 +85,7 @@ public class SmResetRecordServiceImpl implements ISmResetRecordService /** * 删除归零记录信息 - * + * * @param id 归零记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmTransactionBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBill.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmTransactionBill.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBill.java index 5cd19ea1..bd286014 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmTransactionBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBill.java @@ -1,27 +1,23 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.transactionBill.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.domain.ValidGroup; +import com.ruoyi.common.valid.EnumValid; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillPayType; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.common.valid.EnumValid; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillPayType; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * 充值记录对象 sm_transaction_bill - * + * * @author 邱贞招 * @date 2024-02-21 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmTransactionBillBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillBO.java similarity index 57% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmTransactionBillBO.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillBO.java index c627ae57..6e6c5812 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmTransactionBillBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillBO.java @@ -1,12 +1,8 @@ -package com.ruoyi.system.domain.bo; +package com.ruoyi.ss.transactionBill.domain; -import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.system.domain.SmTransactionBill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; - /** * @author wjh * 2024/3/27 diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmTransactionBillDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillDto.java similarity index 86% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmTransactionBillDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillDto.java index ed4d2cef..0dbeb4ca 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmTransactionBillDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillDto.java @@ -1,16 +1,13 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.transactionBill.domain; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.valid.EnumValid; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillGroupBy; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillGroupBy; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; import java.util.Date; import java.util.List; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmTransactionBillVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillVo.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmTransactionBillVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillVo.java index a912b303..c4dc124f 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmTransactionBillVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/SmTransactionBillVo.java @@ -1,6 +1,5 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.transactionBill.domain; -import com.ruoyi.system.domain.SmTransactionBill; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillDeviceRechargeStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillDeviceRechargeStatus.java similarity index 93% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillDeviceRechargeStatus.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillDeviceRechargeStatus.java index ab9e379f..78afe080 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillDeviceRechargeStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillDeviceRechargeStatus.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.domain.enums.transactionBill; - -import java.util.Objects; +package com.ruoyi.ss.transactionBill.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Objects; + /** * 订单设备充值状态 * @author wjh @@ -28,4 +28,4 @@ public enum TransactionBillDeviceRechargeStatus { } throw new RuntimeException("不存在值为" + status + "的设备充值状态"); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillGroupBy.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillGroupBy.java similarity index 84% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillGroupBy.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillGroupBy.java index aca6f1c7..419b8500 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillGroupBy.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillGroupBy.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.enums.transactionBill; +package com.ruoyi.ss.transactionBill.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillPayType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillPayType.java similarity index 88% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillPayType.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillPayType.java index c269d908..c4164753 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillPayType.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillPayType.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain.enums.transactionBill; +package com.ruoyi.ss.transactionBill.domain.enums; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.system.domain.enums.account.AccountType; +import com.ruoyi.ss.account.domain.enums.AccountType; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java similarity index 96% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillStatus.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java index ec228bb9..c23acee7 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.domain.enums.transactionBill; +package com.ruoyi.ss.transactionBill.domain.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import lombok.AllArgsConstructor; -import lombok.Getter; - /** * @author wjh * 2024/3/12 @@ -53,4 +53,4 @@ public enum TransactionBillStatus { public static boolean isCancel(String status) { return asList(CANCELED, SYS_CANCELED).contains(status); } -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillType.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillType.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillType.java index 177dae39..5aa844a4 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/transactionBill/TransactionBillType.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillType.java @@ -1,8 +1,7 @@ -package com.ruoyi.system.domain.enums.transactionBill; +package com.ruoyi.ss.transactionBill.domain.enums; import com.ruoyi.common.exception.ServiceException; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.Getter; /** diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmTransactionBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/SmTransactionBillMapper.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmTransactionBillMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/SmTransactionBillMapper.java index b58deef2..8b92d7e7 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmTransactionBillMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/SmTransactionBillMapper.java @@ -1,26 +1,25 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.transactionBill.mapper; + +import com.ruoyi.ss.dashboard.BillCountVo; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; +import org.apache.ibatis.annotations.Param; -import java.time.LocalDateTime; import java.util.Date; import java.util.List; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import com.ruoyi.system.domain.vo.dashboard.BillCountVo; -import org.apache.ibatis.annotations.Param; /** * 充值记录Mapper接口 - * + * * @author 邱贞招 * @date 2024-02-21 */ -public interface SmTransactionBillMapper +public interface SmTransactionBillMapper { /** * 查询充值记录 - * + * * @param billId 充值记录主键 * @return 充值记录 */ @@ -28,7 +27,7 @@ public interface SmTransactionBillMapper /** * 查询充值记录列表 - * + * * @param smTransactionBill 充值记录 * @return 充值记录集合 */ @@ -36,7 +35,7 @@ public interface SmTransactionBillMapper /** * 新增充值记录 - * + * * @param smTransactionBill 充值记录 * @return 结果 */ @@ -44,7 +43,7 @@ public interface SmTransactionBillMapper /** * 修改充值记录 - * + * * @param smTransactionBill 充值记录 * @return 结果 */ @@ -52,7 +51,7 @@ public interface SmTransactionBillMapper /** * 删除充值记录 - * + * * @param billId 充值记录主键 * @return 结果 */ @@ -60,7 +59,7 @@ public interface SmTransactionBillMapper /** * 批量删除充值记录 - * + * * @param billIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmTransactionBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/SmTransactionBillMapper.xml similarity index 98% rename from smart-switch-system/src/main/resources/mapper/system/SmTransactionBillMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/SmTransactionBillMapper.xml index 1d3ea0f8..164cae4e 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmTransactionBillMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/SmTransactionBillMapper.xml @@ -2,7 +2,7 @@ - + @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where stb.bill_id = #{billId} - + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmTransactionBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/ISmTransactionBillService.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmTransactionBillService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/ISmTransactionBillService.java index 3ec823e2..bb9b09ff 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmTransactionBillService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/ISmTransactionBillService.java @@ -1,27 +1,27 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.transactionBill.service; + +import com.ruoyi.ss.dashboard.BillCountVo; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillBO; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillPayType; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; -import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.bo.SmTransactionBillBO; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillPayType; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import com.ruoyi.system.domain.vo.dashboard.BillCountVo; /** * 充值记录Service接口 - * + * * @author 邱贞招 * @date 2024-02-21 */ -public interface ISmTransactionBillService +public interface ISmTransactionBillService { /** * 查询充值记录 - * + * * @param billId 充值记录主键 * @return 充值记录 */ @@ -29,7 +29,7 @@ public interface ISmTransactionBillService /** * 查询充值记录列表 - * + * * @param smTransactionBillDto 充值记录查询条件 * @return 充值记录集合 */ @@ -37,7 +37,7 @@ public interface ISmTransactionBillService /** * 新增充值记录 - * + * * @param smTransactionBill 充值记录 * @return 结果 */ @@ -45,7 +45,7 @@ public interface ISmTransactionBillService /** * 修改充值记录 - * + * * @param smTransactionBill 充值记录 * @return 结果 */ @@ -53,7 +53,7 @@ public interface ISmTransactionBillService /** * 批量删除充值记录 - * + * * @param billIds 需要删除的充值记录主键集合 * @return 结果 */ @@ -61,7 +61,7 @@ public interface ISmTransactionBillService /** * 删除充值记录信息 - * + * * @param billId 充值记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmTransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/SmTransactionBillServiceImpl.java similarity index 95% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmTransactionBillServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/SmTransactionBillServiceImpl.java index 1d5e910b..eeab75a5 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmTransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/SmTransactionBillServiceImpl.java @@ -1,33 +1,35 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.transactionBill.service; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.redis.RedisLock; import com.ruoyi.common.core.redis.enums.RedisLockKey; -import com.ruoyi.common.enums.ServiceCode; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.*; -import com.ruoyi.common.utils.sign.Md5Utils; -import com.ruoyi.system.assembler.DeviceAssembler; -import com.ruoyi.system.domain.SmChannel; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.bo.SmTransactionBillBO; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; +import com.ruoyi.ss.account.domain.SmAccountVo; +import com.ruoyi.ss.account.service.ISmAccountService; +import com.ruoyi.ss.channel.domain.SmChannel; +import com.ruoyi.ss.channel.service.ISmChannelService; +import com.ruoyi.ss.dashboard.BillCountVo; +import com.ruoyi.ss.device.domain.SmDeviceVo; +import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; +import com.ruoyi.ss.device.mapper.SmDeviceMapper; +import com.ruoyi.ss.device.service.DeviceAssembler; +import com.ruoyi.ss.device.service.ISmDeviceService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillBO; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; +import com.ruoyi.ss.transactionBill.domain.enums.*; +import com.ruoyi.ss.transactionBill.mapper.SmTransactionBillMapper; +import com.ruoyi.ss.user.domain.SmUserVo; +import com.ruoyi.ss.user.mapper.SmUserMapper; +import com.ruoyi.ss.user.service.ISmUserService; +import com.ruoyi.ss.wxPay.service.IWxPayService; import com.ruoyi.system.domain.enums.config.ConfigKey; -import com.ruoyi.system.domain.enums.device.DeviceOnlineStatus; -import com.ruoyi.system.domain.enums.transactionBill.*; -import com.ruoyi.system.domain.vo.SmAccountVo; -import com.ruoyi.system.domain.vo.SmDeviceVo; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import com.ruoyi.system.domain.vo.SmUserVo; -import com.ruoyi.system.domain.vo.dashboard.BillCountVo; -import com.ruoyi.system.mapper.SmDeviceMapper; -import com.ruoyi.system.mapper.SmTransactionBillMapper; -import com.ruoyi.system.mapper.SmUserMapper; -import com.ruoyi.system.service.*; -import com.ruoyi.system.task.bill.BillDelayedManager; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.task.bill.BillDelayedManager; import com.wechat.pay.java.service.payments.model.Transaction; import com.wechat.pay.java.service.transferbatch.model.InitiateBatchTransferResponse; -import javafx.concurrent.ScheduledService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -43,7 +45,7 @@ import java.util.concurrent.TimeUnit; /** * 充值记录Service业务层处理 - * + * * @author 邱贞招 * @date 2024-02-21 */ @@ -94,7 +96,7 @@ public class SmTransactionBillServiceImpl implements ISmTransactionBillService { /** * 查询充值记录 - * + * * @param billId 充值记录主键 * @return 充值记录 */ @@ -106,7 +108,7 @@ public class SmTransactionBillServiceImpl implements ISmTransactionBillService { /** * 查询充值记录列表 - * + * * @param smTransactionBillDto 充值记录查询条件 * @return 充值记录 */ @@ -118,7 +120,7 @@ public class SmTransactionBillServiceImpl implements ISmTransactionBillService { /** * 新增充值记录 - * + * * @param smTransactionBill 充值记录 * @return 结果 */ @@ -133,7 +135,7 @@ public class SmTransactionBillServiceImpl implements ISmTransactionBillService { /** * 修改充值记录 - * + * * @param smTransactionBill 充值记录 * @return 结果 */ @@ -145,7 +147,7 @@ public class SmTransactionBillServiceImpl implements ISmTransactionBillService { /** * 批量删除充值记录 - * + * * @param billIds 需要删除的充值记录主键 * @return 结果 */ @@ -157,7 +159,7 @@ public class SmTransactionBillServiceImpl implements ISmTransactionBillService { /** * 删除充值记录信息 - * + * * @param billId 充值记录主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmUserBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserBO.java similarity index 77% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmUserBO.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserBO.java index 7153f162..5df2dd4b 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/bo/SmUserBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserBO.java @@ -1,8 +1,7 @@ -package com.ruoyi.system.domain.bo; +package com.ruoyi.ss.user.domain; import com.ruoyi.common.core.domain.entity.SmUser; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; /** diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmUserDto.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserDto.java similarity index 94% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmUserDto.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserDto.java index f867519a..2325fb90 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmUserDto.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.dto; +package com.ruoyi.ss.user.domain; import com.ruoyi.common.core.domain.entity.SmUser; import io.swagger.annotations.ApiModelProperty; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmUserVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java similarity index 91% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmUserVo.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java index 533bca49..08a27699 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/vo/SmUserVo.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVo.java @@ -1,8 +1,7 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.ss.user.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.entity.SmUser; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmUserMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java similarity index 91% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmUserMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java index d8ed81a6..853cd521 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmUserMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.java @@ -1,23 +1,24 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.user.mapper; + +import com.ruoyi.common.core.domain.entity.SmUser; +import com.ruoyi.ss.user.domain.SmUserDto; +import com.ruoyi.ss.user.domain.SmUserVo; +import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; -import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.system.domain.dto.SmUserDto; -import com.ruoyi.system.domain.vo.SmUserVo; -import org.apache.ibatis.annotations.Param; /** * 普通用户信息Mapper接口 - * + * * @author qzz * @date 2024-01-24 */ -public interface SmUserMapper +public interface SmUserMapper { /** * 查询普通用户信息 - * + * * @param userId 普通用户信息主键 * @return 普通用户信息 */ @@ -25,7 +26,7 @@ public interface SmUserMapper /** * 查询普通用户信息列表 - * + * * @param smUser 普通用户信息 * @return 普通用户信息集合 */ @@ -33,7 +34,7 @@ public interface SmUserMapper /** * 新增普通用户信息 - * + * * @param smUser 普通用户信息 * @return 结果 */ @@ -41,7 +42,7 @@ public interface SmUserMapper /** * 修改普通用户信息 - * + * * @param smUser 普通用户信息 * @return 结果 */ @@ -49,7 +50,7 @@ public interface SmUserMapper /** * 删除普通用户信息 - * + * * @param userId 普通用户信息主键 * @return 结果 */ @@ -57,7 +58,7 @@ public interface SmUserMapper /** * 批量删除普通用户信息 - * + * * @param userIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmUserMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml similarity index 99% rename from smart-switch-system/src/main/resources/mapper/system/SmUserMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml index ef1d0f94..7376791f 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmUserMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by su.user_id - + - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmUserService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java similarity index 91% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmUserService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java index 44165f7b..98a6c1e7 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmUserService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java @@ -1,26 +1,24 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.user.service; + +import com.ruoyi.common.core.domain.entity.SmUser; +import com.ruoyi.common.enums.UserType; +import com.ruoyi.ss.user.domain.SmUserDto; +import com.ruoyi.ss.user.domain.SmUserVo; import java.math.BigDecimal; import java.util.List; -import java.util.Map; - -import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.system.domain.dto.SmUserDto; -import com.ruoyi.system.domain.vo.SmUserVo; /** * 普通用户信息Service接口 - * + * * @author qzz * @date 2024-01-24 */ -public interface ISmUserService +public interface ISmUserService { /** * 查询普通用户信息 - * + * * @param userId 普通用户信息主键 * @return 普通用户信息 */ @@ -28,7 +26,7 @@ public interface ISmUserService /** * 查询普通用户信息列表 - * + * * @param smUser 普通用户信息 * @return 普通用户信息集合 */ @@ -36,7 +34,7 @@ public interface ISmUserService /** * 新增普通用户信息 - * + * * @param smUser 普通用户信息 * @return 结果 */ @@ -44,7 +42,7 @@ public interface ISmUserService /** * 修改普通用户信息 - * + * * @param smUser 普通用户信息 * @return 结果 */ @@ -52,7 +50,7 @@ public interface ISmUserService /** * 批量删除普通用户信息 - * + * * @param userIds 需要删除的普通用户信息主键集合 * @return 结果 */ @@ -60,7 +58,7 @@ public interface ISmUserService /** * 删除普通用户信息信息 - * + * * @param userId 普通用户信息主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmUserServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/SmUserServiceImpl.java similarity index 95% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmUserServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/user/service/SmUserServiceImpl.java index 247db234..34bb5175 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmUserServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/SmUserServiceImpl.java @@ -1,4 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.user.service; + +import com.ruoyi.common.core.domain.entity.SmUser; +import com.ruoyi.common.enums.UserType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.ServiceUtil; +import com.ruoyi.ss.user.domain.SmUserDto; +import com.ruoyi.ss.user.domain.SmUserVo; +import com.ruoyi.ss.user.mapper.SmUserMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.Collections; @@ -7,36 +20,21 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.dto.SmUserDto; -import com.ruoyi.system.domain.vo.SmUserVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmUserMapper; -import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.system.service.ISmUserService; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - /** * 普通用户信息Service业务层处理 - * + * * @author qzz * @date 2024-01-24 */ @Service -public class SmUserServiceImpl implements ISmUserService +public class SmUserServiceImpl implements ISmUserService { @Autowired private SmUserMapper smUserMapper; /** * 查询普通用户信息 - * + * * @param userId 普通用户信息主键 * @return 普通用户信息 */ @@ -48,7 +46,7 @@ public class SmUserServiceImpl implements ISmUserService /** * 查询普通用户信息列表 - * + * * @param dto 查询条件 * @return 普通用户信息 */ @@ -209,7 +207,7 @@ public class SmUserServiceImpl implements ISmUserService /** * 新增普通用户信息 - * + * * @param smUser 普通用户信息 * @return 结果 */ @@ -270,7 +268,7 @@ public class SmUserServiceImpl implements ISmUserService /** * 修改普通用户信息 - * + * * @param smUser 普通用户信息 * @return 结果 */ @@ -284,7 +282,7 @@ public class SmUserServiceImpl implements ISmUserService /** * 批量删除普通用户信息 - * + * * @param userIds 需要删除的普通用户信息主键 * @return 结果 */ @@ -296,7 +294,7 @@ public class SmUserServiceImpl implements ISmUserService /** * 删除普通用户信息信息 - * + * * @param userId 普通用户信息主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/enums/wxPay/TransferScene.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/domain/enums/TransferScene.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/enums/wxPay/TransferScene.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/domain/enums/TransferScene.java index ad667746..96ebfe83 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/enums/wxPay/TransferScene.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/domain/enums/TransferScene.java @@ -1,11 +1,10 @@ -package com.ruoyi.system.enums.wxPay; - -import java.math.BigDecimal; -import java.util.Objects; +package com.ruoyi.ss.wxPay.domain.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.math.BigDecimal; + /** * 微信商家转账场景 * @author wjh @@ -20,4 +19,4 @@ public enum TransferScene { private final BigDecimal limitAmount; // 单笔限额 private final String remark; // 场景描述 -} \ No newline at end of file +} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/IWxPayService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/IWxPayService.java similarity index 79% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/IWxPayService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/IWxPayService.java index 749de5af..3dff3a43 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/IWxPayService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/IWxPayService.java @@ -1,16 +1,10 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.wxPay.service; -import com.ruoyi.system.enums.wxPay.TransferScene; -import com.wechat.pay.java.core.exception.ValidationException; -import com.wechat.pay.java.core.notification.Notification; -import com.wechat.pay.java.service.payments.jsapi.model.CloseOrderRequest; +import com.ruoyi.ss.wxPay.domain.enums.TransferScene; import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse; -import com.wechat.pay.java.service.payments.jsapi.model.QueryOrderByIdRequest; -import com.wechat.pay.java.service.payments.jsapi.model.QueryOrderByOutTradeNoRequest; import com.wechat.pay.java.service.payments.model.Transaction; import com.wechat.pay.java.service.transferbatch.model.InitiateBatchTransferResponse; import com.wechat.pay.java.service.transferbatch.model.TransferDetailInput; -import org.springframework.http.ResponseEntity; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java similarity index 94% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java index 0a8b4253..b1df89d3 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java @@ -1,28 +1,26 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.wxPay.service; import com.alibaba.fastjson2.JSON; +import com.ruoyi.common.config.WxPayConfig; import com.ruoyi.common.core.redis.RedisLock; +import com.ruoyi.common.core.redis.enums.RedisLockKey; import com.ruoyi.common.pay.wx.domain.NotifyEventType; import com.ruoyi.common.pay.wx.domain.TransferBatchStatus; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.common.config.WxPayConfig; import com.ruoyi.common.utils.SnowFlakeUtil; import com.ruoyi.common.utils.http.HttpUtils; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.SmWxPayNotify; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillPayType; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillType; -import com.ruoyi.system.domain.vo.SmAccountVo; -import com.ruoyi.system.domain.vo.SmUserVo; -import com.ruoyi.common.core.redis.enums.RedisLockKey; -import com.ruoyi.system.enums.wxPay.TransferScene; -import com.ruoyi.system.mapper.SmWxPayNotifyMapper; -import com.ruoyi.system.service.ISmAccountService; -import com.ruoyi.system.service.ISmTransactionBillService; -import com.ruoyi.system.service.ISmUserService; -import com.ruoyi.system.service.IWxPayService; +import com.ruoyi.ss.account.service.ISmAccountService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillPayType; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillType; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; +import com.ruoyi.ss.user.domain.SmUserVo; +import com.ruoyi.ss.user.service.ISmUserService; +import com.ruoyi.ss.wxPay.domain.enums.TransferScene; +import com.ruoyi.ss.wxPayNotify.domain.SmWxPayNotify; +import com.ruoyi.ss.wxPayNotify.mapper.SmWxPayNotifyMapper; import com.wechat.pay.java.core.notification.Notification; import com.wechat.pay.java.core.notification.NotificationParser; import com.wechat.pay.java.core.notification.RequestParam; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmWxPayNotify.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/domain/SmWxPayNotify.java similarity index 84% rename from smart-switch-system/src/main/java/com/ruoyi/system/domain/SmWxPayNotify.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/domain/SmWxPayNotify.java index c9dc9bee..1af44a27 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/SmWxPayNotify.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/domain/SmWxPayNotify.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.domain; +package com.ruoyi.ss.wxPayNotify.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 微信支付通知对象 sm_wx_pay_notify - * + * * @author ruoyi * @date 2024-03-13 */ @@ -39,30 +39,30 @@ public class SmWxPayNotify extends BaseEntity { return notifyId; } - public void setBillId(Long billId) + public void setBillId(Long billId) { this.billId = billId; } - public Long getBillId() + public Long getBillId() { return billId; } - public void setBody(String body) + public void setBody(String body) { this.body = body; } - public String getBody() + public String getBody() { return body; } - public void setPlaintext(String plaintext) + public void setPlaintext(String plaintext) { this.plaintext = plaintext; } - public String getPlaintext() + public String getPlaintext() { return plaintext; } diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmWxPayNotifyMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/mapper/SmWxPayNotifyMapper.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmWxPayNotifyMapper.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/mapper/SmWxPayNotifyMapper.java index 2c158ae8..fc001536 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/mapper/SmWxPayNotifyMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/mapper/SmWxPayNotifyMapper.java @@ -1,19 +1,20 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.ss.wxPayNotify.mapper; + +import com.ruoyi.ss.wxPayNotify.domain.SmWxPayNotify; import java.util.List; -import com.ruoyi.system.domain.SmWxPayNotify; /** * 微信支付通知Mapper接口 - * + * * @author ruoyi * @date 2024-03-13 */ -public interface SmWxPayNotifyMapper +public interface SmWxPayNotifyMapper { /** * 查询微信支付通知 - * + * * @param notifyId 微信支付通知主键 * @return 微信支付通知 */ @@ -21,7 +22,7 @@ public interface SmWxPayNotifyMapper /** * 查询微信支付通知列表 - * + * * @param smWxPayNotify 微信支付通知 * @return 微信支付通知集合 */ @@ -29,7 +30,7 @@ public interface SmWxPayNotifyMapper /** * 新增微信支付通知 - * + * * @param smWxPayNotify 微信支付通知 * @return 结果 */ @@ -37,7 +38,7 @@ public interface SmWxPayNotifyMapper /** * 修改微信支付通知 - * + * * @param smWxPayNotify 微信支付通知 * @return 结果 */ @@ -45,7 +46,7 @@ public interface SmWxPayNotifyMapper /** * 删除微信支付通知 - * + * * @param notifyId 微信支付通知主键 * @return 结果 */ @@ -53,7 +54,7 @@ public interface SmWxPayNotifyMapper /** * 批量删除微信支付通知 - * + * * @param notifyIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/smart-switch-system/src/main/resources/mapper/system/SmWxPayNotifyMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/mapper/SmWxPayNotifyMapper.xml similarity index 94% rename from smart-switch-system/src/main/resources/mapper/system/SmWxPayNotifyMapper.xml rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/mapper/SmWxPayNotifyMapper.xml index fd8bee0b..6a66038a 100644 --- a/smart-switch-system/src/main/resources/mapper/system/SmWxPayNotifyMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/mapper/SmWxPayNotifyMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -17,18 +17,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into sm_wx_pay_notify @@ -60,9 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sm_wx_pay_notify where notify_id in + delete from sm_wx_pay_notify where notify_id in #{notifyId} - \ No newline at end of file + diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmWxPayNotifyService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/service/ISmWxPayNotifyService.java similarity index 87% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/ISmWxPayNotifyService.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/service/ISmWxPayNotifyService.java index e41f9543..97c5accc 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/ISmWxPayNotifyService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/service/ISmWxPayNotifyService.java @@ -1,19 +1,20 @@ -package com.ruoyi.system.service; +package com.ruoyi.ss.wxPayNotify.service; + +import com.ruoyi.ss.wxPayNotify.domain.SmWxPayNotify; import java.util.List; -import com.ruoyi.system.domain.SmWxPayNotify; /** * 微信支付通知Service接口 - * + * * @author ruoyi * @date 2024-03-13 */ -public interface ISmWxPayNotifyService +public interface ISmWxPayNotifyService { /** * 查询微信支付通知 - * + * * @param notifyId 微信支付通知主键 * @return 微信支付通知 */ @@ -21,7 +22,7 @@ public interface ISmWxPayNotifyService /** * 查询微信支付通知列表 - * + * * @param smWxPayNotify 微信支付通知 * @return 微信支付通知集合 */ @@ -29,7 +30,7 @@ public interface ISmWxPayNotifyService /** * 新增微信支付通知 - * + * * @param smWxPayNotify 微信支付通知 * @return 结果 */ @@ -37,7 +38,7 @@ public interface ISmWxPayNotifyService /** * 修改微信支付通知 - * + * * @param smWxPayNotify 微信支付通知 * @return 结果 */ @@ -45,7 +46,7 @@ public interface ISmWxPayNotifyService /** * 批量删除微信支付通知 - * + * * @param notifyIds 需要删除的微信支付通知主键集合 * @return 结果 */ @@ -53,7 +54,7 @@ public interface ISmWxPayNotifyService /** * 删除微信支付通知信息 - * + * * @param notifyId 微信支付通知主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmWxPayNotifyServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/service/SmWxPayNotifyServiceImpl.java similarity index 89% rename from smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmWxPayNotifyServiceImpl.java rename to smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/service/SmWxPayNotifyServiceImpl.java index ed2940dc..8509b4fb 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/service/impl/SmWxPayNotifyServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/wxPayNotify/service/SmWxPayNotifyServiceImpl.java @@ -1,27 +1,27 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.ss.wxPayNotify.service; -import java.util.List; +import com.ruoyi.ss.wxPayNotify.domain.SmWxPayNotify; +import com.ruoyi.ss.wxPayNotify.mapper.SmWxPayNotifyMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SmWxPayNotifyMapper; -import com.ruoyi.system.domain.SmWxPayNotify; -import com.ruoyi.system.service.ISmWxPayNotifyService; + +import java.util.List; /** * 微信支付通知Service业务层处理 - * + * * @author ruoyi * @date 2024-03-13 */ @Service -public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService +public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService { @Autowired private SmWxPayNotifyMapper smWxPayNotifyMapper; /** * 查询微信支付通知 - * + * * @param notifyId 微信支付通知主键 * @return 微信支付通知 */ @@ -33,7 +33,7 @@ public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService /** * 查询微信支付通知列表 - * + * * @param smWxPayNotify 微信支付通知 * @return 微信支付通知 */ @@ -45,7 +45,7 @@ public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService /** * 新增微信支付通知 - * + * * @param smWxPayNotify 微信支付通知 * @return 结果 */ @@ -57,7 +57,7 @@ public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService /** * 修改微信支付通知 - * + * * @param smWxPayNotify 微信支付通知 * @return 结果 */ @@ -69,7 +69,7 @@ public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService /** * 批量删除微信支付通知 - * + * * @param notifyIds 需要删除的微信支付通知主键 * @return 结果 */ @@ -81,7 +81,7 @@ public class SmWxPayNotifyServiceImpl implements ISmWxPayNotifyService /** * 删除微信支付通知信息 - * + * * @param notifyId 微信支付通知主键 * @return 结果 */ diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/balancePeriod/BalancePeriodTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/balancePeriod/BalancePeriodTask.java similarity index 88% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/balancePeriod/BalancePeriodTask.java rename to smart-switch-service/src/main/java/com/ruoyi/task/balancePeriod/BalancePeriodTask.java index 3f3feaa2..a454152c 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/balancePeriod/BalancePeriodTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/balancePeriod/BalancePeriodTask.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.task.balancePeriod; +package com.ruoyi.task.balancePeriod; import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.service.ISmBalancePeriodService; +import com.ruoyi.ss.balancePeriod.service.ISmBalancePeriodService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillDelayed.java b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillDelayed.java similarity index 86% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillDelayed.java rename to smart-switch-service/src/main/java/com/ruoyi/task/bill/BillDelayed.java index f2b2e150..94b125a9 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillDelayed.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillDelayed.java @@ -1,11 +1,10 @@ -package com.ruoyi.system.task.bill; +package com.ruoyi.task.bill; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.service.ISmTransactionBillService; -import com.ruoyi.system.service.IWxPayService; -import com.ruoyi.system.service.impl.WxPayService; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; +import com.ruoyi.ss.wxPay.service.IWxPayService; +import com.ruoyi.ss.wxPay.service.WxPayService; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillDelayedManager.java b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillDelayedManager.java similarity index 96% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillDelayedManager.java rename to smart-switch-service/src/main/java/com/ruoyi/task/bill/BillDelayedManager.java index ffb959b2..251d97fe 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillDelayedManager.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillDelayedManager.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.task.bill; +package com.ruoyi.task.bill; -import com.ruoyi.system.service.ISmTransactionBillService; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillStartTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillStartTask.java similarity index 88% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillStartTask.java rename to smart-switch-service/src/main/java/com/ruoyi/task/bill/BillStartTask.java index b46982c8..1b54a4bc 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/BillStartTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillStartTask.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.task.bill; +package com.ruoyi.task.bill; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import com.ruoyi.system.service.ISmTransactionBillService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/PayTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/bill/PayTask.java similarity index 76% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/bill/PayTask.java rename to smart-switch-service/src/main/java/com/ruoyi/task/bill/PayTask.java index 15f1db11..c0504efd 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/bill/PayTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/bill/PayTask.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.task.bill; +package com.ruoyi.task.bill; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillType; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import com.ruoyi.system.service.ISmTransactionBillService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillType; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/businessRecord/BusinessRecordTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/businessRecord/BusinessRecordTask.java similarity index 81% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/businessRecord/BusinessRecordTask.java rename to smart-switch-service/src/main/java/com/ruoyi/task/businessRecord/BusinessRecordTask.java index d667da9e..8701455c 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/businessRecord/BusinessRecordTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/businessRecord/BusinessRecordTask.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.task.businessRecord; +package com.ruoyi.task.businessRecord; -import com.ruoyi.system.service.ISmBusinessRecordService; +import com.ruoyi.ss.businessRecord.service.ISmBusinessRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/device/DeviceTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceTask.java similarity index 82% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/device/DeviceTask.java rename to smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceTask.java index 28f555c3..ac2a8628 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/device/DeviceTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/device/DeviceTask.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.task.device; +package com.ruoyi.task.device; -import com.ruoyi.system.service.ISmDeviceService; -import com.ruoyi.system.service.ISmMeterReadingRecordService; +import com.ruoyi.ss.device.service.ISmDeviceService; +import com.ruoyi.ss.meterReadingRecord.service.ISmMeterReadingRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/task/device/deviceStartTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/device/deviceStartTask.java similarity index 85% rename from smart-switch-system/src/main/java/com/ruoyi/system/task/device/deviceStartTask.java rename to smart-switch-service/src/main/java/com/ruoyi/task/device/deviceStartTask.java index 38d78505..717ff252 100644 --- a/smart-switch-system/src/main/java/com/ruoyi/system/task/device/deviceStartTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/device/deviceStartTask.java @@ -1,8 +1,6 @@ -package com.ruoyi.system.task.device; +package com.ruoyi.task.device; -import com.ruoyi.system.service.ISmMeterReadingRecordService; -import com.ruoyi.system.task.bill.BillDelayed; -import javafx.application.Application; +import com.ruoyi.ss.meterReadingRecord.service.ISmMeterReadingRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmArticleDto.java b/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmArticleDto.java deleted file mode 100644 index dc1ac195..00000000 --- a/smart-switch-system/src/main/java/com/ruoyi/system/domain/dto/SmArticleDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.system.domain.dto; - -import com.ruoyi.system.domain.SmArticle; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author wjh - * 2024/4/3 - */ -@Data -public class SmArticleDto extends SmArticle { -} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/CurrentDataPointResponse.java b/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/CurrentDataPointResponse.java deleted file mode 100644 index 530a5aa4..00000000 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/CurrentDataPointResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.system.iot.domain.response; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.ruoyi.system.iot.domain.CurrentData; -import com.ruoyi.system.iot.domain.CurrentDeviceData; -import com.ruoyi.system.iot.domain.HistoryDeviceData; -import lombok.Data; - -import java.util.List; - -/** - * @author wjh - * 2024/3/20 - */ -@Data -public class CurrentDataPointResponse extends BaseResponse { - private CurrentData data; -} diff --git a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/HistoryDataPointResponse.java b/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/HistoryDataPointResponse.java deleted file mode 100644 index 04b34435..00000000 --- a/smart-switch-system/src/main/java/com/ruoyi/system/iot/domain/response/HistoryDataPointResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ruoyi.system.iot.domain.response; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.ruoyi.system.iot.domain.HistoryDeviceData; -import lombok.Data; - -@Data -public class HistoryDataPointResponse extends BaseResponse { - private HistoryDeviceData data; -} diff --git a/smart-switch-admin/pom.xml b/smart-switch-web/pom.xml similarity index 98% rename from smart-switch-admin/pom.xml rename to smart-switch-web/pom.xml index 8aac6592..3da58d69 100644 --- a/smart-switch-admin/pom.xml +++ b/smart-switch-web/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jar - smart-switch-admin + smart-switch-web web服务入口 diff --git a/smart-switch-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/smart-switch-web/src/main/java/com/ruoyi/RuoYiServletInitializer.java similarity index 85% rename from smart-switch-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to smart-switch-web/src/main/java/com/ruoyi/RuoYiServletInitializer.java index 6de67dc7..b0d4c6fa 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/smart-switch-web/src/main/java/com/ruoyi/RuoYiServletInitializer.java @@ -5,7 +5,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 - * + * * @author ruoyi */ public class RuoYiServletInitializer extends SpringBootServletInitializer @@ -13,6 +13,6 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(SmartSwitchApplication.class); } } diff --git a/smart-switch-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/smart-switch-web/src/main/java/com/ruoyi/SmartSwitchApplication.java similarity index 85% rename from smart-switch-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to smart-switch-web/src/main/java/com/ruoyi/SmartSwitchApplication.java index 32eb6f1d..f1c19f2b 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/smart-switch-web/src/main/java/com/ruoyi/SmartSwitchApplication.java @@ -1,21 +1,23 @@ package com.ruoyi; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 - * + * * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication +@MapperScan("com.ruoyi.**.mapper") +public class SmartSwitchApplication { public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); + SpringApplication.run(SmartSwitchApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java similarity index 84% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java index 9f5b30f9..e52ac6e1 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java @@ -4,12 +4,9 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.SmAccount; -import com.ruoyi.system.domain.bo.SmAccountBO; -import com.ruoyi.system.domain.dto.SmAccountDto; -import com.ruoyi.system.domain.enums.verificationCode.CodeBusinessType; -import com.ruoyi.system.service.ISmAccountService; +import com.ruoyi.ss.account.domain.SmAccountBO; +import com.ruoyi.ss.account.domain.SmAccountDto; +import com.ruoyi.ss.account.service.ISmAccountService; import com.ruoyi.system.service.IVerificationCodeService; import com.ruoyi.web.core.annotation.UserTypePermission; import io.swagger.annotations.ApiOperation; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java similarity index 83% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java index cf72c55f..14e40544 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppArticleController.java @@ -3,12 +3,11 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.dto.SmArticleClassifyDto; -import com.ruoyi.system.domain.dto.SmArticleDto; -import com.ruoyi.system.domain.enums.article.SystemClassify; -import com.ruoyi.system.service.ISmArticleClassifyService; -import com.ruoyi.system.service.ISmArticleService; -import io.swagger.annotations.ApiModelProperty; +import com.ruoyi.ss.articleClassify.domain.SmArticleClassifyDto; +import com.ruoyi.ss.article.domain.SmArticleDto; +import com.ruoyi.ss.article.domain.article.SystemClassify; +import com.ruoyi.ss.articleClassify.service.ISmArticleClassifyService; +import com.ruoyi.ss.article.service.ISmArticleService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppAuthController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAuthController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppAuthController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAuthController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java similarity index 90% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java index 67ff5ec7..f0db72b2 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppChannelController.java @@ -4,8 +4,7 @@ import com.fasterxml.jackson.annotation.JsonView; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.JsonViewProfile; -import com.ruoyi.system.service.ISmChannelService; -import io.swagger.annotations.ApiModelProperty; +import com.ruoyi.ss.channel.service.ISmChannelService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppComplaintController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppComplaintController.java similarity index 92% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppComplaintController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppComplaintController.java index cce70b9f..b36afde7 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppComplaintController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppComplaintController.java @@ -3,8 +3,8 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.system.domain.SmComplaint; -import com.ruoyi.system.service.ISmComplaintService; +import com.ruoyi.ss.complaint.domain.SmComplaint; +import com.ruoyi.ss.complaint.service.ISmComplaintService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppConfigController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppConfigController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppConfigController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppConfigController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java similarity index 90% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java index 184b11c3..d4628b1c 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java @@ -1,39 +1,29 @@ package com.ruoyi.web.controller.app; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.LoginType; import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.SmDevice; -import com.ruoyi.system.domain.dto.SmDeviceDto; -import com.ruoyi.system.domain.dto.SmMeterReadingRecordDto; -import com.ruoyi.system.domain.enums.device.DevicePowerStatus; -import com.ruoyi.system.domain.vo.SmDeviceVo; -import com.ruoyi.system.service.ISmDeviceService; -import com.ruoyi.system.service.ISmMeterReadingRecordService; -import com.ruoyi.system.service.impl.SmDeviceServiceImpl; +import com.ruoyi.ss.device.domain.SmDevice; +import com.ruoyi.ss.device.domain.SmDeviceDto; +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecordDto; +import com.ruoyi.ss.device.domain.enums.DevicePowerStatus; +import com.ruoyi.ss.device.domain.SmDeviceVo; +import com.ruoyi.ss.device.service.ISmDeviceService; +import com.ruoyi.ss.meterReadingRecord.service.ISmMeterReadingRecordService; import com.ruoyi.web.core.annotation.UserTypePermission; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.Collections; -import java.util.List; /** * 设备Controller diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceGroupController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceGroupController.java similarity index 94% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceGroupController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceGroupController.java index 0a1a3dda..87253a34 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppDeviceGroupController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceGroupController.java @@ -5,9 +5,9 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.UserType; -import com.ruoyi.system.domain.SmDeviceGroup; -import com.ruoyi.system.domain.vo.SmDeviceGroupVo; -import com.ruoyi.system.service.ISmDeviceGroupService; +import com.ruoyi.ss.deviceGroup.domain.SmDeviceGroup; +import com.ruoyi.ss.deviceGroup.domain.SmDeviceGroupVo; +import com.ruoyi.ss.deviceGroup.service.ISmDeviceGroupService; import com.ruoyi.web.core.annotation.UserTypePermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppPayController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppPayController.java similarity index 93% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppPayController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppPayController.java index 62cda6eb..cbfa7d88 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppPayController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppPayController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.service.ISmTransactionBillService; -import com.ruoyi.system.service.IWxPayService; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; +import com.ruoyi.ss.wxPay.service.IWxPayService; import com.wechat.pay.java.core.exception.ValidationException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,8 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import static com.ruoyi.common.utils.SecurityUtils.getUserId; - /** * @author 辉 * 2024/3/11 diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppResetRecordController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppResetRecordController.java similarity index 90% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppResetRecordController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppResetRecordController.java index f99f0b17..06edfdc8 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppResetRecordController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppResetRecordController.java @@ -3,8 +3,8 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.UserType; -import com.ruoyi.system.domain.dto.SmResetRecordDto; -import com.ruoyi.system.service.ISmResetRecordService; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordDto; +import com.ruoyi.ss.resetRecord.service.ISmResetRecordService; import com.ruoyi.web.core.annotation.UserTypePermission; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java similarity index 91% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java index 10dd3ad1..19bf6bd5 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java @@ -6,15 +6,15 @@ import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.domain.bo.SmTransactionBillBO; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillGroupBy; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillType; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import com.ruoyi.system.domain.vo.dashboard.BillCountVo; -import com.ruoyi.system.service.ISmTransactionBillService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillBO; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillGroupBy; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillType; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; +import com.ruoyi.ss.dashboard.BillCountVo; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; import com.ruoyi.web.core.annotation.UserTypePermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppUserController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java similarity index 87% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppUserController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java index 6840991b..8698ec01 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/app/AppUserController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppUserController.java @@ -2,15 +2,12 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.sms.SmsUtil; import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.bo.SmUserBO; +import com.ruoyi.ss.user.domain.SmUserBO; import com.ruoyi.system.domain.enums.verificationCode.CodeBusinessType; -import com.ruoyi.system.domain.vo.SmUserVo; -import com.ruoyi.system.service.ISmUserService; +import com.ruoyi.ss.user.domain.SmUserVo; +import com.ruoyi.ss.user.service.ISmUserService; import com.ruoyi.system.service.IVerificationCodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/common/CommonController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/common/CommonController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmArticleClassifyController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmArticleClassifyController.java similarity index 97% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmArticleClassifyController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmArticleClassifyController.java index b4bbfe2c..ceb7b544 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmArticleClassifyController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmArticleClassifyController.java @@ -7,8 +7,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SmArticleClassify; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.dto.SmArticleClassifyDto; -import com.ruoyi.system.service.ISmArticleClassifyService; +import com.ruoyi.ss.articleClassify.domain.SmArticleClassifyDto; +import com.ruoyi.ss.articleClassify.service.ISmArticleClassifyService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmArticleController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmArticleController.java similarity index 91% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmArticleController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmArticleController.java index 43212d74..5333ac73 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmArticleController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmArticleController.java @@ -3,15 +3,14 @@ package com.ruoyi.web.controller.system; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SmArticleClassify; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SmArticle; -import com.ruoyi.system.domain.dto.SmArticleClassifyDto; -import com.ruoyi.system.domain.dto.SmArticleDto; -import com.ruoyi.system.service.ISmArticleClassifyService; -import com.ruoyi.system.service.ISmArticleService; +import com.ruoyi.ss.article.domain.SmArticle; +import com.ruoyi.ss.articleClassify.domain.SmArticleClassifyDto; +import com.ruoyi.ss.article.domain.SmArticleDto; +import com.ruoyi.ss.articleClassify.service.ISmArticleClassifyService; +import com.ruoyi.ss.article.service.ISmArticleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java similarity index 92% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java index ec781ca8..56fae5fe 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmChannelController.java @@ -3,8 +3,6 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.fasterxml.jackson.annotation.JsonView; -import com.ruoyi.common.core.domain.JsonViewProfile; import com.ruoyi.common.core.domain.ValidGroup; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +10,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,14 +18,14 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmChannel; -import com.ruoyi.system.service.ISmChannelService; +import com.ruoyi.ss.channel.domain.SmChannel; +import com.ruoyi.ss.channel.service.ISmChannelService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 充值渠道Controller - * + * * @author ruoyi * @date 2024-04-15 */ diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmComplaintController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmComplaintController.java similarity index 93% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmComplaintController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmComplaintController.java index 2a8ff084..85baa395 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmComplaintController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmComplaintController.java @@ -3,8 +3,8 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.dto.SmComplaintDto; -import com.ruoyi.system.domain.vo.SmComplaintVo; +import com.ruoyi.ss.complaint.domain.SmComplaintDto; +import com.ruoyi.ss.complaint.domain.SmComplaintVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -19,14 +19,14 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmComplaint; -import com.ruoyi.system.service.ISmComplaintService; +import com.ruoyi.ss.complaint.domain.SmComplaint; +import com.ruoyi.ss.complaint.service.ISmComplaintService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 投诉Controller - * + * * @author ruoyi * @date 2024-03-02 */ diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDashboardController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDashboardController.java similarity index 72% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDashboardController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDashboardController.java index d0a8f9ef..6308173e 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDashboardController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDashboardController.java @@ -1,24 +1,18 @@ package com.ruoyi.web.controller.system; -import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.ValidGroup; import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.core.redis.enums.RedisCacheKey; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.system.domain.SmBalancePeriod; -import com.ruoyi.system.domain.SmBusinessRecord; -import com.ruoyi.system.domain.dto.*; -import com.ruoyi.system.domain.enums.device.DeviceOnlineStatus; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillGroupBy; -import com.ruoyi.system.domain.enums.transactionBill.TransactionBillStatus; -import com.ruoyi.system.domain.vo.SmBusinessRecordVo; -import com.ruoyi.system.domain.vo.dashboard.BillCountVo; -import com.ruoyi.system.domain.vo.dashboard.BriefVo; -import com.ruoyi.system.service.*; +import com.ruoyi.ss.balancePeriod.domain.SmBalancePeriodDto; +import com.ruoyi.ss.balancePeriod.service.ISmBalancePeriodService; +import com.ruoyi.ss.businessRecord.service.ISmBusinessRecordService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillGroupBy; +import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus; +import com.ruoyi.ss.businessRecord.domain.SmBusinessRecordVo; +import com.ruoyi.ss.dashboard.BriefVo; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -26,10 +20,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDateTime; import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; /** * 报表Controller diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceBindRecordController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceBindRecordController.java similarity index 89% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceBindRecordController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceBindRecordController.java index 6e24e624..1ed9e7c6 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceBindRecordController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceBindRecordController.java @@ -6,24 +6,21 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmDeviceBindRecord; -import com.ruoyi.system.service.ISmDeviceBindRecordService; +import com.ruoyi.ss.deviceBindRecord.domain.SmDeviceBindRecord; +import com.ruoyi.ss.deviceBindRecord.service.ISmDeviceBindRecordService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 设备绑定记录Controller - * + * * @author ruoyi * @date 2024-04-17 */ diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceController.java similarity index 93% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceController.java index d8b9f406..62b7f485 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceController.java @@ -6,10 +6,9 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.system.assembler.DeviceAssembler; -import com.ruoyi.system.domain.dto.SmDeviceDto; -import com.ruoyi.system.domain.vo.SmDeviceVo; -import com.ruoyi.system.service.ISmDeviceGroupService; +import com.ruoyi.ss.device.service.DeviceAssembler; +import com.ruoyi.ss.device.domain.SmDeviceDto; +import com.ruoyi.ss.device.domain.SmDeviceVo; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.security.access.prepost.PreAuthorize; @@ -27,8 +26,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmDevice; -import com.ruoyi.system.service.ISmDeviceService; +import com.ruoyi.ss.device.domain.SmDevice; +import com.ruoyi.ss.device.service.ISmDeviceService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceGroupController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceGroupController.java similarity index 95% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceGroupController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceGroupController.java index a44743ca..22208a97 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmDeviceGroupController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmDeviceGroupController.java @@ -3,7 +3,7 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.vo.SmDeviceGroupVo; +import com.ruoyi.ss.deviceGroup.domain.SmDeviceGroupVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -18,8 +18,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmDeviceGroup; -import com.ruoyi.system.service.ISmDeviceGroupService; +import com.ruoyi.ss.deviceGroup.domain.SmDeviceGroup; +import com.ruoyi.ss.deviceGroup.service.ISmDeviceGroupService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmMeterReadingRecordController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmMeterReadingRecordController.java similarity index 94% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmMeterReadingRecordController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmMeterReadingRecordController.java index 0fc40a0c..e90da77c 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmMeterReadingRecordController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmMeterReadingRecordController.java @@ -4,8 +4,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.system.domain.dto.SmMeterReadingRecordDto; -import com.ruoyi.system.domain.vo.SmMeterReadingRecordVo; +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecordDto; +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecordVo; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -22,14 +22,14 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmMeterReadingRecord; -import com.ruoyi.system.service.ISmMeterReadingRecordService; +import com.ruoyi.ss.meterReadingRecord.domain.SmMeterReadingRecord; +import com.ruoyi.ss.meterReadingRecord.service.ISmMeterReadingRecordService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 抄表记录Controller - * + * * @author ruoyi * @date 2024-03-28 */ diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmModelController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmModelController.java similarity index 95% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmModelController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmModelController.java index 2005e5c9..304fa28b 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmModelController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmModelController.java @@ -4,8 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.dto.SmModelDto; -import com.ruoyi.system.domain.vo.SmModelVo; +import com.ruoyi.ss.model.domain.SmModelDto; +import com.ruoyi.ss.model.domain.SmModelVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -20,8 +20,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmModel; -import com.ruoyi.system.service.ISmModelService; +import com.ruoyi.ss.model.domain.SmModel; +import com.ruoyi.ss.model.service.ISmModelService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmResetRecordController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmResetRecordController.java similarity index 85% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmResetRecordController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmResetRecordController.java index e7a8e83e..3986d39f 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmResetRecordController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmResetRecordController.java @@ -3,30 +3,26 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.dto.SmResetRecordDto; -import com.ruoyi.system.domain.vo.SmResetRecordVo; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordDto; +import com.ruoyi.ss.resetRecord.domain.SmResetRecordVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmResetRecord; -import com.ruoyi.system.service.ISmResetRecordService; +import com.ruoyi.ss.resetRecord.service.ISmResetRecordService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 归零记录Controller - * + * * @author ruoyi * @date 2024-04-17 */ diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmTransactionBillController.java similarity index 94% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmTransactionBillController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmTransactionBillController.java index 2b52dce7..73c81025 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmTransactionBillController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmTransactionBillController.java @@ -4,10 +4,9 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.bo.SmTransactionBillBO; -import com.ruoyi.system.domain.dto.SmTransactionBillDto; -import com.ruoyi.system.domain.vo.SmTransactionBillVo; -import io.swagger.annotations.ApiModel; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillBO; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillDto; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBillVo; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -24,8 +23,8 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SmTransactionBill; -import com.ruoyi.system.service.ISmTransactionBillService; +import com.ruoyi.ss.transactionBill.domain.SmTransactionBill; +import com.ruoyi.ss.transactionBill.service.ISmTransactionBillService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmUserController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmUserController.java similarity index 94% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmUserController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmUserController.java index f8250088..3289b24a 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SmUserController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SmUserController.java @@ -3,9 +3,8 @@ package com.ruoyi.web.controller.system; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.system.domain.dto.SmUserDto; -import com.ruoyi.system.domain.vo.SmUserVo; -import io.swagger.annotations.ApiOperation; +import com.ruoyi.ss.user.domain.SmUserDto; +import com.ruoyi.ss.user.domain.SmUserVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +20,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.core.domain.entity.SmUser; -import com.ruoyi.system.service.ISmUserService; +import com.ruoyi.ss.user.service.ISmUserService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysPostController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysPostController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java similarity index 97% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index fe192492..4d2f3809 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -13,7 +13,7 @@ import com.ruoyi.system.service.ISysConfigService; /** * 注册验证 - * + * * @author ruoyi */ @RestController @@ -28,7 +28,7 @@ public class SysRegisterController extends BaseController @PostMapping("/register") public AjaxResult register(@RequestBody RegisterBody user) { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + if (!("true".equals(configService.selectConfigByKey("sys.enums.registerUser")))) { return error("当前系统没有开启注册功能！"); } diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysUserController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/system/SysUserController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/tool/TestController.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to smart-switch-web/src/main/java/com/ruoyi/web/controller/tool/TestController.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/core/annotation/UserTypePermission.java b/smart-switch-web/src/main/java/com/ruoyi/web/core/annotation/UserTypePermission.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/core/annotation/UserTypePermission.java rename to smart-switch-web/src/main/java/com/ruoyi/web/core/annotation/UserTypePermission.java diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/core/aspectj/UserTypePermissionAspect.java b/smart-switch-web/src/main/java/com/ruoyi/web/core/aspectj/UserTypePermissionAspect.java similarity index 83% rename from smart-switch-admin/src/main/java/com/ruoyi/web/core/aspectj/UserTypePermissionAspect.java rename to smart-switch-web/src/main/java/com/ruoyi/web/core/aspectj/UserTypePermissionAspect.java index c1f40b4a..a764576e 100644 --- a/smart-switch-admin/src/main/java/com/ruoyi/web/core/aspectj/UserTypePermissionAspect.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/core/aspectj/UserTypePermissionAspect.java @@ -1,18 +1,14 @@ package com.ruoyi.web.core.aspectj; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; -import com.ruoyi.system.domain.vo.SmUserVo; -import com.ruoyi.system.service.ISmUserService; +import com.ruoyi.ss.user.domain.SmUserVo; +import com.ruoyi.ss.user.service.ISmUserService; import com.ruoyi.web.core.annotation.UserTypePermission; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/smart-switch-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/smart-switch-web/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java similarity index 100% rename from smart-switch-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to smart-switch-web/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java diff --git a/smart-switch-admin/src/main/resources/META-INF/spring-devtools.properties b/smart-switch-web/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from smart-switch-admin/src/main/resources/META-INF/spring-devtools.properties rename to smart-switch-web/src/main/resources/META-INF/spring-devtools.properties diff --git a/smart-switch-admin/src/main/resources/application-dev.yml b/smart-switch-web/src/main/resources/application-dev.yml similarity index 89% rename from smart-switch-admin/src/main/resources/application-dev.yml rename to smart-switch-web/src/main/resources/application-dev.yml index 38536f5d..04b85508 100644 --- a/smart-switch-admin/src/main/resources/application-dev.yml +++ b/smart-switch-web/src/main/resources/application-dev.yml @@ -22,11 +22,11 @@ wx: # 通知回调地址 notifyUrl: http://124.221.246.124:2288/app/pay/notify/wx # 内网穿透 # 密钥所在位置 - privateKeyPath: C:/project/dianbiao/wxpay/apiclient_key.pem + privateKeyPath: H:/project/创特/证书/wxpay/apiclient_key.pem # 证书序列号 merchantSerialNumber: 66910F800A60768020F07D39A56AE701574A16AE # 设备配置 device: # 项目启动时抄表 - startRecord: false \ No newline at end of file + startRecord: false diff --git a/smart-switch-admin/src/main/resources/application-druid.yml b/smart-switch-web/src/main/resources/application-druid.yml similarity index 100% rename from smart-switch-admin/src/main/resources/application-druid.yml rename to smart-switch-web/src/main/resources/application-druid.yml diff --git a/smart-switch-admin/src/main/resources/application-test.yml b/smart-switch-web/src/main/resources/application-test.yml similarity index 100% rename from smart-switch-admin/src/main/resources/application-test.yml rename to smart-switch-web/src/main/resources/application-test.yml diff --git a/smart-switch-admin/src/main/resources/application.yml b/smart-switch-web/src/main/resources/application.yml similarity index 99% rename from smart-switch-admin/src/main/resources/application.yml rename to smart-switch-web/src/main/resources/application.yml index d7fe34e9..02e96a2b 100644 --- a/smart-switch-admin/src/main/resources/application.yml +++ b/smart-switch-web/src/main/resources/application.yml @@ -86,7 +86,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 10002 servlet: # 应用的访问路径 context-path: / @@ -196,4 +196,4 @@ sm: # 提现配置 withdraw: password: - enable: false \ No newline at end of file + enable: false diff --git a/smart-switch-admin/src/main/resources/banner.txt b/smart-switch-web/src/main/resources/banner.txt similarity index 100% rename from smart-switch-admin/src/main/resources/banner.txt rename to smart-switch-web/src/main/resources/banner.txt diff --git a/smart-switch-admin/src/main/resources/i18n/messages.properties b/smart-switch-web/src/main/resources/i18n/messages.properties similarity index 100% rename from smart-switch-admin/src/main/resources/i18n/messages.properties rename to smart-switch-web/src/main/resources/i18n/messages.properties diff --git a/smart-switch-admin/src/main/resources/logback.xml b/smart-switch-web/src/main/resources/logback.xml similarity index 100% rename from smart-switch-admin/src/main/resources/logback.xml rename to smart-switch-web/src/main/resources/logback.xml diff --git a/smart-switch-admin/src/main/resources/mybatis/mybatis-config.xml b/smart-switch-web/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from smart-switch-admin/src/main/resources/mybatis/mybatis-config.xml rename to smart-switch-web/src/main/resources/mybatis/mybatis-config.xml