diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index 08de753c082edd32272d52d2acb21d5ddcfff8bc..60ae1e3b2386d6bd84f57dcdbaa69fadb4286d6c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -75,7 +75,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "分页查询列表") @ResponseBody @GetMapping - public R> page(@Validated Q query, @Validated PageQuery pageQuery) { + public R> page(Q query, @Validated PageQuery pageQuery) { this.checkPermission("list"); PageDataVO pageDataVO = baseService.page(query, pageQuery); return R.ok(pageDataVO); @@ -93,7 +93,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询树列表") @ResponseBody @GetMapping("/tree") - public R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { + public R>> tree(Q query, SortQuery sortQuery) { this.checkPermission("list"); List> list = baseService.tree(query, sortQuery, false); return R.ok(list); @@ -111,7 +111,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询列表") @ResponseBody @GetMapping("/list") - public R> list(@Validated Q query, @Validated SortQuery sortQuery) { + public R> list(Q query, SortQuery sortQuery) { this.checkPermission("list"); List list = baseService.list(query, sortQuery); return R.ok(list); @@ -197,7 +197,7 @@ public abstract class BaseController, V, D, Q, */ @Operation(summary = "导出数据") @GetMapping("/export") - public void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { + public void export(Q query, SortQuery sortQuery, HttpServletResponse response) { this.checkPermission("export"); baseService.export(query, sortQuery, response); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java index f1e98f11783e464769ffff6b8f8a004be4bbdbba..1cc2329729bb899c402505d101b6d6253e0ae404 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.data.domain.Sort; import cn.hutool.core.util.ArrayUtil; @@ -39,7 +38,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/2/12 21:30 */ @Data -@ParameterObject @Schema(description = "排序查询条件") public class SortQuery implements Serializable { diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java index c3b001a62870af65ba95aedb99d9d505b900feba..008a6c6a7441b3c987c04bfc7b5bc4c9f8c58cb5 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/16 23:25 */ @Data -@ParameterObject @Schema(description = "登录日志查询条件") public class LoginLogQuery implements Serializable { diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java index ea7261d01a5a40ec884aadd9d7bcd70868702102..ba3c28e03678056dfd517eb440cbb351c2fe9c4c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/15 11:43 */ @Data -@ParameterObject @Schema(description = "操作日志查询条件") public class OperationLogQuery implements Serializable { diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java index afb5273363f76ae0bcdb430e9f66b8e34bcc3dfb..d6930483893e65b34baa596089ead7c09c25035f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/17 23:31 */ @Data -@ParameterObject @Schema(description = "系统日志查询条件") public class SystemLogQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java index bd2a9a37baccfec87c8fc5313c83b88a93bb97b3..6e506ab0411e8ef99b9e0301e1aa09a27f8996ea 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.constant.StringConsts; @@ -36,7 +35,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/1/20 23:07 */ @Data -@ParameterObject @Schema(description = "在线用户查询条件") public class OnlineUserQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java index 3e9d175b13e66da73f33f3c803867534805ba6ef..db21b369d3e1521d85ac2083a641cf54858d3acf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java @@ -22,8 +22,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; - import top.charles7c.cnadmin.common.annotation.Query; /** @@ -33,7 +31,6 @@ import top.charles7c.cnadmin.common.annotation.Query; * @since 2023/1/22 17:52 */ @Data -@ParameterObject @Schema(description = "部门查询条件") public class DeptQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java index dee81cf00ebd0951e6d61f36a9f463dc6b065ab3..b324c4f4e65f6123730aa1d3d6e9bfd34639eb1f 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java @@ -22,8 +22,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; - import top.charles7c.cnadmin.common.annotation.Query; /** @@ -33,7 +31,6 @@ import top.charles7c.cnadmin.common.annotation.Query; * @since 2023/2/15 20:21 */ @Data -@ParameterObject @Schema(description = "菜单查询条件") public class MenuQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java index 24aa35b953c20a448f16567a30369a3493a2f4f2..68e4d6f05bff0369c8dadd4071f7b0a71ef55434 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java @@ -22,8 +22,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; - import top.charles7c.cnadmin.common.annotation.Query; /** @@ -33,7 +31,6 @@ import top.charles7c.cnadmin.common.annotation.Query; * @since 2023/2/8 23:04 */ @Data -@ParameterObject @Schema(description = "角色查询条件") public class RoleQuery implements Serializable { diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java index 77a2170177b6c72d247332913a9027ba924362dd..2f7352eb43d2421965080087505286f952fa74f8 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java @@ -24,7 +24,6 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import org.springdoc.api.annotations.ParameterObject; import org.springframework.format.annotation.DateTimeFormat; import top.charles7c.cnadmin.common.annotation.Query; @@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts; * @since 2023/2/20 21:01 */ @Data -@ParameterObject @Schema(description = "用户查询条件") public class UserQuery implements Serializable { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java index 23ee0d261d5f6c3de3fddd2a1c0c559852cc147e..bf4d4fb0f1768ab47d7577fedfed1d58f423a424 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java @@ -16,7 +16,10 @@ package top.charles7c.cnadmin.webapi.controller.common; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -25,7 +28,10 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ClassUtil; @@ -65,21 +71,21 @@ public class CommonController { @Operation(summary = "查询部门树", description = "查询树结构的部门列表") @GetMapping("/tree/dept") - public R>> listDeptTree(@Validated DeptQuery query, @Validated SortQuery sortQuery) { + public R>> listDeptTree(DeptQuery query, SortQuery sortQuery) { List> treeList = deptService.tree(query, sortQuery, true); return R.ok(treeList); } @Operation(summary = "查询菜单树", description = "查询树结构的菜单列表") @GetMapping("/tree/menu") - public R>> listMenuTree(@Validated MenuQuery query, @Validated SortQuery sortQuery) { + public R>> listMenuTree(MenuQuery query, SortQuery sortQuery) { List> treeList = menuService.tree(query, sortQuery, true); return R.ok(treeList); } @Operation(summary = "查询角色字典", description = "查询角色字典列表") @GetMapping("/dict/role") - public R>> listRoleDict(@Validated RoleQuery query, @Validated SortQuery sortQuery) { + public R>> listRoleDict(RoleQuery query, SortQuery sortQuery) { List list = roleService.list(query, sortQuery); List> labelValueVOList = roleService.buildDict(list); return R.ok(labelValueVOList); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java index 9ccb4b9dd76ff4254e295912fd17663b991795d4..0314a171072465e4fb734e8c4dbf0797b230b35c 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java @@ -57,7 +57,7 @@ public class LogController { @Log(module = "登录日志") @Operation(summary = "分页查询登录日志列表") @GetMapping("/login") - public R> page(@Validated LoginLogQuery query, @Validated PageQuery pageQuery) { + public R> page(LoginLogQuery query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = logService.page(query, pageQuery); return R.ok(pageDataVO); } @@ -65,7 +65,7 @@ public class LogController { @Log(module = "操作日志") @Operation(summary = "分页查询操作日志列表") @GetMapping("/operation") - public R> page(@Validated OperationLogQuery query, @Validated PageQuery pageQuery) { + public R> page(OperationLogQuery query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = logService.page(query, pageQuery); return R.ok(pageDataVO); } @@ -73,7 +73,7 @@ public class LogController { @Log(module = "系统日志") @Operation(summary = "分页查询系统日志列表") @GetMapping("/system") - public R> page(@Validated SystemLogQuery query, @Validated PageQuery pageQuery) { + public R> page(SystemLogQuery query, @Validated PageQuery pageQuery) { PageDataVO pageDataVO = logService.page(query, pageQuery); return R.ok(pageDataVO); } diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java index 07acb570f284867cbaf3b296e3ebb24ae62238ca..30fde9aca3b85822f1f51ce258a31344672b80e1 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java @@ -52,7 +52,7 @@ public class OnlineUserController { @Operation(summary = "分页查询列表") @SaCheckPermission("monitor:online:user:list") @GetMapping - public R> page(@Validated OnlineUserQuery query, @Validated PageQuery pageQuery) { + public R> page(OnlineUserQuery query, @Validated PageQuery pageQuery) { return R.ok(onlineUserService.page(query, pageQuery)); } diff --git a/continew-admin-webapi/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml index 4beec9192e5927f5a41a4ef8f4901d18ccf16212..49a1fdc23f610890169fe7f105c7b48eadc526bb 100644 --- a/continew-admin-webapi/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -47,6 +47,9 @@ logging: --- ### 接口文档配置 springdoc: + # 设置对象型参数的展示形式(设为 true 表示将对象型参数平展开,即对象内的属性直接作为参数展示而不是嵌套在对象内,默认为 false) + # 如果不添加该全局配置,可以在需要如此处理的对象参数类上使用 @ParameterObject + default-flat-param-object: true swagger-ui: path: /swagger-ui.html tags-sorter: alpha