From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 02 九月 2022 16:30:20 +0800 Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 54 ++++++++++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 30 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 c34c77c..52d881e 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,9 +1,10 @@ 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.domain.R; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.QueryGroup; @@ -12,11 +13,7 @@ import com.ruoyi.demo.domain.bo.TestTreeBo; import com.ruoyi.demo.domain.vo.TestTreeVo; import com.ruoyi.demo.service.ITestTreeService; -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.*; @@ -33,8 +30,7 @@ * @date 2021-07-26 */ @Validated -@Api(value = "娴嬭瘯鏍戣〃鎺у埗鍣�", tags = {"娴嬭瘯鏍戣〃绠$悊"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/demo/tree") public class TestTreeController extends BaseController { @@ -44,70 +40,68 @@ /** * 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃 */ - @ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃") - @PreAuthorize("@ss.hasPermi('demo:tree:list')") + @SaCheckPermission("demo:tree:list") @GetMapping("/list") - public AjaxResult<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) { + public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) { List<TestTreeVo> list = iTestTreeService.queryList(bo); - return AjaxResult.success(list); + return R.ok(list); } /** * 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃 */ - @ApiOperation("瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃") - @PreAuthorize("@ss.hasPermi('demo:tree:export')") + @SaCheckPermission("demo:tree:export") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT) @GetMapping("/export") public void export(@Validated TestTreeBo bo, HttpServletResponse response) { List<TestTreeVo> list = iTestTreeService.queryList(bo); - ExcelUtil.exportExcel(list, "娴嬭瘯鏍戣〃", TestTreeVo.class, response); + ExcelUtil.exportExcel(list, "娴嬭瘯鏍戣〃", TestTreeVo.class, response); } /** * 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅 + * + * @param id 娴嬭瘯鏍慖D */ - @ApiOperation("鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅") - @PreAuthorize("@ss.hasPermi('demo:tree:query')") + @SaCheckPermission("demo:tree:query") @GetMapping("/{id}") - public AjaxResult<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") - @PathVariable("id") Long id) { - return AjaxResult.success(iTestTreeService.queryById(id)); + public R<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable("id") Long id) { + return R.ok(iTestTreeService.queryById(id)); } /** * 鏂板娴嬭瘯鏍戣〃 */ - @ApiOperation("鏂板娴嬭瘯鏍戣〃") - @PreAuthorize("@ss.hasPermi('demo:tree:add')") + @SaCheckPermission("demo:tree:add") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT) @RepeatSubmit @PostMapping() - public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { + public R<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(EditGroup.class) @RequestBody TestTreeBo bo) { + public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0); } /** * 鍒犻櫎娴嬭瘯鏍戣〃 + * + * @param ids 娴嬭瘯鏍慖D涓� */ - @ApiOperation("鍒犻櫎娴嬭瘯鏍戣〃") - @PreAuthorize("@ss.hasPermi('demo:tree:remove')") - @Log(title = "娴嬭瘯鏍戣〃" , businessType = BusinessType.DELETE) + @SaCheckPermission("demo:tree:remove") + @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") - @PathVariable Long[] ids) { + public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable Long[] ids) { return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); } } -- Gitblit v1.9.3