From 15b152008c6ae8ab89704d83a969dcfbbb8b5b88 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 24 Jan 2024 21:54:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20Query=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B3=A8=E8=A7=A3=E4=BD=BF=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/model/query/LoginLogQuery.java | 19 +++++++------------ .../model/query/OperationLogQuery.java | 1 - .../monitor/service/impl/LogServiceImpl.java | 8 ++++---- .../admin/auth/model/resp/UserInfoResp.java | 16 ++++++---------- .../system/model/query/AnnouncementQuery.java | 11 ++++------- .../admin/system/model/query/DeptQuery.java | 11 ++++------- .../system/model/query/DictItemQuery.java | 10 +++------- .../admin/system/model/query/FileQuery.java | 11 ++++------- .../admin/system/model/query/MenuQuery.java | 11 ++++------- .../system/model/query/MessageQuery.java | 13 ++++++------- .../admin/system/model/query/RoleQuery.java | 1 - .../system/model/query/StorageQuery.java | 11 ++++------- .../admin/system/model/query/UserQuery.java | 2 -- .../service/impl/MessageServiceImpl.java | 4 ++-- .../service/impl/OptionServiceImpl.java | 4 ++-- 15 files changed, 50 insertions(+), 83 deletions(-) diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java index 27650a77..2c5c0d0d 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java @@ -16,22 +16,18 @@ package top.charles7c.continew.admin.monitor.model.query; +import cn.hutool.core.date.DatePattern; +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 java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import org.springframework.format.annotation.DateTimeFormat; - -import cn.hutool.core.date.DatePattern; - -import top.charles7c.continew.starter.data.mybatis.plus.query.Query; -import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType; - /** * 登录日志查询条件 * @@ -49,7 +45,6 @@ public class LoginLogQuery implements Serializable { * 登录状态 */ @Schema(description = "登录状态（1：成功；2：失败）", example = "1") - @Query private Integer status; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java index c05c0b33..d0b73346 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java @@ -52,7 +52,6 @@ public class OperationLogQuery implements Serializable { * 操作状态 */ @Schema(description = "操作状态（1：成功；2：失败）", example = "1") - @Query private Integer status; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java index 4dce5087..e8d5d22b 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java @@ -34,7 +34,7 @@ import top.charles7c.continew.admin.monitor.model.resp.*; import top.charles7c.continew.admin.monitor.service.LogService; 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.query.QueryHelper; +import top.charles7c.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; @@ -58,7 +58,7 @@ public class LogServiceImpl implements LogService { @Override @AutoOperate(type = OperationLogResp.class, on = "list") public PageResp page(OperationLogQuery query, PageQuery pageQuery) { - QueryWrapper queryWrapper = QueryHelper.build(query); + QueryWrapper queryWrapper = QueryWrapperHelper.build(query); // 限定查询信息 List fieldNameList = ReflectUtils.getNonStaticFieldsName(OperationLogResp.class); List columnNameList = fieldNameList.stream() @@ -74,7 +74,7 @@ public class LogServiceImpl implements LogService { @Override @AutoOperate(type = LoginLogResp.class, on = "list") public PageResp page(LoginLogQuery query, PageQuery pageQuery) { - QueryWrapper queryWrapper = QueryHelper.build(query); + QueryWrapper queryWrapper = QueryWrapperHelper.build(query); queryWrapper.eq("module", "登录"); // 限定查询信息 List fieldNameList = ReflectUtils.getNonStaticFieldsName(LoginLogResp.class); @@ -91,7 +91,7 @@ public class LogServiceImpl implements LogService { @Override @AutoOperate(type = SystemLogResp.class, on = "list") public PageResp page(SystemLogQuery query, PageQuery pageQuery) { - QueryWrapper queryWrapper = QueryHelper.build(query); + QueryWrapper queryWrapper = QueryWrapperHelper.build(query); // 限定查询信息 List fieldNameList = ReflectUtils.getNonStaticFieldsName(SystemLogResp.class); List columnNameList = fieldNameList.stream() diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java index a10d8fef..8ccdd5ad 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/model/resp/UserInfoResp.java @@ -16,22 +16,18 @@ package top.charles7c.continew.admin.auth.model.resp; +import cn.hutool.core.util.DesensitizedUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import top.charles7c.continew.admin.common.enums.GenderEnum; + import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Set; -import lombok.Data; - -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonIgnore; - -import cn.hutool.core.util.DesensitizedUtil; - -import top.charles7c.continew.admin.common.enums.GenderEnum; - /** * 用户信息 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java index 1e8c23bd..ba23e75d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java @@ -16,16 +16,14 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serial; -import java.io.Serializable; - -import lombok.Data; - 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 java.io.Serial; +import java.io.Serializable; + /** * 公告查询条件 * @@ -50,6 +48,5 @@ public class AnnouncementQuery implements Serializable { * 类型 */ @Schema(description = "类型", example = "1") - @Query private String type; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java index 4bde3fbb..ce1b1852 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java @@ -16,16 +16,14 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serial; -import java.io.Serializable; - -import lombok.Data; - 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 java.io.Serial; +import java.io.Serializable; + /** * 部门查询条件 * @@ -50,6 +48,5 @@ public class DeptQuery implements Serializable { * 状态 */ @Schema(description = "状态（1：启用；2：禁用）", example = "1") - @Query private Integer status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java index d25de8ca..75f332fa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java @@ -16,14 +16,11 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serial; -import java.io.Serializable; - +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; - -import top.charles7c.continew.starter.data.mybatis.plus.query.Query; +import java.io.Serial; +import java.io.Serializable; /** * 字典项查询条件 @@ -42,6 +39,5 @@ public class DictItemQuery implements Serializable { * 字典 ID */ @Schema(description = "字典 ID") - @Query private Long dictId; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java index 47decc11..251bd8d7 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/FileQuery.java @@ -16,16 +16,14 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serial; -import java.io.Serializable; - -import lombok.Data; - 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 java.io.Serial; +import java.io.Serializable; + /** * 文件查询条件 * @@ -50,6 +48,5 @@ public class FileQuery implements Serializable { * 类型 */ @Schema(description = "类型") - @Query private Integer type; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java index 765dabfa..20f80939 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java @@ -16,16 +16,14 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serial; -import java.io.Serializable; - -import lombok.Data; - 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 java.io.Serial; +import java.io.Serializable; + /** * 菜单查询条件 * @@ -50,6 +48,5 @@ public class MenuQuery implements Serializable { * 状态 */ @Schema(description = "状态（1：启用；2：禁用）", example = "1") - @Query private Integer status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java index 9f7b586d..d112c7d2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java @@ -16,15 +16,14 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serializable; - -import lombok.Data; - 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 java.io.Serializable; + /** * 消息查询条件 * @@ -41,7 +40,6 @@ public class MessageQuery implements Serializable { * ID */ @Schema(description = "ID", example = "1") - @Query private Long id; /** @@ -55,18 +53,19 @@ public class MessageQuery implements Serializable { * 类型 */ @Schema(description = "类型（1：系统消息）", example = "1") - @Query private Integer type; /** * 是否已读 */ @Schema(description = "是否已读", example = "true") + @QueryIgnore private Boolean isRead; /** * 用户 ID */ @Schema(hidden = true) + @QueryIgnore private Long userId; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java index 8fd24ad9..f13414db 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java @@ -48,6 +48,5 @@ public class RoleQuery implements Serializable { * 状态 */ @Schema(description = "状态（1：启用；2：禁用）", example = "1") - @Query private Integer status; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java index a88f2e4a..a51c404f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/StorageQuery.java @@ -16,16 +16,14 @@ package top.charles7c.continew.admin.system.model.query; -import java.io.Serial; -import java.io.Serializable; - -import lombok.Data; - 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 java.io.Serial; +import java.io.Serializable; + /** * 存储库查询条件 * @@ -50,6 +48,5 @@ public class StorageQuery implements Serializable { * 状态 */ @Schema(description = "状态") - @Query private Integer status; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java index 4e9b5b8d..e0dbe8f3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java @@ -52,7 +52,6 @@ public class UserQuery implements Serializable { * 状态 */ @Schema(description = "状态（1：启用；2：禁用）", example = "1") - @Query private Integer status; /** @@ -67,6 +66,5 @@ public class UserQuery implements Serializable { * 部门 ID */ @Schema(description = "部门 ID", example = "1") - @Query private Long deptId; } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java index 0174c63c..2b0d6079 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java @@ -32,7 +32,7 @@ import top.charles7c.continew.admin.system.model.resp.MessageResp; import top.charles7c.continew.admin.system.service.MessageService; import top.charles7c.continew.admin.system.service.MessageUserService; import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.data.mybatis.plus.query.QueryHelper; +import top.charles7c.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; @@ -54,7 +54,7 @@ public class MessageServiceImpl implements MessageService { @Override @AutoOperate(type = MessageResp.class, on = "list") public PageResp page(MessageQuery query, PageQuery pageQuery) { - QueryWrapper queryWrapper = QueryHelper.build(query); + QueryWrapper queryWrapper = QueryWrapperHelper.build(query); queryWrapper.apply(null != query.getUserId(), "t2.user_id={0}", query.getUserId()) .apply(null != query.getIsRead(), "t2.is_read={0}", query.getIsRead()); IPage page = baseMapper.selectPageByUserId(pageQuery.toPage(), queryWrapper); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java index 70f2be18..5957329e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java @@ -28,7 +28,7 @@ import top.charles7c.continew.admin.system.model.req.OptionReq; import top.charles7c.continew.admin.system.model.req.OptionResetValueReq; import top.charles7c.continew.admin.system.model.resp.OptionResp; import top.charles7c.continew.admin.system.service.OptionService; -import top.charles7c.continew.starter.data.mybatis.plus.query.QueryHelper; +import top.charles7c.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; import java.util.List; @@ -46,7 +46,7 @@ public class OptionServiceImpl implements OptionService { @Override public List list(OptionQuery query) { - return BeanUtil.copyToList(baseMapper.selectList(QueryHelper.build(query)), OptionResp.class); + return BeanUtil.copyToList(baseMapper.selectList(QueryWrapperHelper.build(query)), OptionResp.class); } @Override