From af6a08398e2bc22f3c8a3a615cbd9e23190be906 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 12 五月 2022 10:55:44 +0800 Subject: [PATCH] update 优化 文件与图片上传组件 使用id存储回显 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 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..7e08698 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 @@ -4,7 +4,8 @@ import com.ruoyi.common.annotation.Log; 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.R; +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,8 +13,8 @@ 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; import org.springframework.web.bind.annotation.*; @@ -27,7 +28,7 @@ */ @Validated @Api(value = "宀椾綅淇℃伅鎺у埗鍣�", tags = {"宀椾綅淇℃伅绠$悊"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/post") public class SysPostController extends BaseController { @@ -40,14 +41,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,8 +60,8 @@ @ApiOperation("鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅") @SaCheckPermission("system:post:query") @GetMapping(value = "/{postId}") - public AjaxResult<SysPost> getInfo(@PathVariable Long postId) { - return AjaxResult.success(postService.selectPostById(postId)); + public R<SysPost> getInfo(@ApiParam("宀椾綅ID") @PathVariable Long postId) { + return R.ok(postService.selectPostById(postId)); } /** @@ -70,11 +71,11 @@ @SaCheckPermission("system:post:add") @Log(title = "宀椾綅绠$悊", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult<Void> add(@Validated @RequestBody SysPost post) { + public R<Void> add(@Validated @RequestBody SysPost post) { if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { - return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪"); + return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪"); } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { - return AjaxResult.error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪"); + return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪"); } return toAjax(postService.insertPost(post)); } @@ -86,11 +87,11 @@ @SaCheckPermission("system:post:edit") @Log(title = "宀椾綅绠$悊", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) { + public R<Void> edit(@Validated @RequestBody SysPost post) { if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { - return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪"); + return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪"); } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { - return AjaxResult.error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪"); + return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪"); } return toAjax(postService.updatePost(post)); } @@ -102,7 +103,7 @@ @SaCheckPermission("system:post:remove") @Log(title = "宀椾綅绠$悊", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public AjaxResult<Void> remove(@PathVariable Long[] postIds) { + public R<Void> remove(@ApiParam("宀椾綅ID涓�") @PathVariable Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } @@ -111,8 +112,8 @@ */ @ApiOperation("鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�") @GetMapping("/optionselect") - public AjaxResult<List<SysPost>> optionselect() { + public R<List<SysPost>> optionselect() { List<SysPost> posts = postService.selectPostAll(); - return AjaxResult.success(posts); + return R.ok(posts); } } -- Gitblit v1.9.3