diff --git a/CHANGELOG.md b/CHANGELOG.md index e2ef40e..9a27d77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -310,9 +310,9 @@ ### 💥 破坏性变更 -- 适配 wms-starter 2.0.0，top.charles7c.wms.starter => top.wms.starter ([f5ab22e](https://github.com/wms-org/wms-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) +- 适配 wms-starter 2.0.0，top.charles7c.wms.starter => top.mes.starter ([f5ab22e](https://github.com/wms-org/wms-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) - 移除 monitor 模块 ([b6206a3](https://github.com/wms-org/wms-admin/commit/b6206a334671894306043f86ec07d7c045cd757d)) -- top.charles7c.wms.admin => top.wms.admin ([08eeabc](https://github.com/wms-org/wms-admin/commit/08eeabc47d58db3cfc861a3a527e52bf89f6183b)) +- top.charles7c.wms.admin => top.mes.admin ([08eeabc](https://github.com/wms-org/wms-admin/commit/08eeabc47d58db3cfc861a3a527e52bf89f6183b)) - 公告管理 Announcement => Notice ([dbe93df](https://github.com/wms-org/wms-admin/commit/dbe93df8bcec0b7dfb24fbd92f35928a3156f4e5)) ### 📦 依赖升级 diff --git a/README.md b/README.md index 8eb2c32..5d01c2f 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ ContiNew Admin（Continue New Admin）持续迭代优化的前后端分离中后 1.**甄选技术栈：** ContiNew（Continue New） 项目致力于持续迭代优化，让技术不掉队。在技术选型时，进行深度广泛地调研，从流行度、成熟度和发展潜力等多方面甄选技术栈。 -2.**Starter 组件：** 从 v2.1.0 版本开始，抽取并封装后端基础组件及各框架集成配置到 ContiNew Starter 项目，且 **[已发布至 Maven 中央仓库](https://central.sonatype.com/search?q=wms-starter&namespace=top.wms)**，可在你的任意项目中直接引入所需依赖使用。即使你不用脚手架项目，难道能让你搭项目框架更快、更爽、更省力的 Starter 也要 Say No 吗？ +2.**Starter 组件：** 从 v2.1.0 版本开始，抽取并封装后端基础组件及各框架集成配置到 ContiNew Starter 项目，且 **[已发布至 Maven 中央仓库](https://central.sonatype.com/search?q=wms-starter&namespace=top.mes)**，可在你的任意项目中直接引入所需依赖使用。即使你不用脚手架项目，难道能让你搭项目框架更快、更爽、更省力的 Starter 也要 Say No 吗？ 3.**CRUD 套件：** 封装通用增删改查套件，适配后端各分层，几分钟即可提供一套 CRUD API，包括新增、修改、批量删除、查询详情、分页列表查询、全部列表查询、树型列表查询、导出到 Excel，且 API 支持按实际所需开放或扩展。 diff --git a/mes-common/pom.xml b/mes-common/pom.xml index ac576d2..84ccf1f 100644 --- a/mes-common/pom.xml +++ b/mes-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.wms - wms-admin + top.mes + mes-admin ${revision} - wms-common + mes-common 公共模块（存放公共工具类，公共配置等） diff --git a/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalAuthenticationCustomizer.java b/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalAuthenticationCustomizer.java index 80987ca..48964cd 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalAuthenticationCustomizer.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalAuthenticationCustomizer.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.doc; +package top.mes.admin.common.config.doc; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.map.MapUtil; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalDescriptionCustomizer.java b/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalDescriptionCustomizer.java index d9f977f..bab6333 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalDescriptionCustomizer.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalDescriptionCustomizer.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.doc; +package top.mes.admin.common.config.doc; import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.models.Operation; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/doc/OperationDescriptionCustomizer.java b/mes-common/src/main/java/top/mes/admin/common/config/doc/OperationDescriptionCustomizer.java index 256fabb..335b093 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/doc/OperationDescriptionCustomizer.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/doc/OperationDescriptionCustomizer.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.doc; +package top.mes.admin.common.config.doc; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalExceptionHandler.java b/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalExceptionHandler.java index 93911df..d53eb0b 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalExceptionHandler.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.exception; +package top.mes.admin.common.config.exception; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.CharSequenceUtil; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalSaTokenExceptionHandler.java b/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalSaTokenExceptionHandler.java index 2841060..54aefba 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalSaTokenExceptionHandler.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalSaTokenExceptionHandler.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.exception; +package top.mes.admin.common.config.exception; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/BCryptEncryptor.java b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/BCryptEncryptor.java index 3daa847..1d0b111 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/BCryptEncryptor.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/BCryptEncryptor.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.mybatis; +package top.mes.admin.common.config.mybatis; import org.springframework.security.crypto.password.PasswordEncoder; import top.continew.starter.security.crypto.encryptor.IEncryptor; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DataPermissionMapper.java b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DataPermissionMapper.java index 2f208b1..7bc3903 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DataPermissionMapper.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DataPermissionMapper.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.mybatis; +package top.mes.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java index 02d104d..17420c8 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java @@ -1,7 +1,7 @@ -package top.wms.admin.common.config.mybatis; +package top.mes.admin.common.config.mybatis; import cn.hutool.core.convert.Convert; -import top.wms.admin.common.context.UserContextHolder; +import top.mes.admin.common.context.UserContextHolder; import top.continew.starter.extension.datapermission.enums.DataScope; import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider; import top.continew.starter.extension.datapermission.model.RoleContext; @@ -24,7 +24,7 @@ public class DefaultDataPermissionUserContextProvider implements DataPermissionU @Override public UserContext getUserContext() { - top.wms.admin.common.context.UserContext context = UserContextHolder.getContext(); + top.mes.admin.common.context.UserContext context = UserContextHolder.getContext(); UserContext userContext = new UserContext(); userContext.setUserId(Convert.toStr(context.getId())); userContext.setDeptId(Convert.toStr(context.getDeptId())); diff --git a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index e925383..7a89c8f 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -1,10 +1,10 @@ -package top.wms.admin.common.config.mybatis; +package top.mes.admin.common.config.mybatis; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.model.entity.BaseDO; import java.time.LocalDateTime; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MybatisPlusConfiguration.java b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MybatisPlusConfiguration.java index 0b4da14..76c02ee 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MybatisPlusConfiguration.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.mybatis; +package top.mes.admin.common.config.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.springframework.context.annotation.Bean; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/properties/CaptchaProperties.java b/mes-common/src/main/java/top/mes/admin/common/config/properties/CaptchaProperties.java index 2ace23c..3e15431 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/properties/CaptchaProperties.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/properties/CaptchaProperties.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.properties; +package top.mes.admin.common.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/properties/RsaProperties.java b/mes-common/src/main/java/top/mes/admin/common/config/properties/RsaProperties.java index 5e6391c..4b0f027 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/properties/RsaProperties.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/properties/RsaProperties.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.properties; +package top.mes.admin.common.config.properties; import cn.hutool.extra.spring.SpringUtil; diff --git a/mes-common/src/main/java/top/mes/admin/common/config/websocket/WebSocketClientServiceImpl.java b/mes-common/src/main/java/top/mes/admin/common/config/websocket/WebSocketClientServiceImpl.java index 9156b9c..d7e95fa 100644 --- a/mes-common/src/main/java/top/mes/admin/common/config/websocket/WebSocketClientServiceImpl.java +++ b/mes-common/src/main/java/top/mes/admin/common/config/websocket/WebSocketClientServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.config.websocket; +package top.mes.admin.common.config.websocket; import cn.dev33.satoken.stp.StpUtil; import jakarta.servlet.http.HttpServletRequest; diff --git a/mes-common/src/main/java/top/mes/admin/common/constant/CacheConstants.java b/mes-common/src/main/java/top/mes/admin/common/constant/CacheConstants.java index 0f68752..b509c02 100644 --- a/mes-common/src/main/java/top/mes/admin/common/constant/CacheConstants.java +++ b/mes-common/src/main/java/top/mes/admin/common/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.constant; +package top.mes.admin.common.constant; import top.continew.starter.core.constant.StringConstants; diff --git a/mes-common/src/main/java/top/mes/admin/common/constant/Constants.java b/mes-common/src/main/java/top/mes/admin/common/constant/Constants.java index a95b92f..aabb3be 100644 --- a/mes-common/src/main/java/top/mes/admin/common/constant/Constants.java +++ b/mes-common/src/main/java/top/mes/admin/common/constant/Constants.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.constant; +package top.mes.admin.common.constant; /** * 通用常量信息 diff --git a/mes-common/src/main/java/top/mes/admin/common/constant/ContainerConstants.java b/mes-common/src/main/java/top/mes/admin/common/constant/ContainerConstants.java index 2dd92eb..4e3fea6 100644 --- a/mes-common/src/main/java/top/mes/admin/common/constant/ContainerConstants.java +++ b/mes-common/src/main/java/top/mes/admin/common/constant/ContainerConstants.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.constant; +package top.mes.admin.common.constant; /** * 数据源容器相关常量（Crane4j 数据填充组件使用） diff --git a/mes-common/src/main/java/top/mes/admin/common/constant/RegexConstants.java b/mes-common/src/main/java/top/mes/admin/common/constant/RegexConstants.java index a9dc00f..fccf54d 100644 --- a/mes-common/src/main/java/top/mes/admin/common/constant/RegexConstants.java +++ b/mes-common/src/main/java/top/mes/admin/common/constant/RegexConstants.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.constant; +package top.mes.admin.common.constant; /** * 正则相关常量 diff --git a/mes-common/src/main/java/top/mes/admin/common/constant/SysConstants.java b/mes-common/src/main/java/top/mes/admin/common/constant/SysConstants.java index 43e85d5..7c4ac83 100644 --- a/mes-common/src/main/java/top/mes/admin/common/constant/SysConstants.java +++ b/mes-common/src/main/java/top/mes/admin/common/constant/SysConstants.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.constant; +package top.mes.admin.common.constant; /** * 系统相关常量 diff --git a/mes-common/src/main/java/top/mes/admin/common/constant/UiConstants.java b/mes-common/src/main/java/top/mes/admin/common/constant/UiConstants.java index 1612b01..1535f4b 100644 --- a/mes-common/src/main/java/top/mes/admin/common/constant/UiConstants.java +++ b/mes-common/src/main/java/top/mes/admin/common/constant/UiConstants.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.constant; +package top.mes.admin.common.constant; /** * UI 相关常量 diff --git a/mes-common/src/main/java/top/mes/admin/common/context/RoleContext.java b/mes-common/src/main/java/top/mes/admin/common/context/RoleContext.java index c2763a7..5688603 100644 --- a/mes-common/src/main/java/top/mes/admin/common/context/RoleContext.java +++ b/mes-common/src/main/java/top/mes/admin/common/context/RoleContext.java @@ -1,8 +1,8 @@ -package top.wms.admin.common.context; +package top.mes.admin.common.context; import lombok.Data; import lombok.NoArgsConstructor; -import top.wms.admin.common.enums.DataScopeEnum; +import top.mes.admin.common.enums.DataScopeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-common/src/main/java/top/mes/admin/common/context/UserContext.java b/mes-common/src/main/java/top/mes/admin/common/context/UserContext.java index 5bcd49c..aad2c96 100644 --- a/mes-common/src/main/java/top/mes/admin/common/context/UserContext.java +++ b/mes-common/src/main/java/top/mes/admin/common/context/UserContext.java @@ -1,9 +1,9 @@ -package top.wms.admin.common.context; +package top.mes.admin.common.context; import cn.hutool.core.collection.CollUtil; import lombok.Data; import lombok.NoArgsConstructor; -import top.wms.admin.common.constant.SysConstants; +import top.mes.admin.common.constant.SysConstants; import java.io.Serial; import java.io.Serializable; diff --git a/mes-common/src/main/java/top/mes/admin/common/context/UserContextHolder.java b/mes-common/src/main/java/top/mes/admin/common/context/UserContextHolder.java index c8cba13..0ece246 100644 --- a/mes-common/src/main/java/top/mes/admin/common/context/UserContextHolder.java +++ b/mes-common/src/main/java/top/mes/admin/common/context/UserContextHolder.java @@ -1,10 +1,10 @@ -package top.wms.admin.common.context; +package top.mes.admin.common.context; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; import cn.hutool.extra.spring.SpringUtil; -import top.wms.admin.common.service.CommonUserService; +import top.mes.admin.common.service.CommonUserService; import top.continew.starter.core.util.ExceptionUtils; /** diff --git a/mes-common/src/main/java/top/mes/admin/common/context/UserExtraContext.java b/mes-common/src/main/java/top/mes/admin/common/context/UserExtraContext.java index 1bda77a..ee055cb 100644 --- a/mes-common/src/main/java/top/mes/admin/common/context/UserExtraContext.java +++ b/mes-common/src/main/java/top/mes/admin/common/context/UserExtraContext.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.context; +package top.mes.admin.common.context; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.JakartaServletUtil; diff --git a/mes-common/src/main/java/top/mes/admin/common/controller/BaseController.java b/mes-common/src/main/java/top/mes/admin/common/controller/BaseController.java index 238c494..4b7e2e4 100644 --- a/mes-common/src/main/java/top/mes/admin/common/controller/BaseController.java +++ b/mes-common/src/main/java/top/mes/admin/common/controller/BaseController.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.controller; +package top.mes.admin.common.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.context.SaHolder; diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/CommandTypeEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/CommandTypeEnum.java index 09af9a9..cf56e0c 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/CommandTypeEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/CommandTypeEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; /** * DPA6024V-2T-1.0 数字控制器命令类型枚举 diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/CommonExceptionEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/CommonExceptionEnum.java index 0b83477..519c65d 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/CommonExceptionEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/CommonExceptionEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; public enum CommonExceptionEnum { RULE_ERROR(1000, "您所所在得部门所属规则未绑定设备"), REQUEST_ERROR(1001, "请求异常"), PEOPLE_ERROR(1002, "您的信息未录入"), diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/DataScopeEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/DataScopeEnum.java index 774081f..9a66dba 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/DataScopeEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/DataScopeEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/DisEnableStatusEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/DisEnableStatusEnum.java index 37d193f..e5e4bc6 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/DisEnableStatusEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/DisEnableStatusEnum.java @@ -1,8 +1,8 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.wms.admin.common.constant.UiConstants; +import top.mes.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/GenderEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/GenderEnum.java index 9a3e20a..1ca2b27 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/GenderEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/SuccessFailureStatusEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/SuccessFailureStatusEnum.java index 47af52f..49e2835 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/SuccessFailureStatusEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/SuccessFailureStatusEnum.java @@ -1,8 +1,8 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.wms.admin.common.constant.UiConstants; +import top.mes.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/mes-common/src/main/java/top/mes/admin/common/enums/YesNoEnum.java b/mes-common/src/main/java/top/mes/admin/common/enums/YesNoEnum.java index 3585d28..de8722c 100644 --- a/mes-common/src/main/java/top/mes/admin/common/enums/YesNoEnum.java +++ b/mes-common/src/main/java/top/mes/admin/common/enums/YesNoEnum.java @@ -1,9 +1,9 @@ -package top.wms.admin.common.enums; +package top.mes.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; import top.continew.starter.core.enums.BaseEnum; -import top.wms.admin.common.constant.UiConstants; +import top.mes.admin.common.constant.UiConstants; /** * 成功/失败状态枚举 diff --git a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseCreateDO.java b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseCreateDO.java index bcef4b0..2f86fd2 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseCreateDO.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseCreateDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.entity; +package top.mes.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseDO.java b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseDO.java index f50415b..2b1f45e 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseDO.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.entity; +package top.mes.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseStrIdDO.java b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseStrIdDO.java index dd433f3..d1614aa 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseStrIdDO.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseStrIdDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.entity; +package top.mes.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseUpdateDO.java b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseUpdateDO.java index 00fa7b6..3d1f270 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseUpdateDO.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/entity/BaseUpdateDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.entity; +package top.mes.admin.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/req/CommonStatusUpdateReq.java b/mes-common/src/main/java/top/mes/admin/common/model/req/CommonStatusUpdateReq.java index 36fa00d..0692bd1 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/req/CommonStatusUpdateReq.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/req/CommonStatusUpdateReq.java @@ -1,9 +1,9 @@ -package top.wms.admin.common.model.req; +package top.mes.admin.common.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serializable; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseDetailResp.java b/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseDetailResp.java index f477796..bf0a8d9 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseDetailResp.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseDetailResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.resp; +package top.mes.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -7,7 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.ContainerConstants; import java.io.Serial; import java.time.LocalDateTime; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseResp.java b/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseResp.java index 16a9cf3..78e9673 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseResp.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.resp; +package top.mes.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseStrIdResp.java b/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseStrIdResp.java index 044e0ba..58bf902 100644 --- a/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseStrIdResp.java +++ b/mes-common/src/main/java/top/mes/admin/common/model/resp/BaseStrIdResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.model.resp; +package top.mes.admin.common.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/mes-common/src/main/java/top/mes/admin/common/service/CommonUserService.java b/mes-common/src/main/java/top/mes/admin/common/service/CommonUserService.java index 018d17f..9b0a87c 100644 --- a/mes-common/src/main/java/top/mes/admin/common/service/CommonUserService.java +++ b/mes-common/src/main/java/top/mes/admin/common/service/CommonUserService.java @@ -1,8 +1,8 @@ -package top.wms.admin.common.service; +package top.mes.admin.common.service; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; -import top.wms.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.ContainerConstants; /** * 公共用户业务接口 diff --git a/mes-common/src/main/java/top/mes/admin/common/util/ImageToBase64Utils.java b/mes-common/src/main/java/top/mes/admin/common/util/ImageToBase64Utils.java index 99f9b2f..9f2e629 100644 --- a/mes-common/src/main/java/top/mes/admin/common/util/ImageToBase64Utils.java +++ b/mes-common/src/main/java/top/mes/admin/common/util/ImageToBase64Utils.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.util; +package top.mes.admin.common.util; import org.apache.commons.codec.binary.Base64; diff --git a/mes-common/src/main/java/top/mes/admin/common/util/PictureUtils.java b/mes-common/src/main/java/top/mes/admin/common/util/PictureUtils.java index d2df118..95a8122 100644 --- a/mes-common/src/main/java/top/mes/admin/common/util/PictureUtils.java +++ b/mes-common/src/main/java/top/mes/admin/common/util/PictureUtils.java @@ -1,4 +1,4 @@ -package top.wms.admin.common.util; +package top.mes.admin.common.util; import net.coobird.thumbnailator.Thumbnails; import org.springframework.mock.web.MockMultipartFile; diff --git a/mes-common/src/main/java/top/mes/admin/common/util/SecureUtils.java b/mes-common/src/main/java/top/mes/admin/common/util/SecureUtils.java index 9191ba8..2c09575 100644 --- a/mes-common/src/main/java/top/mes/admin/common/util/SecureUtils.java +++ b/mes-common/src/main/java/top/mes/admin/common/util/SecureUtils.java @@ -1,10 +1,10 @@ -package top.wms.admin.common.util; +package top.mes.admin.common.util; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.extra.spring.SpringUtil; -import top.wms.admin.common.config.properties.RsaProperties; +import top.mes.admin.common.config.properties.RsaProperties; import top.continew.starter.core.exception.BusinessException; import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; diff --git a/mes-extension/mes-extension-schedule-server/pom.xml b/mes-extension/mes-extension-schedule-server/pom.xml index 71c96b3..e5ccddb 100644 --- a/mes-extension/mes-extension-schedule-server/pom.xml +++ b/mes-extension/mes-extension-schedule-server/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.wms - wms-extension + top.mes + mes-extension ${revision} - wms-extension-schedule-server + mes-extension-schedule-server 任务调度服务端 diff --git a/mes-extension/mes-extension-schedule-server/src/main/java/top/mes/admin/extension/scheduling/ScheduleServerApplication.java b/mes-extension/mes-extension-schedule-server/src/main/java/top/mes/admin/extension/scheduling/ScheduleServerApplication.java index 72e3f1d..bee1bd4 100644 --- a/mes-extension/mes-extension-schedule-server/src/main/java/top/mes/admin/extension/scheduling/ScheduleServerApplication.java +++ b/mes-extension/mes-extension-schedule-server/src/main/java/top/mes/admin/extension/scheduling/ScheduleServerApplication.java @@ -1,4 +1,4 @@ -package top.wms.admin.extension.scheduling; +package top.mes.admin.extension.scheduling; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.URLUtil; diff --git a/mes-extension/pom.xml b/mes-extension/pom.xml index 38447ca..e865112 100644 --- a/mes-extension/pom.xml +++ b/mes-extension/pom.xml @@ -2,16 +2,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.wms - wms-admin + top.mes + mes-admin ${revision} - wms-extension + mes-extension pom 扩展模块（存放其他扩展模块） - wms-extension-schedule-server + mes-extension-schedule-server diff --git a/mes-module-system/pom.xml b/mes-module-system/pom.xml index 2e58377..2779f98 100644 --- a/mes-module-system/pom.xml +++ b/mes-module-system/pom.xml @@ -4,19 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.wms - wms-admin + top.mes + mes-admin ${revision} - wms-module-system + mes-module-system 系统管理模块（存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等） - top.wms - wms-common + top.mes + mes-common diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/AbstractLoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/AbstractLoginHandler.java index c708a85..d7847d1 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/AbstractLoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/AbstractLoginHandler.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth; +package top.mes.admin.auth; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -7,18 +7,18 @@ import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; -import top.wms.admin.auth.model.req.LoginReq; -import top.wms.admin.common.context.RoleContext; -import top.wms.admin.common.context.UserContext; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.context.UserExtraContext; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.resp.ClientResp; -import top.wms.admin.system.service.DeptService; -import top.wms.admin.system.service.OptionService; -import top.wms.admin.system.service.RoleService; -import top.wms.admin.system.service.UserService; +import top.mes.admin.auth.model.req.LoginReq; +import top.mes.admin.common.context.RoleContext; +import top.mes.admin.common.context.UserContext; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.context.UserExtraContext; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.resp.ClientResp; +import top.mes.admin.system.service.DeptService; +import top.mes.admin.system.service.OptionService; +import top.mes.admin.system.service.RoleService; +import top.mes.admin.system.service.UserService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.core.validation.Validator; import top.continew.starter.web.util.SpringWebUtils; @@ -26,7 +26,7 @@ import top.continew.starter.web.util.SpringWebUtils; import java.util.Set; import java.util.concurrent.CompletableFuture; -import static top.wms.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS; +import static top.mes.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS; /** * 登录处理器基类 diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandler.java index f4c0c42..1044638 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandler.java @@ -1,10 +1,10 @@ -package top.wms.admin.auth; +package top.mes.admin.auth; import jakarta.servlet.http.HttpServletRequest; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.LoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.LoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.system.model.resp.ClientResp; /** * 登录处理器 diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandlerFactory.java b/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandlerFactory.java index 5a082da..1491422 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandlerFactory.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/LoginHandlerFactory.java @@ -1,9 +1,9 @@ -package top.wms.admin.auth; +package top.mes.admin.auth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.LoginReq; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.LoginReq; import java.util.EnumMap; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/enums/AuthTypeEnum.java b/mes-module-system/src/main/java/top/mes/admin/auth/enums/AuthTypeEnum.java index c2cdf0d..1a5fe62 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/enums/AuthTypeEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/enums/AuthTypeEnum.java @@ -1,8 +1,8 @@ -package top.wms.admin.auth.enums; +package top.mes.admin.auth.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.wms.admin.common.constant.UiConstants; +import top.mes.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/handler/AccountLoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/handler/AccountLoginHandler.java index 6913b2c..4478218 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/handler/AccountLoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/handler/AccountLoginHandler.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.handler; +package top.mes.admin.auth.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -6,16 +6,16 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; -import top.wms.admin.auth.AbstractLoginHandler; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.AccountLoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.common.util.SecureUtils; -import top.wms.admin.system.enums.PasswordPolicyEnum; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.auth.AbstractLoginHandler; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.AccountLoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.common.util.SecureUtils; +import top.mes.admin.system.enums.PasswordPolicyEnum; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.validation.CheckUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/handler/CardLoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/handler/CardLoginHandler.java index 745fa3a..395f2f2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/handler/CardLoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/handler/CardLoginHandler.java @@ -1,14 +1,14 @@ -package top.wms.admin.auth.handler; +package top.mes.admin.auth.handler; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; import top.continew.starter.core.validation.ValidationUtils; -import top.wms.admin.auth.AbstractLoginHandler; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.CardLoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.auth.AbstractLoginHandler; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.CardLoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.resp.ClientResp; @Component public class CardLoginHandler extends AbstractLoginHandler { diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/handler/EmailLoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/handler/EmailLoginHandler.java index c5aae56..8842374 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/handler/EmailLoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/handler/EmailLoginHandler.java @@ -1,14 +1,14 @@ -package top.wms.admin.auth.handler; +package top.mes.admin.auth.handler; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import top.wms.admin.auth.AbstractLoginHandler; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.EmailLoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.auth.AbstractLoginHandler; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.EmailLoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.validation.ValidationUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/handler/PhoneLoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/handler/PhoneLoginHandler.java index e40b5ed..dcc9248 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/handler/PhoneLoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/handler/PhoneLoginHandler.java @@ -1,14 +1,14 @@ -package top.wms.admin.auth.handler; +package top.mes.admin.auth.handler; import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import top.wms.admin.auth.AbstractLoginHandler; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.PhoneLoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.auth.AbstractLoginHandler; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.PhoneLoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.resp.ClientResp; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.validation.ValidationUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/handler/SocialLoginHandler.java b/mes-module-system/src/main/java/top/mes/admin/auth/handler/SocialLoginHandler.java index 1b49cbf..b95f0cc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/handler/SocialLoginHandler.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/handler/SocialLoginHandler.java @@ -1,14 +1,14 @@ -package top.wms.admin.auth.handler; +package top.mes.admin.auth.handler; import cn.dev33.satoken.stp.StpUtil; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import top.wms.admin.auth.AbstractLoginHandler; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.SocialLoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.auth.AbstractLoginHandler; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.SocialLoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.system.model.resp.ClientResp; import top.continew.starter.core.exception.BadRequestException; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/query/OnlineUserQuery.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/query/OnlineUserQuery.java index 28db913..c812f1d 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/query/OnlineUserQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/query/OnlineUserQuery.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.query; +package top.mes.admin.auth.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/AccountLoginReq.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/AccountLoginReq.java index 0d60b8c..77047a8 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/AccountLoginReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/AccountLoginReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.req; +package top.mes.admin.auth.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/CardLoginReq.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/CardLoginReq.java index 6e1dd9c..0eb3942 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/CardLoginReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/CardLoginReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.req; +package top.mes.admin.auth.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/EmailLoginReq.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/EmailLoginReq.java index 3c42481..3f2be2e 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/EmailLoginReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/EmailLoginReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.req; +package top.mes.admin.auth.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/LoginReq.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/LoginReq.java index 1e2c84c..06d7176 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/LoginReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/LoginReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.req; +package top.mes.admin.auth.model.req; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.wms.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.enums.AuthTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/PhoneLoginReq.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/PhoneLoginReq.java index b38c901..ec5fc36 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/PhoneLoginReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/PhoneLoginReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.req; +package top.mes.admin.auth.model.req; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/SocialLoginReq.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/SocialLoginReq.java index f938ccb..afe20e4 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/req/SocialLoginReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/req/SocialLoginReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.req; +package top.mes.admin.auth.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/CaptchaResp.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/CaptchaResp.java index af2dca9..93f6f4b 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/CaptchaResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/CaptchaResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.resp; +package top.mes.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/LoginResp.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/LoginResp.java index 8ff5f37..a8d9436 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/LoginResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/LoginResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.resp; +package top.mes.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/OnlineUserResp.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/OnlineUserResp.java index d61dd38..9769004 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/OnlineUserResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/OnlineUserResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.resp; +package top.mes.admin.auth.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.AssembleMethod; @@ -6,8 +6,8 @@ import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.auth.service.OnlineUserService; -import top.wms.admin.common.constant.ContainerConstants; +import top.mes.admin.auth.service.OnlineUserService; +import top.mes.admin.common.constant.ContainerConstants; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/RouteResp.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/RouteResp.java index a5e9d10..9ee891e 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/RouteResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/RouteResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.resp; +package top.mes.admin.auth.model.resp; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/SocialAuthAuthorizeResp.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/SocialAuthAuthorizeResp.java index 44dab92..924d3f2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/SocialAuthAuthorizeResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/SocialAuthAuthorizeResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.model.resp; +package top.mes.admin.auth.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/UserInfoResp.java b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/UserInfoResp.java index 66aee66..0dd43b3 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/UserInfoResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/model/resp/UserInfoResp.java @@ -1,9 +1,9 @@ -package top.wms.admin.auth.model.resp; +package top.mes.admin.auth.model.resp; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.enums.GenderEnum; import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.enums.MaskType; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/service/AuthService.java b/mes-module-system/src/main/java/top/mes/admin/auth/service/AuthService.java index 8e415be..8e2505f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/service/AuthService.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/service/AuthService.java @@ -1,9 +1,9 @@ -package top.wms.admin.auth.service; +package top.mes.admin.auth.service; import jakarta.servlet.http.HttpServletRequest; -import top.wms.admin.auth.model.req.LoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.auth.model.resp.RouteResp; +import top.mes.admin.auth.model.req.LoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.auth.model.resp.RouteResp; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/service/OnlineUserService.java b/mes-module-system/src/main/java/top/mes/admin/auth/service/OnlineUserService.java index 3628526..308113e 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/service/OnlineUserService.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/service/OnlineUserService.java @@ -1,7 +1,7 @@ -package top.wms.admin.auth.service; +package top.mes.admin.auth.service; -import top.wms.admin.auth.model.query.OnlineUserQuery; -import top.wms.admin.auth.model.resp.OnlineUserResp; +import top.mes.admin.auth.model.query.OnlineUserQuery; +import top.mes.admin.auth.model.resp.OnlineUserResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/AuthServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/AuthServiceImpl.java index 7b45cf2..8fd1b59 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/AuthServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.service.impl; +package top.mes.admin.auth.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -8,22 +8,22 @@ import cn.hutool.core.lang.tree.TreeUtil; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.wms.admin.auth.LoginHandler; -import top.wms.admin.auth.LoginHandlerFactory; -import top.wms.admin.auth.enums.AuthTypeEnum; -import top.wms.admin.auth.model.req.LoginReq; -import top.wms.admin.auth.model.resp.LoginResp; -import top.wms.admin.auth.model.resp.RouteResp; -import top.wms.admin.auth.service.AuthService; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.common.context.RoleContext; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.MenuTypeEnum; -import top.wms.admin.system.model.resp.ClientResp; -import top.wms.admin.system.model.resp.MenuResp; -import top.wms.admin.system.service.ClientService; -import top.wms.admin.system.service.MenuService; -import top.wms.admin.system.service.RoleService; +import top.mes.admin.auth.LoginHandler; +import top.mes.admin.auth.LoginHandlerFactory; +import top.mes.admin.auth.enums.AuthTypeEnum; +import top.mes.admin.auth.model.req.LoginReq; +import top.mes.admin.auth.model.resp.LoginResp; +import top.mes.admin.auth.model.resp.RouteResp; +import top.mes.admin.auth.service.AuthService; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.common.context.RoleContext; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.MenuTypeEnum; +import top.mes.admin.system.model.resp.ClientResp; +import top.mes.admin.system.model.resp.MenuResp; +import top.mes.admin.system.service.ClientService; +import top.mes.admin.system.service.MenuService; +import top.mes.admin.system.service.RoleService; import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.autoconfigure.CrudProperties; diff --git a/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/OnlineUserServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/OnlineUserServiceImpl.java index 8582154..5f8ff46 100644 --- a/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/OnlineUserServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/auth/service/impl/OnlineUserServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.auth.service.impl; +package top.mes.admin.auth.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.dev33.satoken.dao.SaTokenDao; @@ -10,12 +10,12 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.wms.admin.auth.model.query.OnlineUserQuery; -import top.wms.admin.auth.model.resp.OnlineUserResp; -import top.wms.admin.auth.service.OnlineUserService; -import top.wms.admin.common.context.UserContext; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.context.UserExtraContext; +import top.mes.admin.auth.model.query.OnlineUserQuery; +import top.mes.admin.auth.model.resp.OnlineUserResp; +import top.mes.admin.auth.service.OnlineUserService; +import top.mes.admin.common.context.UserContext; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.context.UserExtraContext; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileInfoContainer.java b/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileInfoContainer.java index 9810d04..6021257 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileInfoContainer.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileInfoContainer.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.config.file; +package top.mes.admin.system.config.file; import cn.crane4j.core.container.Container; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.system.model.entity.FileDO; -import top.wms.admin.system.service.FileService; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.system.model.entity.FileDO; +import top.mes.admin.system.service.FileService; import java.util.Collection; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileRecorderImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileRecorderImpl.java index f2ac23b..04bc9da 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileRecorderImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileRecorderImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.config.file; +package top.mes.admin.system.config.file; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ClassUtil; @@ -12,12 +12,12 @@ import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.recorder.FileRecorder; import org.dromara.x.file.storage.core.upload.FilePartInfo; import org.springframework.stereotype.Component; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.system.enums.FileTypeEnum; -import top.wms.admin.system.mapper.FileMapper; -import top.wms.admin.system.mapper.StorageMapper; -import top.wms.admin.system.model.entity.FileDO; -import top.wms.admin.system.model.entity.StorageDO; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.system.enums.FileTypeEnum; +import top.mes.admin.system.mapper.FileMapper; +import top.mes.admin.system.mapper.StorageMapper; +import top.mes.admin.system.model.entity.FileDO; +import top.mes.admin.system.model.entity.StorageDO; import top.continew.starter.core.constant.StringConstants; import java.util.Optional; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileStorageConfigLoader.java b/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileStorageConfigLoader.java index 0405ecf..43385cb 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileStorageConfigLoader.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/config/file/FileStorageConfigLoader.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.config.file; +package top.mes.admin.system.config.file; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -7,11 +7,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.model.query.StorageQuery; -import top.wms.admin.system.model.req.StorageReq; -import top.wms.admin.system.model.resp.StorageResp; -import top.wms.admin.system.service.StorageService; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.model.query.StorageQuery; +import top.mes.admin.system.model.req.StorageReq; +import top.mes.admin.system.model.resp.StorageResp; +import top.mes.admin.system.service.StorageService; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/config/mail/MailConfigurerImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/config/mail/MailConfigurerImpl.java index 5d42b9d..66b4811 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/config/mail/MailConfigurerImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/config/mail/MailConfigurerImpl.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.config.mail; +package top.mes.admin.system.config.mail; import cn.hutool.core.map.MapUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.system.enums.OptionCategoryEnum; -import top.wms.admin.system.service.OptionService; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.system.enums.OptionCategoryEnum; +import top.mes.admin.system.service.OptionService; import top.continew.starter.messaging.mail.core.MailConfig; import top.continew.starter.messaging.mail.core.MailConfigurer; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/FileTypeEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/FileTypeEnum.java index f931f69..6f0c2e6 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/FileTypeEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/FileTypeEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import cn.hutool.core.util.StrUtil; import lombok.Getter; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/ImportPolicyEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/ImportPolicyEnum.java index 7edc883..4bd93df 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/ImportPolicyEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/ImportPolicyEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import cn.hutool.core.collection.CollUtil; import lombok.Getter; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/LogStatusEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/LogStatusEnum.java index 8027e5c..37c5126 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/LogStatusEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/LogStatusEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/MenuTypeEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/MenuTypeEnum.java index fd1c157..6ae8647 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/MenuTypeEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTemplateEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTemplateEnum.java index ca6ae08..0c100eb 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTemplateEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTemplateEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTypeEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTypeEnum.java index 24cf8e2..ee6979a 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTypeEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTypeEnum.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.wms.admin.common.constant.UiConstants; +import top.mes.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeScopeEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeScopeEnum.java index ee7100e..b91918c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeScopeEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeScopeEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeStatusEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeStatusEnum.java index 5dc5620..a6290da 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeStatusEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeStatusEnum.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.wms.admin.common.constant.UiConstants; +import top.mes.admin.common.constant.UiConstants; import top.continew.starter.core.enums.BaseEnum; import java.time.LocalDateTime; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/OptionCategoryEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/OptionCategoryEnum.java index 5f9b8c6..f1ffcdc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/OptionCategoryEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/OptionCategoryEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; /** * 参数类别枚举 diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/PasswordPolicyEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/PasswordPolicyEnum.java index ca7e1ae..4cc1d70 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/PasswordPolicyEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/PasswordPolicyEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,11 +8,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.wms.admin.common.constant.RegexConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.service.OptionService; -import top.wms.admin.system.service.UserPasswordHistoryService; +import top.mes.admin.common.constant.RegexConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.service.OptionService; +import top.mes.admin.system.service.UserPasswordHistoryService; import top.continew.starter.core.validation.ValidationUtils; import java.util.Map; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/SocialSourceEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/SocialSourceEnum.java index abbc254..0d37374 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/SocialSourceEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/SocialSourceEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/enums/StorageTypeEnum.java b/mes-module-system/src/main/java/top/mes/admin/system/enums/StorageTypeEnum.java index ca586ad..0485245 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/enums/StorageTypeEnum.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/enums/StorageTypeEnum.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.enums; +package top.mes.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/ClientMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/ClientMapper.java index a919fa8..3cdceb3 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/ClientMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/ClientMapper.java @@ -1,6 +1,6 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; -import top.wms.admin.system.model.entity.ClientDO; +import top.mes.admin.system.model.entity.ClientDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/ConfigMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/ConfigMapper.java index ce5475d..47befa6 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/ConfigMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/ConfigMapper.java @@ -1,7 +1,7 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import top.continew.starter.data.mp.base.BaseMapper; -import top.wms.admin.system.model.entity.ConfigDO; +import top.mes.admin.system.model.entity.ConfigDO; /** * 参数配置 Mapper diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/DeptMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/DeptMapper.java index 07835bf..5009335 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/DeptMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/DeptMapper.java @@ -1,6 +1,6 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; -import top.wms.admin.system.model.entity.DeptDO; +import top.mes.admin.system.model.entity.DeptDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictItemMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictItemMapper.java index af0d09b..ac6621d 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictItemMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictItemMapper.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import com.alicp.jetcache.anno.Cached; import org.apache.ibatis.annotations.Param; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.system.model.entity.DictItemDO; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.system.model.entity.DictItemDO; import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.extension.crud.model.resp.LabelValueResp; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictMapper.java index 853c4e6..6a4fb77 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/DictMapper.java @@ -1,6 +1,6 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; -import top.wms.admin.system.model.entity.DictDO; +import top.mes.admin.system.model.entity.DictDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/FileMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/FileMapper.java index d275102..1f92470 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/FileMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/FileMapper.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.apache.ibatis.annotations.Select; -import top.wms.admin.system.model.entity.FileDO; -import top.wms.admin.system.model.resp.file.FileStatisticsResp; +import top.mes.admin.system.model.entity.FileDO; +import top.mes.admin.system.model.resp.file.FileStatisticsResp; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/LogMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/LogMapper.java index d0c611a..857d4a7 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/LogMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/LogMapper.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.wms.admin.system.model.entity.LogDO; -import top.wms.admin.system.model.resp.log.LogResp; +import top.mes.admin.system.model.entity.LogDO; +import top.mes.admin.system.model.resp.log.LogResp; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/MenuMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/MenuMapper.java index fa703c7..97612ef 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/MenuMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/MenuMapper.java @@ -1,7 +1,7 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.wms.admin.system.model.entity.MenuDO; +import top.mes.admin.system.model.entity.MenuDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/OptionMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/OptionMapper.java index ec760f3..3e96c58 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/OptionMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/OptionMapper.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.wms.admin.system.model.entity.OptionDO; +import top.mes.admin.system.model.entity.OptionDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/PeopleEquipmentMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/PeopleEquipmentMapper.java index 6a711bc..9a02061 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/PeopleEquipmentMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/PeopleEquipmentMapper.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.springframework.stereotype.Repository; import top.continew.starter.data.mp.base.BaseMapper; -import top.wms.admin.system.model.entity.PeopleEquipmentDO; +import top.mes.admin.system.model.entity.PeopleEquipmentDO; /** * 人员设备下发信息 Mapper diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleDeptMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleDeptMapper.java index dba1b58..66abaeb 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleDeptMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleDeptMapper.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.wms.admin.system.model.entity.RoleDeptDO; +import top.mes.admin.system.model.entity.RoleDeptDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMapper.java index a34a16e..9df16fc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMapper.java @@ -1,6 +1,6 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; -import top.wms.admin.system.model.entity.RoleDO; +import top.mes.admin.system.model.entity.RoleDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMenuMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMenuMapper.java index ebc8a64..a18e6af 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMenuMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/RoleMenuMapper.java @@ -1,6 +1,6 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; -import top.wms.admin.system.model.entity.RoleMenuDO; +import top.mes.admin.system.model.entity.RoleMenuDO; import top.continew.starter.data.mp.base.BaseMapper; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/StorageMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/StorageMapper.java index 2779951..ffa83e2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/StorageMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/StorageMapper.java @@ -1,6 +1,6 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; -import top.wms.admin.system.model.entity.StorageDO; +import top.mes.admin.system.model.entity.StorageDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserMapper.java index d58b8aa..6866ee7 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserMapper.java @@ -1,13 +1,13 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import top.wms.admin.common.config.mybatis.DataPermissionMapper; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.resp.user.UserDetailResp; +import top.mes.admin.common.config.mybatis.DataPermissionMapper; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.resp.user.UserDetailResp; import top.continew.starter.extension.datapermission.annotation.DataPermission; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserPasswordHistoryMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserPasswordHistoryMapper.java index 21563b2..5e88c64 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserPasswordHistoryMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserPasswordHistoryMapper.java @@ -1,7 +1,7 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.wms.admin.system.model.entity.UserPasswordHistoryDO; +import top.mes.admin.system.model.entity.UserPasswordHistoryDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserRoleMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserRoleMapper.java index b849846..9016ad2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserRoleMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserRoleMapper.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; -import top.wms.admin.system.model.entity.UserRoleDO; -import top.wms.admin.system.model.resp.role.RoleUserResp; +import top.mes.admin.system.model.entity.UserRoleDO; +import top.mes.admin.system.model.resp.role.RoleUserResp; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserSocialMapper.java b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserSocialMapper.java index 2a6298f..c4c6263 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserSocialMapper.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/mapper/UserSocialMapper.java @@ -1,7 +1,7 @@ -package top.wms.admin.system.mapper; +package top.mes.admin.system.mapper; import org.apache.ibatis.annotations.Param; -import top.wms.admin.system.model.entity.UserSocialDO; +import top.mes.admin.system.model.entity.UserSocialDO; import top.continew.starter.data.mp.base.BaseMapper; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ClientDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ClientDO.java index 9d988b2..5f67b74 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ClientDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ClientDO.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ConfigDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ConfigDO.java index b16aa20..0154c6d 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ConfigDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/ConfigDO.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DeptDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DeptDO.java index a9d619c..fc84571 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DeptDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DeptDO.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictDO.java index 0117e39..e95b282 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictDO.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import top.continew.starter.extension.crud.annotation.DictField; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictItemDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictItemDO.java index 943395c..1e659d1 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictItemDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/DictItemDO.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/FileDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/FileDO.java index 4020d14..c4c4824 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/FileDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/FileDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.SneakyThrows; import org.dromara.x.file.storage.core.FileInfo; -import top.wms.admin.common.model.entity.BaseDO; -import top.wms.admin.system.enums.FileTypeEnum; -import top.wms.admin.system.enums.StorageTypeEnum; +import top.mes.admin.common.model.entity.BaseDO; +import top.mes.admin.system.enums.FileTypeEnum; +import top.mes.admin.system.enums.StorageTypeEnum; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.StrUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/LogDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/LogDO.java index 2002fda..60d02dc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/LogDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/LogDO.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.system.enums.LogStatusEnum; +import top.mes.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/MenuDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/MenuDO.java index 7f5e9b2..e6bc3f3 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/MenuDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/MenuDO.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.MenuTypeEnum; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.MenuTypeEnum; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/OptionDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/OptionDO.java index b55924c..054c544 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/OptionDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/OptionDO.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.model.entity.BaseUpdateDO; +import top.mes.admin.common.model.entity.BaseUpdateDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/PeopleEquipmentDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/PeopleEquipmentDO.java index 29aee53..962f91c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/PeopleEquipmentDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/PeopleEquipmentDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDO.java index 9027995..6cb442d 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDO.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.enums.DataScopeEnum; +import top.mes.admin.common.enums.DataScopeEnum; import top.continew.starter.extension.crud.annotation.DictField; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.model.entity.BaseDO; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDeptDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDeptDO.java index 5b347c4..bfc21d6 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDeptDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleDeptDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleMenuDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleMenuDO.java index 471440d..77e3e37 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleMenuDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/RoleMenuDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/StorageDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/StorageDO.java index 76fd894..14cf81e 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/StorageDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/StorageDO.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.StorageTypeEnum; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.StorageTypeEnum; +import top.mes.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserDO.java index 3bcea43..ab0fe37 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserDO.java @@ -1,13 +1,13 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.annotation.DictField; -import top.wms.admin.common.model.entity.BaseDO; +import top.mes.admin.common.model.entity.BaseDO; import top.continew.starter.security.crypto.annotation.FieldEncrypt; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserPasswordHistoryDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserPasswordHistoryDO.java index 4e0fb4c..f6b3066 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserPasswordHistoryDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserPasswordHistoryDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserRoleDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserRoleDO.java index 264305c..7f8b35c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserRoleDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserRoleDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserSocialDO.java b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserSocialDO.java index 75a117a..06ebdf3 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserSocialDO.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/entity/UserSocialDO.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.entity; +package top.mes.admin.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/ClientQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/ClientQuery.java index 1a09733..8795594 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/ClientQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/ClientQuery.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/ConfigQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/ConfigQuery.java index 734a5f1..ad81c95 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/ConfigQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/ConfigQuery.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import cn.hutool.core.date.DatePattern; import jakarta.validation.constraints.Size; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/DeptQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/DeptQuery.java index 881eb0b..32b7d36 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/DeptQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/DeptQuery.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictItemQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictItemQuery.java index 03f37db..2c39bbd 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictItemQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictItemQuery.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictQuery.java index 6249a52..21b0b5e 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/DictQuery.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/FileQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/FileQuery.java index f6f26a7..3fb30cc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/FileQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/FileQuery.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.system.enums.FileTypeEnum; +import top.mes.admin.system.enums.FileTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/LogQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/LogQuery.java index 6fc8c5d..07d27a9 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/LogQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/LogQuery.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/MenuQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/MenuQuery.java index e9f8c3f..189f0df 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/MenuQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/MenuQuery.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/OptionQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/OptionQuery.java index d079e84..f00ddca 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/OptionQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/OptionQuery.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.system.enums.OptionCategoryEnum; +import top.mes.admin.system.enums.OptionCategoryEnum; import top.continew.starter.core.validation.constraints.EnumValue; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/PeopleEquipmentQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/PeopleEquipmentQuery.java index a061b3d..05a381c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/PeopleEquipmentQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/PeopleEquipmentQuery.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleQuery.java index 746b807..90a1d91 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleQuery.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleUserQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleUserQuery.java index 52f3efc..ac38b7f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleUserQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/RoleUserQuery.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/StorageQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/StorageQuery.java index 202286c..eefd241 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/StorageQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/StorageQuery.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.StorageTypeEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.StorageTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/query/UserQuery.java b/mes-module-system/src/main/java/top/mes/admin/system/model/query/UserQuery.java index 65eb18d..3562437 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/query/UserQuery.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/query/UserQuery.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.query; +package top.mes.admin.system.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/ClientReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/ClientReq.java index 0ddc737..4dcb407 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/ClientReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/ClientReq.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/ConfigReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/ConfigReq.java index 9a2bedb..884ad57 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/ConfigReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/ConfigReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/DeptReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/DeptReq.java index 6674c75..5798a27 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/DeptReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/DeptReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictItemReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictItemReq.java index 30a4426..e5890e8 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictItemReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictItemReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictReq.java index faa0d2e..409a4f0 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/DictReq.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.constant.RegexConstants; +import top.mes.admin.common.constant.RegexConstants; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/FileReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/FileReq.java index 75269a1..94a38fb 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/FileReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/FileReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/MenuReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/MenuReq.java index d227c21..54b3d93 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/MenuReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/MenuReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.MenuTypeEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.MenuTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionReq.java index c6bc9b1..c6206e1 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionResetValueReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionResetValueReq.java index 6f26137..496508f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionResetValueReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/OptionResetValueReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/PeopleEquipmentReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/PeopleEquipmentReq.java index a0bc729..4af23f4 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/PeopleEquipmentReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/PeopleEquipmentReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleReq.java index 83a1056..405f2bd 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.constant.RegexConstants; -import top.wms.admin.common.enums.DataScopeEnum; +import top.mes.admin.common.constant.RegexConstants; +import top.mes.admin.common.enums.DataScopeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleUpdatePermissionReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleUpdatePermissionReq.java index 7fd80d4..6ca1568 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleUpdatePermissionReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/RoleUpdatePermissionReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/StorageReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/StorageReq.java index 7134a19..d167648 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/StorageReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/StorageReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req; +package top.mes.admin.system.model.req; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.constant.RegexConstants; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.StorageTypeEnum; -import top.wms.admin.system.validation.ValidationGroup; +import top.mes.admin.common.constant.RegexConstants; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.StorageTypeEnum; +import top.mes.admin.system.validation.ValidationGroup; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserBasicInfoUpdateReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserBasicInfoUpdateReq.java index 5e55eac..e999585 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserBasicInfoUpdateReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserBasicInfoUpdateReq.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; -import top.wms.admin.common.constant.RegexConstants; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.constant.RegexConstants; +import top.mes.admin.common.enums.GenderEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserEmailUpdateRequest.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserEmailUpdateRequest.java index b500618..f15947c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserEmailUpdateRequest.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserEmailUpdateRequest.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportReq.java index 9ff0dc2..e8a74e8 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportReq.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.ImportPolicyEnum; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.ImportPolicyEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportRowReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportRowReq.java index 9f89f3f..3863c4f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportRowReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserImportRowReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.constant.RegexConstants; +import top.mes.admin.common.constant.RegexConstants; import top.continew.starter.extension.crud.validation.CrudValidationGroup; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordResetReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordResetReq.java index 10e6837..7d7cab7 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordResetReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordResetReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordUpdateReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordUpdateReq.java index fe5b80e..f208da2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordUpdateReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPasswordUpdateReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPhoneUpdateReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPhoneUpdateReq.java index b534151..6877364 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPhoneUpdateReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserPhoneUpdateReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserReq.java index 1934d20..e8a59fc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import cn.hutool.core.lang.RegexPool; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,9 +8,9 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.wms.admin.common.constant.RegexConstants; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.constant.RegexConstants; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.GenderEnum; import top.continew.starter.extension.crud.validation.CrudValidationGroup; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserRoleUpdateReq.java b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserRoleUpdateReq.java index e3e508f..b08d1e2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserRoleUpdateReq.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/req/user/UserRoleUpdateReq.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.req.user; +package top.mes.admin.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/AvatarResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/AvatarResp.java index 93e540f..6cbc763 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/AvatarResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/AvatarResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ClientResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ClientResp.java index 32600f8..eda601a 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ClientResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ClientResp.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigDetailResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigDetailResp.java index 82b171a..ab685b8 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigDetailResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigDetailResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import lombok.Data; @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import top.wms.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigResp.java index 98a2e99..9683c09 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/ConfigResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.wms.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.model.resp.BaseDetailResp; import java.io.Serial; import java.time.*; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DeptResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DeptResp.java index e82cb9a..d708fd5 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DeptResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DeptResp.java @@ -1,11 +1,11 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictItemResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictItemResp.java index 653bd1c..8cdb51d 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictItemResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictItemResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictResp.java index 3049cbf..e287d72 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/DictResp.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/MenuResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/MenuResp.java index 277d16a..f556e16 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/MenuResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/MenuResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseResp; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.MenuTypeEnum; +import top.mes.admin.common.model.resp.BaseResp; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.MenuTypeEnum; import top.continew.starter.extension.crud.annotation.TreeField; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/OptionResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/OptionResp.java index 1ae26d6..61b8722 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/OptionResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/OptionResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/PeopleEquipmentResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/PeopleEquipmentResp.java index 41d8fd2..903666b 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/PeopleEquipmentResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/PeopleEquipmentResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.wms.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.model.resp.BaseDetailResp; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/StorageResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/StorageResp.java index a1a1fb9..05d1c94 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/StorageResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/StorageResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp; +package top.mes.admin.system.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.StorageTypeEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.StorageTypeEnum; import top.continew.starter.security.mask.annotation.JsonMask; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileResp.java index a2b5bc4..9d0d5bd 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp.file; +package top.mes.admin.system.model.resp.file; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.system.enums.FileTypeEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.system.enums.FileTypeEnum; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileStatisticsResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileStatisticsResp.java index 927feb8..6ae01cc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileStatisticsResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileStatisticsResp.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.resp.file; +package top.mes.admin.system.model.resp.file; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.system.enums.FileTypeEnum; +import top.mes.admin.system.enums.FileTypeEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileUploadResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileUploadResp.java index f9944b3..a2d4219 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileUploadResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/file/FileUploadResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp.file; +package top.mes.admin.system.model.resp.file; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogDetailResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogDetailResp.java index a3851b9..db0fa0f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogDetailResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogDetailResp.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.model.resp.log; +package top.mes.admin.system.model.resp.log; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.system.enums.LogStatusEnum; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogResp.java index 69df61a..b58acf8 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LogResp.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.resp.log; +package top.mes.admin.system.model.resp.log; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.system.enums.LogStatusEnum; +import top.mes.admin.system.enums.LogStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LoginLogExportResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LoginLogExportResp.java index 7c36732..a1eaa04 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LoginLogExportResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/LoginLogExportResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp.log; +package top.mes.admin.system.model.resp.log; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.system.enums.LogStatusEnum; +import top.mes.admin.system.enums.LogStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/OperationLogExportResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/OperationLogExportResp.java index 946bade..1b52746 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/OperationLogExportResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/log/OperationLogExportResp.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.model.resp.log; +package top.mes.admin.system.model.resp.log; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.system.enums.LogStatusEnum; +import top.mes.admin.system.enums.LogStatusEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleDetailResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleDetailResp.java index 289f373..bf86c1d 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleDetailResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleDetailResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp.role; +package top.mes.admin.system.model.resp.role; import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; @@ -7,9 +7,9 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.enums.DataScopeEnum; -import top.wms.admin.system.service.RoleDeptService; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.enums.DataScopeEnum; +import top.mes.admin.system.service.RoleDeptService; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleResp.java index 5eea37b..cdd135f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleResp.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.model.resp.role; +package top.mes.admin.system.model.resp.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.enums.DataScopeEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.enums.DataScopeEnum; import java.io.Serial; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleUserResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleUserResp.java index 55abebb..6c06d9a 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleUserResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/role/RoleUserResp.java @@ -1,13 +1,13 @@ -package top.wms.admin.system.model.resp.role; +package top.mes.admin.system.model.resp.role; import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.GenderEnum; import java.io.Serial; import java.io.Serializable; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserDetailResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserDetailResp.java index 06ef87b..4b98893 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserDetailResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserDetailResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp.user; +package top.mes.admin.system.model.resp.user; import cn.crane4j.annotation.Assemble; import cn.crane4j.core.executor.handler.ManyToManyAssembleOperationHandler; @@ -6,11 +6,11 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.GenderEnum; import top.continew.starter.file.excel.converter.ExcelBaseEnumConverter; import top.continew.starter.file.excel.converter.ExcelListConverter; import top.continew.starter.security.crypto.annotation.FieldEncrypt; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportParseResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportParseResp.java index 2680818..b74ce23 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportParseResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportParseResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp.user; +package top.mes.admin.system.model.resp.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportResp.java index 507e140..e87c37c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserImportResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp.user; +package top.mes.admin.system.model.resp.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserResp.java index 71a1287..0953e59 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserResp.java @@ -1,15 +1,15 @@ -package top.wms.admin.system.model.resp.user; +package top.mes.admin.system.model.resp.user; import cn.crane4j.annotation.Assemble; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.wms.admin.common.model.resp.BaseDetailResp; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.enums.GenderEnum; +import top.mes.admin.common.model.resp.BaseDetailResp; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.GenderEnum; import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.enums.MaskType; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserSocialBindResp.java b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserSocialBindResp.java index 6e3b33e..78fca92 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserSocialBindResp.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/model/resp/user/UserSocialBindResp.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.model.resp.user; +package top.mes.admin.system.model.resp.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/ClientService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/ClientService.java index 8e7e0c9..3cae887 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/ClientService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/ClientService.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.model.query.ClientQuery; -import top.wms.admin.system.model.req.ClientReq; -import top.wms.admin.system.model.resp.ClientResp; +import top.mes.admin.system.model.query.ClientQuery; +import top.mes.admin.system.model.req.ClientReq; +import top.mes.admin.system.model.resp.ClientResp; import top.continew.starter.extension.crud.service.BaseService; /** diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/ConfigService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/ConfigService.java index 047796d..ffd0488 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/ConfigService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/ConfigService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import top.continew.starter.extension.crud.service.BaseService; -import top.wms.admin.system.model.query.ConfigQuery; -import top.wms.admin.system.model.req.ConfigReq; -import top.wms.admin.system.model.resp.ConfigResp; +import top.mes.admin.system.model.query.ConfigQuery; +import top.mes.admin.system.model.req.ConfigReq; +import top.mes.admin.system.model.resp.ConfigResp; /** * 参数配置业务接口 diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/DeptService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/DeptService.java index 3e488d9..2f19cfc 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/DeptService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/DeptService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.model.entity.DeptDO; -import top.wms.admin.system.model.query.DeptQuery; -import top.wms.admin.system.model.req.DeptReq; -import top.wms.admin.system.model.resp.DeptResp; +import top.mes.admin.system.model.entity.DeptDO; +import top.mes.admin.system.model.query.DeptQuery; +import top.mes.admin.system.model.req.DeptReq; +import top.mes.admin.system.model.resp.DeptResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/DictItemService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/DictItemService.java index 47c16ca..f897670 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/DictItemService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/DictItemService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.model.entity.DictItemDO; -import top.wms.admin.system.model.query.DictItemQuery; -import top.wms.admin.system.model.req.DictItemReq; -import top.wms.admin.system.model.resp.DictItemResp; +import top.mes.admin.system.model.entity.DictItemDO; +import top.mes.admin.system.model.query.DictItemQuery; +import top.mes.admin.system.model.req.DictItemReq; +import top.mes.admin.system.model.resp.DictItemResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/DictService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/DictService.java index ac9d29e..ba57358 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/DictService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/DictService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.model.entity.DictDO; -import top.wms.admin.system.model.query.DictQuery; -import top.wms.admin.system.model.req.DictReq; -import top.wms.admin.system.model.resp.DictResp; +import top.mes.admin.system.model.entity.DictDO; +import top.mes.admin.system.model.query.DictQuery; +import top.mes.admin.system.model.req.DictReq; +import top.mes.admin.system.model.resp.DictResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/FileService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/FileService.java index eb98cbe..a4d47ab 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/FileService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/FileService.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import org.dromara.x.file.storage.core.FileInfo; import org.springframework.web.multipart.MultipartFile; -import top.wms.admin.system.model.entity.FileDO; -import top.wms.admin.system.model.query.FileQuery; -import top.wms.admin.system.model.req.FileReq; -import top.wms.admin.system.model.resp.file.FileResp; -import top.wms.admin.system.model.resp.file.FileStatisticsResp; +import top.mes.admin.system.model.entity.FileDO; +import top.mes.admin.system.model.query.FileQuery; +import top.mes.admin.system.model.req.FileReq; +import top.mes.admin.system.model.resp.file.FileResp; +import top.mes.admin.system.model.resp.file.FileStatisticsResp; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/ImportExcelService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/ImportExcelService.java index 80575e0..30f8286 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/ImportExcelService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/ImportExcelService.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/LogService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/LogService.java index bbcbeb3..d759670 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/LogService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/LogService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import jakarta.servlet.http.HttpServletResponse; -import top.wms.admin.system.model.query.LogQuery; -import top.wms.admin.system.model.resp.log.LogDetailResp; -import top.wms.admin.system.model.resp.log.LogResp; +import top.mes.admin.system.model.query.LogQuery; +import top.mes.admin.system.model.resp.log.LogDetailResp; +import top.mes.admin.system.model.resp.log.LogResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.SortQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/MenuService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/MenuService.java index 6ce1349..b3c72c4 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/MenuService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/MenuService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.model.entity.MenuDO; -import top.wms.admin.system.model.query.MenuQuery; -import top.wms.admin.system.model.req.MenuReq; -import top.wms.admin.system.model.resp.MenuResp; +import top.mes.admin.system.model.entity.MenuDO; +import top.mes.admin.system.model.query.MenuQuery; +import top.mes.admin.system.model.req.MenuReq; +import top.mes.admin.system.model.resp.MenuResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/OptionService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/OptionService.java index 358a18c..2dbe576 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/OptionService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/OptionService.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.enums.OptionCategoryEnum; -import top.wms.admin.system.model.query.OptionQuery; -import top.wms.admin.system.model.req.OptionReq; -import top.wms.admin.system.model.req.OptionResetValueReq; -import top.wms.admin.system.model.resp.OptionResp; +import top.mes.admin.system.enums.OptionCategoryEnum; +import top.mes.admin.system.model.query.OptionQuery; +import top.mes.admin.system.model.req.OptionReq; +import top.mes.admin.system.model.req.OptionResetValueReq; +import top.mes.admin.system.model.resp.OptionResp; import java.util.List; import java.util.Map; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/PeopleEquipmentService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/PeopleEquipmentService.java index 541e325..edac1a2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/PeopleEquipmentService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/PeopleEquipmentService.java @@ -1,9 +1,9 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import top.continew.starter.extension.crud.service.BaseService; -import top.wms.admin.system.model.query.PeopleEquipmentQuery; -import top.wms.admin.system.model.req.PeopleEquipmentReq; -import top.wms.admin.system.model.resp.PeopleEquipmentResp; +import top.mes.admin.system.model.query.PeopleEquipmentQuery; +import top.mes.admin.system.model.req.PeopleEquipmentReq; +import top.mes.admin.system.model.resp.PeopleEquipmentResp; /** * 人员设备下发信息业务接口 diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/RoleDeptService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/RoleDeptService.java index a6555aa..1d3c4a9 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/RoleDeptService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/RoleDeptService.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/RoleMenuService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/RoleMenuService.java index 9273b06..88d2dda 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/RoleMenuService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/RoleMenuService.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/RoleService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/RoleService.java index c4abfb8..965e8b5 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/RoleService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/RoleService.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.common.context.RoleContext; -import top.wms.admin.system.model.entity.RoleDO; -import top.wms.admin.system.model.query.RoleQuery; -import top.wms.admin.system.model.req.RoleReq; -import top.wms.admin.system.model.req.RoleUpdatePermissionReq; -import top.wms.admin.system.model.resp.role.RoleDetailResp; -import top.wms.admin.system.model.resp.role.RoleResp; +import top.mes.admin.common.context.RoleContext; +import top.mes.admin.system.model.entity.RoleDO; +import top.mes.admin.system.model.query.RoleQuery; +import top.mes.admin.system.model.req.RoleReq; +import top.mes.admin.system.model.req.RoleUpdatePermissionReq; +import top.mes.admin.system.model.resp.role.RoleDetailResp; +import top.mes.admin.system.model.resp.role.RoleResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/StorageService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/StorageService.java index fe267da..0a5d4a0 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/StorageService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/StorageService.java @@ -1,10 +1,10 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.common.model.req.CommonStatusUpdateReq; -import top.wms.admin.system.model.entity.StorageDO; -import top.wms.admin.system.model.query.StorageQuery; -import top.wms.admin.system.model.req.StorageReq; -import top.wms.admin.system.model.resp.StorageResp; +import top.mes.admin.common.model.req.CommonStatusUpdateReq; +import top.mes.admin.system.model.entity.StorageDO; +import top.mes.admin.system.model.query.StorageQuery; +import top.mes.admin.system.model.req.StorageReq; +import top.mes.admin.system.model.resp.StorageResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/UserPasswordHistoryService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/UserPasswordHistoryService.java index 6ecbc91..640f899 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/UserPasswordHistoryService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/UserPasswordHistoryService.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/UserRoleService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/UserRoleService.java index 0c765c8..f264ff7 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/UserRoleService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/UserRoleService.java @@ -1,8 +1,8 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; -import top.wms.admin.system.model.entity.UserRoleDO; -import top.wms.admin.system.model.query.RoleUserQuery; -import top.wms.admin.system.model.resp.role.RoleUserResp; +import top.mes.admin.system.model.entity.UserRoleDO; +import top.mes.admin.system.model.query.RoleUserQuery; +import top.mes.admin.system.model.resp.role.RoleUserResp; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/UserService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/UserService.java index 5e43cc7..130d8d1 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/UserService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/UserService.java @@ -1,14 +1,14 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.query.UserQuery; -import top.wms.admin.system.model.req.user.*; -import top.wms.admin.system.model.resp.user.UserDetailResp; -import top.wms.admin.system.model.resp.user.UserImportParseResp; -import top.wms.admin.system.model.resp.user.UserImportResp; -import top.wms.admin.system.model.resp.user.UserResp; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.query.UserQuery; +import top.mes.admin.system.model.req.user.*; +import top.mes.admin.system.model.resp.user.UserDetailResp; +import top.mes.admin.system.model.resp.user.UserImportParseResp; +import top.mes.admin.system.model.resp.user.UserImportResp; +import top.mes.admin.system.model.resp.user.UserResp; import top.continew.starter.data.mp.service.IService; import top.continew.starter.extension.crud.service.BaseService; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/UserSocialService.java b/mes-module-system/src/main/java/top/mes/admin/system/service/UserSocialService.java index 5e8682c..d95e91a 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/UserSocialService.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/UserSocialService.java @@ -1,7 +1,7 @@ -package top.wms.admin.system.service; +package top.mes.admin.system.service; import me.zhyd.oauth.model.AuthUser; -import top.wms.admin.system.model.entity.UserSocialDO; +import top.mes.admin.system.model.entity.UserSocialDO; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ClientServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ClientServiceImpl.java index ed25c9b..2509d62 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ClientServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ClientServiceImpl.java @@ -1,17 +1,17 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.crypto.digest.DigestUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.wms.admin.auth.model.query.OnlineUserQuery; -import top.wms.admin.auth.service.OnlineUserService; -import top.wms.admin.system.mapper.ClientMapper; -import top.wms.admin.system.model.entity.ClientDO; -import top.wms.admin.system.model.query.ClientQuery; -import top.wms.admin.system.model.req.ClientReq; -import top.wms.admin.system.model.resp.ClientResp; -import top.wms.admin.system.service.ClientService; +import top.mes.admin.auth.model.query.OnlineUserQuery; +import top.mes.admin.auth.service.OnlineUserService; +import top.mes.admin.system.mapper.ClientMapper; +import top.mes.admin.system.model.entity.ClientDO; +import top.mes.admin.system.model.query.ClientQuery; +import top.mes.admin.system.model.req.ClientReq; +import top.mes.admin.system.model.resp.ClientResp; +import top.mes.admin.system.service.ClientService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ConfigServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ConfigServiceImpl.java index bf285da..1e290cb 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ConfigServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,13 +7,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.extension.crud.service.BaseServiceImpl; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.system.mapper.ConfigMapper; -import top.wms.admin.system.model.entity.ConfigDO; -import top.wms.admin.system.model.query.ConfigQuery; -import top.wms.admin.system.model.req.ConfigReq; -import top.wms.admin.system.model.resp.ConfigResp; -import top.wms.admin.system.service.ConfigService; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.system.mapper.ConfigMapper; +import top.mes.admin.system.model.entity.ConfigDO; +import top.mes.admin.system.model.query.ConfigQuery; +import top.mes.admin.system.model.req.ConfigReq; +import top.mes.admin.system.model.resp.ConfigResp; +import top.mes.admin.system.service.ConfigService; import java.time.Duration; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DeptServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DeptServiceImpl.java index c4bd6ca..9f1cdd7 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DeptServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DeptServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.mapper.DeptMapper; -import top.wms.admin.system.model.entity.DeptDO; -import top.wms.admin.system.model.query.DeptQuery; -import top.wms.admin.system.model.req.DeptReq; -import top.wms.admin.system.model.resp.DeptResp; -import top.wms.admin.system.service.DeptService; -import top.wms.admin.system.service.RoleDeptService; -import top.wms.admin.system.service.UserService; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.mapper.DeptMapper; +import top.mes.admin.system.model.entity.DeptDO; +import top.mes.admin.system.model.query.DeptQuery; +import top.mes.admin.system.model.req.DeptReq; +import top.mes.admin.system.model.resp.DeptResp; +import top.mes.admin.system.service.DeptService; +import top.mes.admin.system.service.RoleDeptService; +import top.mes.admin.system.service.UserService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.core.enums.DatabaseType; import top.continew.starter.data.core.util.MetaUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictItemServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictItemServiceImpl.java index 2b4c1b6..08b249e 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictItemServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictItemServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ClassUtil; @@ -7,13 +7,13 @@ import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.system.mapper.DictItemMapper; -import top.wms.admin.system.model.entity.DictItemDO; -import top.wms.admin.system.model.query.DictItemQuery; -import top.wms.admin.system.model.req.DictItemReq; -import top.wms.admin.system.model.resp.DictItemResp; -import top.wms.admin.system.service.DictItemService; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.system.mapper.DictItemMapper; +import top.mes.admin.system.model.entity.DictItemDO; +import top.mes.admin.system.model.query.DictItemQuery; +import top.mes.admin.system.model.req.DictItemReq; +import top.mes.admin.system.model.resp.DictItemResp; +import top.mes.admin.system.service.DictItemService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.autoconfigure.project.ProjectProperties; import top.continew.starter.core.constant.StringConstants; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictServiceImpl.java index 8a7b427..e01d34f 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/DictServiceImpl.java @@ -1,14 +1,14 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.wms.admin.system.mapper.DictMapper; -import top.wms.admin.system.model.entity.DictDO; -import top.wms.admin.system.model.query.DictQuery; -import top.wms.admin.system.model.req.DictReq; -import top.wms.admin.system.model.resp.DictResp; -import top.wms.admin.system.service.DictItemService; -import top.wms.admin.system.service.DictService; +import top.mes.admin.system.mapper.DictMapper; +import top.mes.admin.system.model.entity.DictDO; +import top.mes.admin.system.model.query.DictQuery; +import top.mes.admin.system.model.req.DictReq; +import top.mes.admin.system.model.resp.DictResp; +import top.mes.admin.system.service.DictItemService; +import top.mes.admin.system.service.DictService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/FileServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/FileServiceImpl.java index 5f79e48..91604be 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/FileServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.file.FileNameUtil; @@ -14,16 +14,16 @@ import org.dromara.x.file.storage.core.ProgressListener; import org.dromara.x.file.storage.core.upload.UploadPretreatment; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import top.wms.admin.system.enums.FileTypeEnum; -import top.wms.admin.system.mapper.FileMapper; -import top.wms.admin.system.model.entity.FileDO; -import top.wms.admin.system.model.entity.StorageDO; -import top.wms.admin.system.model.query.FileQuery; -import top.wms.admin.system.model.req.FileReq; -import top.wms.admin.system.model.resp.file.FileResp; -import top.wms.admin.system.model.resp.file.FileStatisticsResp; -import top.wms.admin.system.service.FileService; -import top.wms.admin.system.service.StorageService; +import top.mes.admin.system.enums.FileTypeEnum; +import top.mes.admin.system.mapper.FileMapper; +import top.mes.admin.system.model.entity.FileDO; +import top.mes.admin.system.model.entity.StorageDO; +import top.mes.admin.system.model.query.FileQuery; +import top.mes.admin.system.model.req.FileReq; +import top.mes.admin.system.model.resp.file.FileResp; +import top.mes.admin.system.model.resp.file.FileStatisticsResp; +import top.mes.admin.system.service.FileService; +import top.mes.admin.system.service.StorageService; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.StrUtils; import top.continew.starter.core.util.URLUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ImportExcelServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ImportExcelServiceImpl.java index 8278fb6..30ee9a3 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ImportExcelServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/ImportExcelServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.CharsetUtil; @@ -7,7 +7,7 @@ import cn.hutool.json.JSONUtil; import jakarta.servlet.http.HttpServletResponse; import net.dreamlu.mica.core.result.R; import top.continew.starter.web.util.FileUploadUtils; -import top.wms.admin.system.service.ImportExcelService; +import top.mes.admin.system.service.ImportExcelService; import java.io.IOException; import lombok.extern.slf4j.Slf4j; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/LogServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/LogServiceImpl.java index bea9cbe..376d4e7 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/LogServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/LogServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; @@ -11,15 +11,15 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.mapper.LogMapper; -import top.wms.admin.system.model.entity.LogDO; -import top.wms.admin.system.model.query.LogQuery; -import top.wms.admin.system.model.resp.log.LogDetailResp; -import top.wms.admin.system.model.resp.log.LogResp; -import top.wms.admin.system.model.resp.log.LoginLogExportResp; -import top.wms.admin.system.model.resp.log.OperationLogExportResp; -import top.wms.admin.system.service.LogService; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.mapper.LogMapper; +import top.mes.admin.system.model.entity.LogDO; +import top.mes.admin.system.model.query.LogQuery; +import top.mes.admin.system.model.resp.log.LogDetailResp; +import top.mes.admin.system.model.resp.log.LogResp; +import top.mes.admin.system.model.resp.log.LoginLogExportResp; +import top.mes.admin.system.model.resp.log.OperationLogExportResp; +import top.mes.admin.system.service.LogService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.mp.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/MenuServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/MenuServiceImpl.java index d3b4faf..6699813 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/MenuServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; @@ -6,16 +6,16 @@ import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.system.enums.MenuTypeEnum; -import top.wms.admin.system.mapper.MenuMapper; -import top.wms.admin.system.model.entity.MenuDO; -import top.wms.admin.system.model.query.MenuQuery; -import top.wms.admin.system.model.req.MenuReq; -import top.wms.admin.system.model.resp.MenuResp; -import top.wms.admin.system.service.MenuService; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.system.enums.MenuTypeEnum; +import top.mes.admin.system.mapper.MenuMapper; +import top.mes.admin.system.model.entity.MenuDO; +import top.mes.admin.system.model.query.MenuQuery; +import top.mes.admin.system.model.req.MenuReq; +import top.mes.admin.system.model.resp.MenuResp; +import top.mes.admin.system.service.MenuService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.validation.CheckUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/OptionServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/OptionServiceImpl.java index cf6e61b..f999607 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/OptionServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/OptionServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -9,16 +9,16 @@ import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.system.enums.OptionCategoryEnum; -import top.wms.admin.system.enums.PasswordPolicyEnum; -import top.wms.admin.system.mapper.OptionMapper; -import top.wms.admin.system.model.entity.OptionDO; -import top.wms.admin.system.model.query.OptionQuery; -import top.wms.admin.system.model.req.OptionReq; -import top.wms.admin.system.model.req.OptionResetValueReq; -import top.wms.admin.system.model.resp.OptionResp; -import top.wms.admin.system.service.OptionService; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.system.enums.OptionCategoryEnum; +import top.mes.admin.system.enums.PasswordPolicyEnum; +import top.mes.admin.system.mapper.OptionMapper; +import top.mes.admin.system.model.entity.OptionDO; +import top.mes.admin.system.model.query.OptionQuery; +import top.mes.admin.system.model.req.OptionReq; +import top.mes.admin.system.model.req.OptionResetValueReq; +import top.mes.admin.system.model.resp.OptionResp; +import top.mes.admin.system.service.OptionService; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.validation.CheckUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleDeptServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleDeptServiceImpl.java index e91d011..5282c5c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleDeptServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleDeptServiceImpl.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.system.mapper.RoleDeptMapper; -import top.wms.admin.system.model.entity.RoleDeptDO; -import top.wms.admin.system.service.RoleDeptService; +import top.mes.admin.system.mapper.RoleDeptMapper; +import top.mes.admin.system.model.entity.RoleDeptDO; +import top.mes.admin.system.service.RoleDeptService; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleMenuServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleMenuServiceImpl.java index ed70f84..07e00d6 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleMenuServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleMenuServiceImpl.java @@ -1,12 +1,12 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.system.mapper.RoleMenuMapper; -import top.wms.admin.system.model.entity.RoleMenuDO; -import top.wms.admin.system.service.RoleMenuService; +import top.mes.admin.system.mapper.RoleMenuMapper; +import top.mes.admin.system.model.entity.RoleMenuDO; +import top.mes.admin.system.service.RoleMenuService; import java.util.ArrayList; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleServiceImpl.java index 231160f..7763d94 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -9,22 +9,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.common.context.RoleContext; -import top.wms.admin.common.context.UserContext; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.enums.DataScopeEnum; -import top.wms.admin.system.mapper.RoleMapper; -import top.wms.admin.system.model.entity.RoleDO; -import top.wms.admin.system.model.query.RoleQuery; -import top.wms.admin.system.model.req.RoleReq; -import top.wms.admin.system.model.req.RoleUpdatePermissionReq; -import top.wms.admin.system.model.resp.MenuResp; -import top.wms.admin.system.model.resp.role.RoleDetailResp; -import top.wms.admin.system.model.resp.role.RoleResp; -import top.wms.admin.system.service.*; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.common.context.RoleContext; +import top.mes.admin.common.context.UserContext; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.enums.DataScopeEnum; +import top.mes.admin.system.mapper.RoleMapper; +import top.mes.admin.system.model.entity.RoleDO; +import top.mes.admin.system.model.query.RoleQuery; +import top.mes.admin.system.model.req.RoleReq; +import top.mes.admin.system.model.req.RoleUpdatePermissionReq; +import top.mes.admin.system.model.resp.MenuResp; +import top.mes.admin.system.model.resp.role.RoleDetailResp; +import top.mes.admin.system.model.resp.role.RoleResp; +import top.mes.admin.system.service.*; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.extension.crud.service.BaseServiceImpl; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/StorageServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/StorageServiceImpl.java index 647f2fb..097ad42 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/StorageServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/StorageServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.MapUtil; @@ -12,18 +12,18 @@ import org.dromara.x.file.storage.core.FileStorageServiceBuilder; import org.dromara.x.file.storage.core.platform.FileStorage; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.model.req.CommonStatusUpdateReq; -import top.wms.admin.common.util.SecureUtils; -import top.wms.admin.system.enums.StorageTypeEnum; -import top.wms.admin.system.mapper.StorageMapper; -import top.wms.admin.system.model.entity.StorageDO; -import top.wms.admin.system.model.query.StorageQuery; -import top.wms.admin.system.model.req.StorageReq; -import top.wms.admin.system.model.resp.StorageResp; -import top.wms.admin.system.service.FileService; -import top.wms.admin.system.service.StorageService; -import top.wms.admin.system.validation.ValidationGroup; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.model.req.CommonStatusUpdateReq; +import top.mes.admin.common.util.SecureUtils; +import top.mes.admin.system.enums.StorageTypeEnum; +import top.mes.admin.system.mapper.StorageMapper; +import top.mes.admin.system.model.entity.StorageDO; +import top.mes.admin.system.model.query.StorageQuery; +import top.mes.admin.system.model.req.StorageReq; +import top.mes.admin.system.model.resp.StorageResp; +import top.mes.admin.system.service.FileService; +import top.mes.admin.system.service.StorageService; +import top.mes.admin.system.validation.ValidationGroup; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.URLUtils; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserPasswordHistoryServiceImpl.java index eb9ab0b..0177fa2 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserPasswordHistoryServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserPasswordHistoryServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.system.mapper.UserPasswordHistoryMapper; -import top.wms.admin.system.model.entity.UserPasswordHistoryDO; -import top.wms.admin.system.service.UserPasswordHistoryService; +import top.mes.admin.system.mapper.UserPasswordHistoryMapper; +import top.mes.admin.system.model.entity.UserPasswordHistoryDO; +import top.mes.admin.system.service.UserPasswordHistoryService; import java.util.List; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserRoleServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserRoleServiceImpl.java index a692fcd..fcc1eef 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserRoleServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserRoleServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.crane4j.annotation.ContainerMethod; @@ -11,13 +11,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.system.mapper.UserRoleMapper; -import top.wms.admin.system.model.entity.UserRoleDO; -import top.wms.admin.system.model.query.RoleUserQuery; -import top.wms.admin.system.model.resp.role.RoleUserResp; -import top.wms.admin.system.service.UserRoleService; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.system.mapper.UserRoleMapper; +import top.mes.admin.system.model.entity.UserRoleDO; +import top.mes.admin.system.model.query.RoleUserQuery; +import top.mes.admin.system.model.resp.role.RoleUserResp; +import top.mes.admin.system.service.UserRoleService; import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.data.mp.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserServiceImpl.java index fcef782..361517c 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserServiceImpl.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; @@ -41,29 +41,29 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import top.wms.admin.auth.service.OnlineUserService; -import top.wms.admin.common.constant.CacheConstants; -import top.wms.admin.common.constant.ContainerConstants; -import top.wms.admin.common.constant.SysConstants; -import top.wms.admin.common.context.UserContext; -import top.wms.admin.common.context.UserContextHolder; -import top.wms.admin.common.enums.DisEnableStatusEnum; -import top.wms.admin.common.enums.GenderEnum; -import top.wms.admin.common.service.CommonUserService; -import top.wms.admin.common.util.SecureUtils; -import top.wms.admin.system.enums.OptionCategoryEnum; -import top.wms.admin.system.mapper.UserMapper; -import top.wms.admin.system.model.entity.DeptDO; -import top.wms.admin.system.model.entity.RoleDO; -import top.wms.admin.system.model.entity.UserDO; -import top.wms.admin.system.model.entity.UserRoleDO; -import top.wms.admin.system.model.query.UserQuery; -import top.wms.admin.system.model.req.user.*; -import top.wms.admin.system.model.resp.user.UserDetailResp; -import top.wms.admin.system.model.resp.user.UserImportParseResp; -import top.wms.admin.system.model.resp.user.UserImportResp; -import top.wms.admin.system.model.resp.user.UserResp; -import top.wms.admin.system.service.*; +import top.mes.admin.auth.service.OnlineUserService; +import top.mes.admin.common.constant.CacheConstants; +import top.mes.admin.common.constant.ContainerConstants; +import top.mes.admin.common.constant.SysConstants; +import top.mes.admin.common.context.UserContext; +import top.mes.admin.common.context.UserContextHolder; +import top.mes.admin.common.enums.DisEnableStatusEnum; +import top.mes.admin.common.enums.GenderEnum; +import top.mes.admin.common.service.CommonUserService; +import top.mes.admin.common.util.SecureUtils; +import top.mes.admin.system.enums.OptionCategoryEnum; +import top.mes.admin.system.mapper.UserMapper; +import top.mes.admin.system.model.entity.DeptDO; +import top.mes.admin.system.model.entity.RoleDO; +import top.mes.admin.system.model.entity.UserDO; +import top.mes.admin.system.model.entity.UserRoleDO; +import top.mes.admin.system.model.query.UserQuery; +import top.mes.admin.system.model.req.user.*; +import top.mes.admin.system.model.resp.user.UserDetailResp; +import top.mes.admin.system.model.resp.user.UserImportParseResp; +import top.mes.admin.system.model.resp.user.UserImportResp; +import top.mes.admin.system.model.resp.user.UserResp; +import top.mes.admin.system.service.*; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; @@ -82,8 +82,8 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import static top.wms.admin.system.enums.ImportPolicyEnum.*; -import static top.wms.admin.system.enums.PasswordPolicyEnum.*; +import static top.mes.admin.system.enums.ImportPolicyEnum.*; +import static top.mes.admin.system.enums.PasswordPolicyEnum.*; /** * 用户业务实现 diff --git a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserSocialServiceImpl.java b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserSocialServiceImpl.java index c804012..c7d822b 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserSocialServiceImpl.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/service/impl/UserSocialServiceImpl.java @@ -1,13 +1,13 @@ -package top.wms.admin.system.service.impl; +package top.mes.admin.system.service.impl; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthUser; import org.springframework.stereotype.Service; -import top.wms.admin.system.enums.SocialSourceEnum; -import top.wms.admin.system.mapper.UserSocialMapper; -import top.wms.admin.system.model.entity.UserSocialDO; -import top.wms.admin.system.service.UserSocialService; +import top.mes.admin.system.enums.SocialSourceEnum; +import top.mes.admin.system.mapper.UserSocialMapper; +import top.mes.admin.system.model.entity.UserSocialDO; +import top.mes.admin.system.service.UserSocialService; import top.continew.starter.core.validation.CheckUtils; import java.time.LocalDateTime; diff --git a/mes-module-system/src/main/java/top/mes/admin/system/validation/ValidationGroup.java b/mes-module-system/src/main/java/top/mes/admin/system/validation/ValidationGroup.java index 200221e..26a82a1 100644 --- a/mes-module-system/src/main/java/top/mes/admin/system/validation/ValidationGroup.java +++ b/mes-module-system/src/main/java/top/mes/admin/system/validation/ValidationGroup.java @@ -1,4 +1,4 @@ -package top.wms.admin.system.validation; +package top.mes.admin.system.validation; import jakarta.validation.groups.Default; diff --git a/mes-module-system/src/main/resources/mapper/DeptMapper.xml b/mes-module-system/src/main/resources/mapper/DeptMapper.xml index 7e14587..39ab168 100644 --- a/mes-module-system/src/main/resources/mapper/DeptMapper.xml +++ b/mes-module-system/src/main/resources/mapper/DeptMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/mes-module-system/src/main/resources/mapper/DictItemMapper.xml b/mes-module-system/src/main/resources/mapper/DictItemMapper.xml index 108771f..3a642ee 100644 --- a/mes-module-system/src/main/resources/mapper/DictItemMapper.xml +++ b/mes-module-system/src/main/resources/mapper/DictItemMapper.xml @@ -1,6 +1,6 @@ - + + + - SELECT t1.id, t1.description, diff --git a/mes-module-system/src/main/resources/mapper/MenuMapper.xml b/mes-module-system/src/main/resources/mapper/MenuMapper.xml index e445e25..ee591ca 100644 --- a/mes-module-system/src/main/resources/mapper/MenuMapper.xml +++ b/mes-module-system/src/main/resources/mapper/MenuMapper.xml @@ -1,6 +1,6 @@ - + - SELECT t1.* FROM sys_menu AS t1 LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id diff --git a/mes-module-system/src/main/resources/mapper/RoleMapper.xml b/mes-module-system/src/main/resources/mapper/RoleMapper.xml index 23e1f43..2811afd 100644 --- a/mes-module-system/src/main/resources/mapper/RoleMapper.xml +++ b/mes-module-system/src/main/resources/mapper/RoleMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/mes-module-system/src/main/resources/mapper/RoleMenuMapper.xml b/mes-module-system/src/main/resources/mapper/RoleMenuMapper.xml index 30c501b..97feade 100644 --- a/mes-module-system/src/main/resources/mapper/RoleMenuMapper.xml +++ b/mes-module-system/src/main/resources/mapper/RoleMenuMapper.xml @@ -1,6 +1,6 @@ - + + - ${ew.customSqlSegment} diff --git a/mes-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml b/mes-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml index d82044c..6e7569f 100644 --- a/mes-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml +++ b/mes-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml @@ -1,6 +1,6 @@ - + DELETE t1 FROM sys_user_password_history AS t1 LEFT JOIN ( diff --git a/mes-module-system/src/main/resources/mapper/UserRoleMapper.xml b/mes-module-system/src/main/resources/mapper/UserRoleMapper.xml index f01b4e9..5490556 100644 --- a/mes-module-system/src/main/resources/mapper/UserRoleMapper.xml +++ b/mes-module-system/src/main/resources/mapper/UserRoleMapper.xml @@ -1,8 +1,8 @@ - + - SELECT t1.*, t2.nickname, diff --git a/mes-module-system/src/main/resources/mapper/UserSocialMapper.xml b/mes-module-system/src/main/resources/mapper/UserSocialMapper.xml index 4fee4e7..2b68177 100644 --- a/mes-module-system/src/main/resources/mapper/UserSocialMapper.xml +++ b/mes-module-system/src/main/resources/mapper/UserSocialMapper.xml @@ -1,8 +1,8 @@ - +