From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 23 九月 2021 19:13:58 +0800 Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java index 54f1027..f1d3b3c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java @@ -1,23 +1,26 @@ package com.ruoyi.demo.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.bo.TestTreeAddBo; -import com.ruoyi.demo.bo.TestTreeEditBo; -import com.ruoyi.demo.bo.TestTreeQueryBo; +import com.ruoyi.demo.domain.bo.TestTreeBo; +import com.ruoyi.demo.domain.vo.TestTreeVo; import com.ruoyi.demo.service.ITestTreeService; -import com.ruoyi.demo.vo.TestTreeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Arrays; @@ -27,8 +30,9 @@ * 娴嬭瘯鏍戣〃Controller * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ +@Validated @Api(value = "娴嬭瘯鏍戣〃鎺у埗鍣�", tags = {"娴嬭瘯鏍戣〃绠$悊"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @@ -41,30 +45,30 @@ * 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃 */ @ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃") - @PreAuthorize("@ss.hasPermi('demo:tree:list')") + @SaCheckPermission("demo:tree:list") @GetMapping("/list") - public AjaxResult<List<TestTreeVo>> list(@Validated TestTreeQueryBo bo) { - return AjaxResult.success(iTestTreeService.queryList(bo)); + public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) { + List<TestTreeVo> list = iTestTreeService.queryList(bo); + return AjaxResult.success(list); } /** * 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃 */ @ApiOperation("瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃") - @PreAuthorize("@ss.hasPermi('demo:tree:export')") + @SaCheckPermission("demo:tree:export") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult<TestTreeVo> export(@Validated TestTreeQueryBo bo) { + public void export(@Validated TestTreeBo bo, HttpServletResponse response) { List<TestTreeVo> list = iTestTreeService.queryList(bo); - ExcelUtil<TestTreeVo> util = new ExcelUtil<TestTreeVo>(TestTreeVo.class); - return util.exportExcel(list, "娴嬭瘯鏍戣〃"); + ExcelUtil.exportExcel(list, "娴嬭瘯鏍戣〃", TestTreeVo.class, response); } /** * 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅 */ @ApiOperation("鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅") - @PreAuthorize("@ss.hasPermi('demo:tree:query')") + @SaCheckPermission("demo:tree:query") @GetMapping("/{id}") public AjaxResult<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") @PathVariable("id") Long id) { @@ -75,29 +79,31 @@ * 鏂板娴嬭瘯鏍戣〃 */ @ApiOperation("鏂板娴嬭瘯鏍戣〃") - @PreAuthorize("@ss.hasPermi('demo:tree:add')") + @SaCheckPermission("demo:tree:add") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT) + @RepeatSubmit @PostMapping() - public AjaxResult<Void> add(@Validated @RequestBody TestTreeAddBo bo) { - return toAjax(iTestTreeService.insertByAddBo(bo) ? 1 : 0); + public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { + return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0); } /** * 淇敼娴嬭瘯鏍戣〃 */ @ApiOperation("淇敼娴嬭瘯鏍戣〃") - @PreAuthorize("@ss.hasPermi('demo:tree:edit')") + @SaCheckPermission("demo:tree:edit") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE) + @RepeatSubmit @PutMapping() - public AjaxResult<Void> edit(@Validated @RequestBody TestTreeEditBo bo) { - return toAjax(iTestTreeService.updateByEditBo(bo) ? 1 : 0); + public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { + return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0); } /** * 鍒犻櫎娴嬭瘯鏍戣〃 */ @ApiOperation("鍒犻櫎娴嬭瘯鏍戣〃") - @PreAuthorize("@ss.hasPermi('demo:tree:remove')") + @SaCheckPermission("demo:tree:remove") @Log(title = "娴嬭瘯鏍戣〃" , businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") -- Gitblit v1.9.3