From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index 3ca73fd..6b383a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -12,6 +13,7 @@
import com.ruoyi.system.service.ISysPostService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -40,14 +42,14 @@
@ApiOperation("鑾峰彇宀椾綅鍒楄〃")
@SaCheckPermission("system:post:list")
@GetMapping("/list")
- public TableDataInfo<SysPost> list(SysPost post) {
- return postService.selectPagePostList(post);
+ public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
+ return postService.selectPagePostList(post, pageQuery);
}
@ApiOperation("瀵煎嚭宀椾綅鍒楄〃")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:post:export")
- @GetMapping("/export")
+ @PostMapping("/export")
public void export(SysPost post, HttpServletResponse response) {
List<SysPost> list = postService.selectPostList(post);
ExcelUtil.exportExcel(list, "宀椾綅鏁版嵁", SysPost.class, response);
@@ -59,7 +61,7 @@
@ApiOperation("鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:post:query")
@GetMapping(value = "/{postId}")
- public AjaxResult<SysPost> getInfo(@PathVariable Long postId) {
+ public AjaxResult<SysPost> getInfo(@ApiParam("宀椾綅ID") @PathVariable Long postId) {
return AjaxResult.success(postService.selectPostById(postId));
}
@@ -102,7 +104,7 @@
@SaCheckPermission("system:post:remove")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] postIds) {
+ public AjaxResult<Void> remove(@ApiParam("宀椾綅ID涓�") @PathVariable Long[] postIds) {
return toAjax(postService.deletePostByIds(postIds));
}
--
Gitblit v1.9.3