work/book-api
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决swagger接口文档，不能查询问题

This commit is contained in:
阿沐 2023-01-15 20:08:11 +08:00
parent e7a70b43c9
commit 8210b1f1ca
12 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsLogController.java
View File

@ -10,19 +10,23 @@ import net.maku.message.entity.SmsLogEntity;
import net.maku.message.query.SmsLogQuery;
import net.maku.message.service.SmsLogService;
import net.maku.message.vo.SmsLogVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
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 javax.validation.Valid;
/**
* 短信日志
*
* @author 阿沐 babamu@126.com
*/
* 短信日志
*
* @author 阿沐 babamu@126.com
*/
@RestController
@RequestMapping("message/sms/log")
@Tag(name="短信日志")
@Tag(name = "短信日志")
@AllArgsConstructor
public class SmsLogController {
private final SmsLogService smsLogService;
@ -30,7 +34,7 @@ public class SmsLogController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sms:log')")
public Result<PageResult<SmsLogVO>> page(@Valid SmsLogQuery query){
public Result<PageResult<SmsLogVO>> page(@ParameterObject @Valid SmsLogQuery query) {
PageResult<SmsLogVO> page = smsLogService.page(query);
return Result.ok(page);
@ -39,7 +43,7 @@ public class SmsLogController {
@GetMapping("{id}")
@Operation(summary = "信息")
@PreAuthorize("hasAuthority('sms:log')")
public Result<SmsLogVO> get(@PathVariable("id") Long id){
public Result<SmsLogVO> get(@PathVariable("id") Long id) {
SmsLogEntity entity = smsLogService.getById(id);
return Result.ok(SmsLogConvert.INSTANCE.convert(entity));

3
maku-boot-module/maku-module-message/src/main/java/net/maku/message/controller/SmsPlatformController.java
View File

@ -16,6 +16,7 @@ import net.maku.message.sms.service.SmsService;
import net.maku.message.vo.SmsPlatformVO;
import net.maku.message.vo.SmsSendVO;
import org.apache.commons.lang3.StringUtils;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -40,7 +41,7 @@ public class SmsPlatformController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sms:platform:page')")
public Result<PageResult<SmsPlatformVO>> page(@Valid SmsPlatformQuery query) {
public Result<PageResult<SmsPlatformVO>> page(@ParameterObject @Valid SmsPlatformQuery query) {
PageResult<SmsPlatformVO> page = smsPlatformService.page(query);
return Result.ok(page);

3
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java
View File

@ -14,6 +14,7 @@ import net.maku.quartz.query.ScheduleJobQuery;
import net.maku.quartz.service.ScheduleJobService;
import net.maku.quartz.utils.CronUtils;
import net.maku.quartz.vo.ScheduleJobVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.*;
@ -36,7 +37,7 @@ public class ScheduleJobController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('schedule:page')")
public Result<PageResult<ScheduleJobVO>> page(@Valid ScheduleJobQuery query) {
public Result<PageResult<ScheduleJobVO>> page(@ParameterObject @Valid ScheduleJobQuery query) {
PageResult<ScheduleJobVO> page = scheduleJobService.page(query);
return Result.ok(page);

15
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java
View File

@ -10,6 +10,7 @@ import net.maku.quartz.entity.ScheduleJobLogEntity;
import net.maku.quartz.query.ScheduleJobLogQuery;
import net.maku.quartz.service.ScheduleJobLogService;
import net.maku.quartz.vo.ScheduleJobLogVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -19,13 +20,13 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
/**
* 定时任务日志
*
* @author 阿沐 babamu@126.com
*/
* 定时任务日志
*
* @author 阿沐 babamu@126.com
*/
@RestController
@RequestMapping("schedule/log")
@Tag(name="定时任务日志")
@Tag(name = "定时任务日志")
@AllArgsConstructor
public class ScheduleJobLogController {
private final ScheduleJobLogService scheduleJobLogService;
@ -33,7 +34,7 @@ public class ScheduleJobLogController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('schedule:log')")
public Result<PageResult<ScheduleJobLogVO>> page(@Valid ScheduleJobLogQuery query){
public Result<PageResult<ScheduleJobLogVO>> page(@ParameterObject @Valid ScheduleJobLogQuery query) {
PageResult<ScheduleJobLogVO> page = scheduleJobLogService.page(query);
return Result.ok(page);
@ -42,7 +43,7 @@ public class ScheduleJobLogController {
@GetMapping("{id}")
@Operation(summary = "信息")
@PreAuthorize("hasAuthority('schedule:log')")
public Result<ScheduleJobLogVO> get(@PathVariable("id") Long id){
public Result<ScheduleJobLogVO> get(@PathVariable("id") Long id) {
ScheduleJobLogEntity entity = scheduleJobLogService.getById(id);
return Result.ok(ScheduleJobLogConvert.INSTANCE.convert(entity));

3
maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java
View File

@ -8,6 +8,7 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.query.SysAttachmentQuery;
import net.maku.system.service.SysAttachmentService;
import net.maku.system.vo.SysAttachmentVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -29,7 +30,7 @@ public class SysAttachmentController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:attachment:page')")
public Result<PageResult<SysAttachmentVO>> page(@Valid SysAttachmentQuery query) {
public Result<PageResult<SysAttachmentVO>> page(@ParameterObject @Valid SysAttachmentQuery query) {
PageResult<SysAttachmentVO> page = sysAttachmentService.page(query);
return Result.ok(page);

15
maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java
View File

@ -7,9 +7,10 @@ import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysDictDataConvert;
import net.maku.system.entity.SysDictDataEntity;
import net.maku.system.service.SysDictDataService;
import net.maku.system.query.SysDictDataQuery;
import net.maku.system.service.SysDictDataService;
import net.maku.system.vo.SysDictDataVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -23,7 +24,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("sys/dict/data")
@Tag(name="字典数据")
@Tag(name = "字典数据")
@AllArgsConstructor
public class SysDictDataController {
private final SysDictDataService sysDictDataService;
@ -31,7 +32,7 @@ public class SysDictDataController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:dict:page')")
public Result<PageResult<SysDictDataVO>> page(@Valid SysDictDataQuery query){
public Result<PageResult<SysDictDataVO>> page(@ParameterObject @Valid SysDictDataQuery query) {
PageResult<SysDictDataVO> page = sysDictDataService.page(query);
return Result.ok(page);
@ -40,7 +41,7 @@ public class SysDictDataController {
@GetMapping("{id}")
@Operation(summary = "信息")
@PreAuthorize("hasAuthority('sys:dict:info')")
public Result<SysDictDataVO> get(@PathVariable("id") Long id){
public Result<SysDictDataVO> get(@PathVariable("id") Long id) {
SysDictDataEntity entity = sysDictDataService.getById(id);
return Result.ok(SysDictDataConvert.INSTANCE.convert(entity));
@ -49,7 +50,7 @@ public class SysDictDataController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:dict:save')")
public Result<String> save(@RequestBody @Valid SysDictDataVO vo){
public Result<String> save(@RequestBody @Valid SysDictDataVO vo) {
sysDictDataService.save(vo);
return Result.ok();
@ -58,7 +59,7 @@ public class SysDictDataController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:dict:update')")
public Result<String> update(@RequestBody @Valid SysDictDataVO vo){
public Result<String> update(@RequestBody @Valid SysDictDataVO vo) {
sysDictDataService.update(vo);
return Result.ok();
@ -67,7 +68,7 @@ public class SysDictDataController {
@DeleteMapping
@Operation(summary = "删除")
@PreAuthorize("hasAuthority('sys:dict:delete')")
public Result<String> delete(@RequestBody List<Long> idList){
public Result<String> delete(@RequestBody List<Long> idList) {
sysDictDataService.delete(idList);
return Result.ok();

3
maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java
View File

@ -11,6 +11,7 @@ import net.maku.system.query.SysDictTypeQuery;
import net.maku.system.service.SysDictTypeService;
import net.maku.system.vo.SysDictTypeVO;
import net.maku.system.vo.SysDictVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -32,7 +33,7 @@ public class SysDictTypeController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:dict:page')")
public Result<PageResult<SysDictTypeVO>> page(@Valid SysDictTypeQuery query) {
public Result<PageResult<SysDictTypeVO>> page(@ParameterObject @Valid SysDictTypeQuery query) {
PageResult<SysDictTypeVO> page = sysDictTypeService.page(query);
return Result.ok(page);

3
maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java
View File

@ -8,6 +8,7 @@ import net.maku.framework.common.utils.Result;
import net.maku.system.query.SysLogLoginQuery;
import net.maku.system.service.SysLogLoginService;
import net.maku.system.vo.SysLogLoginVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -30,7 +31,7 @@ public class SysLogLoginController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:log:login')")
public Result<PageResult<SysLogLoginVO>> page(@Valid SysLogLoginQuery query) {
public Result<PageResult<SysLogLoginVO>> page(@ParameterObject @Valid SysLogLoginQuery query) {
PageResult<SysLogLoginVO> page = sysLogLoginService.page(query);
return Result.ok(page);

3
maku-boot-system/src/main/java/net/maku/system/controller/SysParamsController.java
View File

@ -10,6 +10,7 @@ import net.maku.system.entity.SysParamsEntity;
import net.maku.system.query.SysParamsQuery;
import net.maku.system.service.SysParamsService;
import net.maku.system.vo.SysParamsVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -31,7 +32,7 @@ public class SysParamsController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:params:all')")
public Result<PageResult<SysParamsVO>> page(@Valid SysParamsQuery query) {
public Result<PageResult<SysParamsVO>> page(@ParameterObject @Valid SysParamsQuery query) {
PageResult<SysParamsVO> page = sysParamsService.page(query);
return Result.ok(page);

25
maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java
View File

@ -7,9 +7,10 @@ import net.maku.framework.common.page.PageResult;
import net.maku.framework.common.utils.Result;
import net.maku.system.convert.SysPostConvert;
import net.maku.system.entity.SysPostEntity;
import net.maku.system.service.SysPostService;
import net.maku.system.query.SysPostQuery;
import net.maku.system.service.SysPostService;
import net.maku.system.vo.SysPostVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -18,13 +19,13 @@ import java.util.List;
/**
* 岗位管理
*
* @author 阿沐 babamu@126.com
*/
* 岗位管理
*
* @author 阿沐 babamu@126.com
*/
@RestController
@RequestMapping("sys/post")
@Tag(name="岗位管理")
@Tag(name = "岗位管理")
@AllArgsConstructor
public class SysPostController {
private final SysPostService sysPostService;
@ -32,7 +33,7 @@ public class SysPostController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:post:page')")
public Result<PageResult<SysPostVO>> page(@Valid SysPostQuery query){
public Result<PageResult<SysPostVO>> page(@ParameterObject @Valid SysPostQuery query) {
PageResult<SysPostVO> page = sysPostService.page(query);
return Result.ok(page);
@ -40,7 +41,7 @@ public class SysPostController {
@GetMapping("list")
@Operation(summary = "列表")
public Result<List<SysPostVO>> list(){
public Result<List<SysPostVO>> list() {
List<SysPostVO> list = sysPostService.getList();
return Result.ok(list);
@ -49,7 +50,7 @@ public class SysPostController {
@GetMapping("{id}")
@Operation(summary = "信息")
@PreAuthorize("hasAuthority('sys:post:info')")
public Result<SysPostVO> get(@PathVariable("id") Long id){
public Result<SysPostVO> get(@PathVariable("id") Long id) {
SysPostEntity entity = sysPostService.getById(id);
return Result.ok(SysPostConvert.INSTANCE.convert(entity));
@ -58,7 +59,7 @@ public class SysPostController {
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('sys:post:save')")
public Result<String> save(@RequestBody SysPostVO vo){
public Result<String> save(@RequestBody SysPostVO vo) {
sysPostService.save(vo);
return Result.ok();
@ -67,7 +68,7 @@ public class SysPostController {
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('sys:post:update')")
public Result<String> update(@RequestBody @Valid SysPostVO vo){
public Result<String> update(@RequestBody @Valid SysPostVO vo) {
sysPostService.update(vo);
return Result.ok();
@ -76,7 +77,7 @@ public class SysPostController {
@DeleteMapping
@Operation(summary = "删除")
@PreAuthorize("hasAuthority('sys:post:delete')")
public Result<String> delete(@RequestBody List<Long> idList){
public Result<String> delete(@RequestBody List<Long> idList) {
sysPostService.delete(idList);
return Result.ok();

3
maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java
View File

@ -16,6 +16,7 @@ import net.maku.system.vo.SysMenuVO;
import net.maku.system.vo.SysRoleDataScopeVO;
import net.maku.system.vo.SysRoleVO;
import net.maku.system.vo.SysUserVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -42,7 +43,7 @@ public class SysRoleController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:role:page')")
public Result<PageResult<SysRoleVO>> page(@Valid SysRoleQuery query) {
public Result<PageResult<SysRoleVO>> page(@ParameterObject @Valid SysRoleQuery query) {
PageResult<SysRoleVO> page = sysRoleService.page(query);
return Result.ok(page);

3
maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java
View File

@ -16,6 +16,7 @@ import net.maku.system.service.SysUserRoleService;
import net.maku.system.service.SysUserService;
import net.maku.system.vo.SysUserPasswordVO;
import net.maku.system.vo.SysUserVO;
import org.springdoc.api.annotations.ParameterObject;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
@ -43,7 +44,7 @@ public class SysUserController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('sys:user:page')")
public Result<PageResult<SysUserVO>> page(@Valid SysUserQuery query) {
public Result<PageResult<SysUserVO>> page(@ParameterObject @Valid SysUserQuery query) {
PageResult<SysUserVO> page = sysUserService.page(query);
return Result.ok(page);