zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: 适配 ContiNew Starter QueryTypeEnum 命名变更

Browse Source
This commit is contained in:
Charles7c 2023-12-13 23:45:46 +08:00
parent 3fdc50d78e
commit 97c273f99e
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java
View File

@ -30,7 +30,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; 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") @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) @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
private List<Date> createTime; private List<Date> createTime;
} }

6
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java
View File

@ -30,7 +30,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; 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 = "新增数据") @Schema(description = "操作内容", example = "新增数据")
@Query(type = QueryTypeEnum.INNER_LIKE) @Query(type = QueryType.INNER_LIKE)
private String description; 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") @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) @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
private List<Date> createTime; private List<Date> createTime;

4
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java
View File

@ -30,7 +30,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; 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") @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) @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
private List<Date> createTime; private List<Date> createTime;
} }

6
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java
View File

@ -24,7 +24,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; 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.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 = "这是公告标题") @Schema(description = "标题", example = "这是公告标题")
@Query(type = QueryTypeEnum.INNER_LIKE) @Query(type = QueryType.INNER_LIKE)
private String title; private String title;
/** /**
* 类型 * 类型
*/ */
@Schema(description = "类型", example = "1") @Schema(description = "类型", example = "1")
@Query(type = QueryTypeEnum.EQUAL) @Query(type = QueryType.EQUAL)
private String type; private String type;
} }

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java
View File

@ -24,7 +24,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; 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.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 = "测试部") @Schema(description = "部门名称", example = "测试部")
@Query(type = QueryTypeEnum.INNER_LIKE) @Query(type = QueryType.INNER_LIKE)
private String name; private String name;
/** /**

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
View File

@ -24,7 +24,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; 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.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 = "用户管理") @Schema(description = "菜单标题", example = "用户管理")
@Query(type = QueryTypeEnum.INNER_LIKE) @Query(type = QueryType.INNER_LIKE)
private String title; private String title;
/** /**

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java
View File

@ -23,7 +23,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; 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.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") @Schema(description = "标题", example = "欢迎注册 xxx")
@Query(type = QueryTypeEnum.INNER_LIKE) @Query(type = QueryType.INNER_LIKE)
private String title; private String title;
/** /**

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java
View File

@ -27,7 +27,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; 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.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") @Schema(description = "参数键列表", example = "site_title,site_copyright")
@NotEmpty(message = "参数键不能为空") @NotEmpty(message = "参数键不能为空")
@Query(type = QueryTypeEnum.IN) @Query(type = QueryType.IN)
private List<String> code; private List<String> code;
} }

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java
View File

@ -30,7 +30,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query; 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") @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) @DateTimeFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
private List<Date> createTime; private List<Date> createTime;

4
continew-admin-tool/src/main/resources/templates/generator/Query.ftl
View File

@ -33,7 +33,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; 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.annotation.Query;
import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryTypeEnum; import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
/** /**
* ${businessName}查询条件 * ${businessName}查询条件
@ -55,7 +55,7 @@ public class ${className} implements Serializable {
* ${fieldConfig.comment} * ${fieldConfig.comment}
*/ */
@Schema(description = "${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'> <#if fieldConfig.queryType = 'IN' || fieldConfig.queryType = 'NOT_IN' || fieldConfig.queryType = 'BETWEEN'>
private List<${fieldConfig.fieldType}> ${fieldConfig.fieldName}; private List<${fieldConfig.fieldType}> ${fieldConfig.fieldName};
<#else> <#else>