style: 适配 ContiNew Starter QueryTypeEnum 命名变更

continew-org · Dec 13, 2023 · 97c273f · 97c273f
1 parent 3fdc50d
commit 97c273f
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 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
@@ -30,7 +30,7 @@
 import cn.hutool.core.date.DatePattern;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 登录日志查询条件
@@ -56,7 +56,7 @@ public class LoginLogQuery implements Serializable {
  * 登录时间
  */
  @Schema(description = "登录时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59")
- @Query(type = QueryTypeEnum.BETWEEN)
+ @Query(type = QueryType.BETWEEN)
  @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
  private List<Date> createTime;
 }
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
@@ -30,7 +30,7 @@
 import cn.hutool.core.date.DatePattern;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 操作日志查询条件
@@ -49,7 +49,7 @@ public class OperationLogQuery implements Serializable {
  * 操作内容
  */
  @Schema(description = "操作内容", example = "新增数据")
- @Query(type = QueryTypeEnum.INNER_LIKE)
+ @Query(type = QueryType.INNER_LIKE)
  private String description;
 
  /**
@@ -63,7 +63,7 @@ public class OperationLogQuery implements Serializable {
  * 操作时间
  */
  @Schema(description = "操作时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59")
- @Query(type = QueryTypeEnum.BETWEEN)
+ @Query(type = QueryType.BETWEEN)
  @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
  private List<Date> createTime;
 

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
@@ -30,7 +30,7 @@
 import cn.hutool.core.date.DatePattern;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 系统日志查询条件
@@ -49,7 +49,7 @@ public class SystemLogQuery implements Serializable {
  * 创建时间
  */
  @Schema(description = "创建时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59")
- @Query(type = QueryTypeEnum.BETWEEN)
+ @Query(type = QueryType.BETWEEN)
  @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
  private List<Date> createTime;
 }
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
@@ -24,7 +24,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 公告查询条件
@@ -43,13 +43,13 @@ public class AnnouncementQuery implements Serializable {
  * 标题
  */
  @Schema(description = "标题", example = "这是公告标题")
- @Query(type = QueryTypeEnum.INNER_LIKE)
+ @Query(type = QueryType.INNER_LIKE)
  private String title;
 
  /**
  * 类型
  */
  @Schema(description = "类型", example = "1")
- @Query(type = QueryTypeEnum.EQUAL)
+ @Query(type = QueryType.EQUAL)
  private String type;
 }
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
@@ -24,7 +24,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 部门查询条件
@@ -43,7 +43,7 @@ public class DeptQuery implements Serializable {
  * 部门名称
  */
  @Schema(description = "部门名称", example = "测试部")
- @Query(type = QueryTypeEnum.INNER_LIKE)
+ @Query(type = QueryType.INNER_LIKE)
  private String name;
 
  /**

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
@@ -24,7 +24,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 菜单查询条件
@@ -43,7 +43,7 @@ public class MenuQuery implements Serializable {
  * 菜单标题
  */
  @Schema(description = "菜单标题", example = "用户管理")
- @Query(type = QueryTypeEnum.INNER_LIKE)
+ @Query(type = QueryType.INNER_LIKE)
  private String title;
 
  /**

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
@@ -23,7 +23,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 消息查询条件
@@ -48,7 +48,7 @@ public class MessageQuery implements Serializable {
  * 标题
  */
  @Schema(description = "标题", example = "欢迎注册 xxx")
- @Query(type = QueryTypeEnum.INNER_LIKE)
+ @Query(type = QueryType.INNER_LIKE)
  private String title;
 
  /**

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
@@ -27,7 +27,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 参数查询条件
@@ -47,6 +47,6 @@ public class OptionQuery implements Serializable {
  */
  @Schema(description = "参数键列表", example = "site_title,site_copyright")
  @NotEmpty(message = "参数键不能为空")
- @Query(type = QueryTypeEnum.IN)
+ @Query(type = QueryType.IN)
  private List<String> code;
 }
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
@@ -30,7 +30,7 @@
 import cn.hutool.core.date.DatePattern;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * 用户查询条件
@@ -63,7 +63,7 @@ public class UserQuery implements Serializable {
  * 创建时间
  */
  @Schema(description = "创建时间", example = "2023-08-08 00:00:00,2023-08-08 23:59:59")
- @Query(type = QueryTypeEnum.BETWEEN)
+ @Query(type = QueryType.BETWEEN)
  @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
  private List<Date> createTime;
 

diff --git a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
@@ -33,7 +33,7 @@ import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum;
+import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
 
 /**
  * ${businessName}查询条件
@@ -55,7 +55,7 @@ public class ${className} implements Serializable {
  * ${fieldConfig.comment}
  */
  @Schema(description = "${fieldConfig.comment}")
- @Query(type = QueryTypeEnum.${fieldConfig.queryType})
+ @Query(type = QueryType.${fieldConfig.queryType})
  <#if fieldConfig.queryType = 'IN' || fieldConfig.queryType = 'NOT_IN' || fieldConfig.queryType = 'BETWEEN'>
  private List<${fieldConfig.fieldType}> ${fieldConfig.fieldName};
  <#else>