refactor: 适配 ContiNew Starter Query 组件的包结构优化

continew-org · Feb 20, 2024 · 6be1b6c · 6be1b6c
1 parent 78438bb
commit 6be1b6c
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 38 deletions.
diff --git a/...monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java b/...monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java
@@ -20,8 +20,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...tor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java b/...tor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java
@@ -20,8 +20,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...onitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java b/...onitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java
@@ -20,8 +20,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...stem/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java b/...stem/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java b/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java b/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java b/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...in-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java b/...in-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java
@@ -18,9 +18,9 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryIgnore;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+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.io.Serial;
 import java.io.Serializable;

diff --git a/...min-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java b/...min-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java
@@ -16,18 +16,15 @@
 
 package top.charles7c.continew.admin.system.model.query;
 
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-
 import lombok.Data;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * 参数查询条件

diff --git a/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java b/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...in-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java b/...in-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java
@@ -18,8 +18,8 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java b/...admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java
@@ -20,8 +20,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 import java.io.Serial;
 import java.io.Serializable;

diff --git a/...ystem/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java b/...ystem/src/main/java/top/charles7c/continew/admin/system/service/impl/DeptServiceImpl.java
@@ -159,7 +159,8 @@ private DeptDO getByParentId(Long parentId) {
  * @return 子部门列表
  */
  private List<DeptDO> listChildren(Long id) {
- DatabaseType databaseType = MetaUtils.getDatabaseTypeOrDefault(SpringUtil.getBean(DynamicRoutingDataSource.class), DatabaseType.MYSQL);
+ DatabaseType databaseType = MetaUtils.getDatabaseTypeOrDefault(SpringUtil
+ .getBean(DynamicRoutingDataSource.class), DatabaseType.MYSQL);
  return baseMapper.lambdaQuery().apply(databaseType.findInSet(id, "ancestors")).list();
  }
 
@@ -174,7 +175,8 @@ private Long countChildren(List<Long> ids) {
  if (CollUtil.isEmpty(ids)) {
  return 0L;
  }
- DatabaseType databaseType = MetaUtils.getDatabaseTypeOrDefault(SpringUtil.getBean(DynamicRoutingDataSource.class), DatabaseType.MYSQL);
+ DatabaseType databaseType = MetaUtils.getDatabaseTypeOrDefault(SpringUtil
+ .getBean(DynamicRoutingDataSource.class), DatabaseType.MYSQL);
  return ids.stream()
  .mapToLong(id -> baseMapper.lambdaQuery().apply(databaseType.findInSet(id, "ancestors")).count())
  .sum();

diff --git a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
@@ -16,8 +16,8 @@ import lombok.Data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
+import top.charles7c.continew.starter.data.core.annotation.Query;
+import top.charles7c.continew.starter.data.core.enums.QueryType;
 
 /**
  * ${businessName}查询条件