From f80316e34d9757225a1a7b6002061e8626018e47 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 31 Jul 2024 22:46:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=20Query=20=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=AF=B9=E5=BA=94=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=EF=BC=88=E7=9B=AE=E5=89=8D=E5=B7=B2=E6=94=AF=E6=8C=81=E9=9D=9E?= =?UTF-8?q?=20JSON=20=E6=A0=BC=E5=BC=8F=E6=9E=9A=E4=B8=BE=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=BD=AC=E6=8D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/system/config/file/FileStorageConfigLoader.java | 2 +- .../top/continew/admin/system/model/query/DeptQuery.java | 5 +++-- .../continew/admin/system/model/query/DictItemQuery.java | 5 +++-- .../top/continew/admin/system/model/query/FileQuery.java | 7 ++++--- .../top/continew/admin/system/model/query/LogQuery.java | 5 +++-- .../top/continew/admin/system/model/query/MenuQuery.java | 7 ++++--- .../continew/admin/system/model/query/MessageQuery.java | 5 +++-- .../continew/admin/system/model/query/StorageQuery.java | 5 +++-- .../top/continew/admin/system/model/query/UserQuery.java | 5 +++-- .../continew/admin/system/service/impl/LogServiceImpl.java | 3 ++- .../admin/system/service/impl/MenuServiceImpl.java | 2 +- .../admin/system/service/impl/UserServiceImpl.java | 2 +- 12 files changed, 31 insertions(+), 22 deletions(-) diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java b/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java index 5a1634ba..6e0d5b4e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java @@ -47,7 +47,7 @@ public class FileStorageConfigLoader implements ApplicationRunner { @Override public void run(ApplicationArguments args) { StorageQuery query = new StorageQuery(); - query.setStatus(DisEnableStatusEnum.ENABLE.getValue()); + query.setStatus(DisEnableStatusEnum.ENABLE); List storageList = storageService.list(query, null); if (CollUtil.isEmpty(storageList)) { return; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java index c14e31b6..0e59a12c 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java @@ -18,6 +18,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; @@ -47,6 +48,6 @@ public class DeptQuery implements Serializable { /** * 状态 */ - @Schema(description = "状态（1：启用；2：禁用）", example = "1") - private Integer status; + @Schema(description = "状态", example = "1") + private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java index 6e999232..b4a087c4 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java @@ -18,6 +18,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; @@ -47,8 +48,8 @@ public class DictItemQuery implements Serializable { /** * 状态 */ - @Schema(description = "状态（1：启用；2：禁用）", example = "1") - private Integer status; + @Schema(description = "状态", example = "1") + private DisEnableStatusEnum status; /** * 字典 ID diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java index 55bd4175..6580f0a5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java @@ -18,6 +18,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.system.enums.FileTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; @@ -40,13 +41,13 @@ public class FileQuery implements Serializable { /** * 名称 */ - @Schema(description = "名称") + @Schema(description = "名称", example = "图片") @Query(type = QueryType.LIKE) private String name; /** * 类型 */ - @Schema(description = "类型") - private Integer type; + @Schema(description = "类型", example = "2") + private FileTypeEnum type; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java index e0c1fd7a..ff2559f9 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import top.continew.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -75,6 +76,6 @@ public class LogQuery implements Serializable { /** * 状态 */ - @Schema(description = "状态（1：成功；2：失败）", example = "1") - private Integer status; + @Schema(description = "状态", example = "1") + private DisEnableStatusEnum status; } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java index 384829fa..8123aba3 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java @@ -19,6 +19,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; @@ -49,10 +50,10 @@ public class MenuQuery implements Serializable { /** * 状态 */ - @Schema(description = "状态（1：启用；2：禁用）", example = "1") - private Integer status; + @Schema(description = "状态", example = "1") + private DisEnableStatusEnum status; - public MenuQuery(Integer status) { + public MenuQuery(DisEnableStatusEnum status) { this.status = status; } } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java index ea1adf99..9c4fcc13 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java @@ -18,6 +18,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.enums.MessageTypeEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.annotation.QueryIgnore; import top.continew.starter.data.core.enums.QueryType; @@ -54,8 +55,8 @@ public class MessageQuery implements Serializable { /** * 类型 */ - @Schema(description = "类型（1：系统消息）", example = "1") - private Integer type; + @Schema(description = "类型", example = "1") + private MessageTypeEnum type; /** * 是否已读 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java index ee699e1f..7dd6f592 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java @@ -18,6 +18,7 @@ package top.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.starter.data.core.annotation.Query; import top.continew.starter.data.core.enums.QueryType; @@ -47,6 +48,6 @@ public class StorageQuery implements Serializable { /** * 状态 */ - @Schema(description = "状态（1：启用；2：禁用）", example = "1") - private Integer status; + @Schema(description = "状态", example = "1") + private DisEnableStatusEnum status; } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java index 9198eaf2..f3ae415a 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Size; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import top.continew.admin.common.enums.DisEnableStatusEnum; import java.io.Serial; import java.io.Serializable; @@ -49,8 +50,8 @@ public class UserQuery implements Serializable { /** * 状态 */ - @Schema(description = "状态（1：启用；2：禁用）", example = "1") - private Integer status; + @Schema(description = "状态", example = "1") + private DisEnableStatusEnum status; /** * 创建时间 diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java index c20f5b13..1c646442 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java @@ -29,6 +29,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; +import top.continew.admin.common.enums.DisEnableStatusEnum; import top.continew.admin.system.mapper.LogMapper; import top.continew.admin.system.model.entity.LogDO; import top.continew.admin.system.model.query.LogQuery; @@ -151,7 +152,7 @@ public class LogServiceImpl implements LogService { String module = query.getModule(); String ip = query.getIp(); String createUserString = query.getCreateUserString(); - Integer status = query.getStatus(); + DisEnableStatusEnum status = query.getStatus(); List createTimeList = query.getCreateTime(); return new QueryWrapper().and(StrUtil.isNotBlank(description), q -> q.like("t1.description", description) .or() diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java index 670bb81a..4d95bf3e 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java @@ -82,7 +82,7 @@ public class MenuServiceImpl extends BaseServiceImpl listAll() { - return super.list(new MenuQuery(DisEnableStatusEnum.ENABLE.getValue()), null); + return super.list(new MenuQuery(DisEnableStatusEnum.ENABLE), null); } @Override diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 3dbc63df..e52f7485 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -471,7 +471,7 @@ public class UserServiceImpl extends BaseServiceImpl buildQueryWrapper(UserQuery query) { String description = query.getDescription(); - Integer status = query.getStatus(); + DisEnableStatusEnum status = query.getStatus(); List createTimeList = query.getCreateTime(); Long deptId = query.getDeptId(); return new QueryWrapper().and(StrUtil.isNotBlank(description), q -> q.like("t1.username", description)