From 3f2a306cad1d15436ae36c1b2eb54f28b50e84b9 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 20 Feb 2024 21:39:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(data):=20=E8=B0=83=E6=95=B4=20Query=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=B1=BB=E5=88=B0=20data-core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/starter/data/core/annotation}/Query.java | 4 +++- .../continew/starter/data/core/annotation}/QueryIgnore.java | 2 +- .../continew/starter/data/core/enums}/QueryType.java | 2 +- .../starter/data/mybatis/plus/query/QueryWrapperHelper.java | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) rename continew-starter-data/{continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query => continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation}/Query.java (91%) rename continew-starter-data/{continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query => continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation}/QueryIgnore.java (93%) rename continew-starter-data/{continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query => continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums}/QueryType.java (96%) diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/Query.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/Query.java similarity index 91% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/Query.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/Query.java index 96315569..b1900017 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/Query.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/Query.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.query; +package top.charles7c.continew.starter.data.core.annotation; + +import top.charles7c.continew.starter.data.core.enums.QueryType; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryIgnore.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/QueryIgnore.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryIgnore.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/QueryIgnore.java index 69d654c9..29da4096 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryIgnore.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/QueryIgnore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.query; +package top.charles7c.continew.starter.data.core.annotation; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryType.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/QueryType.java similarity index 96% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryType.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/QueryType.java index cc06a6e3..9d3eaeb5 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryType.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/QueryType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.query; +package top.charles7c.continew.starter.data.core.enums; /** * 查询类型枚举 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java index a602a921..81ece739 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java @@ -26,6 +26,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.core.annotation.Query; +import top.charles7c.continew.starter.data.core.annotation.QueryIgnore; +import top.charles7c.continew.starter.data.core.enums.QueryType; import java.lang.reflect.Field; import java.util.ArrayList;