From 083bc7b38a861339ceb7a06acdd20ea64bc84990 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 5 Dec 2023 20:57:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=86=85=E5=AE=B9=E6=89=80=E5=B1=9E=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.校验等工具类 crud => core 2.@Query crud => mybatis-plus --- .../starter/core}/exception/BadRequestException.java | 3 +-- .../starter/core}/exception/BusinessException.java | 3 +-- .../continew/starter/core}/util/ReflectUtils.java | 2 +- .../starter/core}/util/validate/CheckUtils.java | 4 ++-- .../starter/core}/util/validate/ValidationUtils.java | 4 ++-- .../starter/core}/util/validate/Validator.java | 2 +- .../starter/data/mybatis/plus}/annotation/Query.java | 4 ++-- .../starter/data/mybatis/plus/enums}/IBaseEnum.java | 2 +- .../data/mybatis/plus}/enums/QueryTypeEnum.java | 3 +-- .../starter/data/mybatis/plus}/util/QueryHelper.java | 11 ++++++----- .../starter/extension/crud/base/BaseServiceImpl.java | 6 +++--- .../starter/extension/crud/util/TreeUtils.java | 2 +- 12 files changed, 22 insertions(+), 24 deletions(-) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-core/src/main/java/top/charles7c/continew/starter/core}/exception/BadRequestException.java (87%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-core/src/main/java/top/charles7c/continew/starter/core}/exception/BusinessException.java (86%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-core/src/main/java/top/charles7c/continew/starter/core}/util/ReflectUtils.java (97%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-core/src/main/java/top/charles7c/continew/starter/core}/util/validate/CheckUtils.java (98%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-core/src/main/java/top/charles7c/continew/starter/core}/util/validate/ValidationUtils.java (97%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-core/src/main/java/top/charles7c/continew/starter/core}/util/validate/Validator.java (98%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus}/annotation/Query.java (90%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base => continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums}/IBaseEnum.java (94%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus}/enums/QueryTypeEnum.java (94%) rename {continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud => continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus}/util/QueryHelper.java (93%) diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/exception/BadRequestException.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BadRequestException.java similarity index 87% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/exception/BadRequestException.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BadRequestException.java index 32aacde1..48197912 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/exception/BadRequestException.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BadRequestException.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.exception; +package top.charles7c.continew.starter.core.exception; import lombok.NoArgsConstructor; -import top.charles7c.continew.starter.core.exception.BaseException; /** * 自定义验证异常-错误请求 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/exception/BusinessException.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BusinessException.java similarity index 86% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/exception/BusinessException.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BusinessException.java index e24ea14b..10cfe9e8 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/exception/BusinessException.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BusinessException.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.exception; +package top.charles7c.continew.starter.core.exception; import lombok.NoArgsConstructor; -import top.charles7c.continew.starter.core.exception.BaseException; /** * 业务异常 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/ReflectUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ReflectUtils.java similarity index 97% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/ReflectUtils.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ReflectUtils.java index e2253c54..816b9c7f 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/ReflectUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ReflectUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util; +package top.charles7c.continew.starter.core.util; import cn.hutool.core.util.ReflectUtil; import lombok.AccessLevel; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/CheckUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java similarity index 98% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/CheckUtils.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java index 7bdced75..cf153047 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/CheckUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util.validate; +package top.charles7c.continew.starter.core.util.validate; import cn.hutool.core.util.StrUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.extension.crud.exception.BusinessException; +import top.charles7c.continew.starter.core.exception.BusinessException; import java.util.function.BooleanSupplier; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/ValidationUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/ValidationUtils.java similarity index 97% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/ValidationUtils.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/ValidationUtils.java index 18e2c368..b1d25811 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/ValidationUtils.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/ValidationUtils.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util.validate; +package top.charles7c.continew.starter.core.util.validate; import cn.hutool.core.util.StrUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import top.charles7c.continew.starter.extension.crud.exception.BadRequestException; +import top.charles7c.continew.starter.core.exception.BadRequestException; import java.util.function.BooleanSupplier; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/Validator.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/Validator.java similarity index 98% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/Validator.java rename to continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/Validator.java index 5731c8c2..ee43f605 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/validate/Validator.java +++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/Validator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util.validate; +package top.charles7c.continew.starter.core.util.validate; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/Query.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/annotation/Query.java similarity index 90% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/Query.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/annotation/Query.java index 4f15be77..c10cc2b6 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/Query.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/annotation/Query.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.annotation; +package top.charles7c.continew.starter.data.mybatis.plus.annotation; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; import java.lang.annotation.*; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/IBaseEnum.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/IBaseEnum.java similarity index 94% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/IBaseEnum.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/IBaseEnum.java index c6c60a64..fb32c320 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/IBaseEnum.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/IBaseEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.base; +package top.charles7c.continew.starter.data.mybatis.plus.enums; import com.baomidou.mybatisplus.annotation.IEnum; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/enums/QueryTypeEnum.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/QueryTypeEnum.java similarity index 94% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/enums/QueryTypeEnum.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/QueryTypeEnum.java index d05d2ffc..e2e09ea1 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/enums/QueryTypeEnum.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/QueryTypeEnum.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.enums; +package top.charles7c.continew.starter.data.mybatis.plus.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; /** * 查询类型枚举 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/QueryHelper.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/util/QueryHelper.java similarity index 93% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/QueryHelper.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/util/QueryHelper.java index 78f73783..b2c28a6b 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/QueryHelper.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/util/QueryHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util; +package top.charles7c.continew.starter.data.mybatis.plus.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; @@ -23,10 +23,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import top.charles7c.continew.starter.extension.crud.annotation.Query; -import top.charles7c.continew.starter.extension.crud.enums.QueryTypeEnum; -import top.charles7c.continew.starter.extension.crud.exception.BadRequestException; -import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; +import top.charles7c.continew.starter.core.exception.BadRequestException; +import top.charles7c.continew.starter.core.util.ReflectUtils; +import top.charles7c.continew.starter.core.util.validate.ValidationUtils; +import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; +import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java index c6ba2883..ce4f4d57 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseServiceImpl.java @@ -34,14 +34,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.transaction.annotation.Transactional; import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.charles7c.continew.starter.core.util.ReflectUtils; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper; import top.charles7c.continew.starter.extension.crud.annotation.TreeField; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; -import top.charles7c.continew.starter.extension.crud.util.QueryHelper; -import top.charles7c.continew.starter.extension.crud.util.ReflectUtils; import top.charles7c.continew.starter.extension.crud.util.TreeUtils; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; import top.charles7c.continew.starter.file.excel.util.ExcelUtils; import java.lang.reflect.Field; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java index dae1eb12..048f5605 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java @@ -24,8 +24,8 @@ import cn.hutool.core.lang.tree.parser.NodeParser; import cn.hutool.core.util.ReflectUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import top.charles7c.continew.starter.core.util.validate.CheckUtils; import top.charles7c.continew.starter.extension.crud.annotation.TreeField; -import top.charles7c.continew.starter.extension.crud.util.validate.CheckUtils; import java.util.ArrayList; import java.util.List;