From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:04:09 +0800 Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 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 64f36c9..e6ed0bb 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 @@ -13,16 +13,13 @@ 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 io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; 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 jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.Arrays; import java.util.List; @@ -33,7 +30,6 @@ * @date 2021-07-26 */ @Validated -@Api(value = "娴嬭瘯鏍戣〃鎺у埗鍣�", tags = {"娴嬭瘯鏍戣〃绠$悊"}) @RequiredArgsConstructor @RestController @RequestMapping("/demo/tree") @@ -44,7 +40,6 @@ /** * 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃 */ - @ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃") @SaCheckPermission("demo:tree:list") @GetMapping("/list") public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) { @@ -55,7 +50,6 @@ /** * 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃 */ - @ApiOperation("瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃") @SaCheckPermission("demo:tree:export") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT) @GetMapping("/export") @@ -66,50 +60,48 @@ /** * 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅 + * + * @param id 娴嬭瘯鏍慖D */ - @ApiOperation("鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅") @SaCheckPermission("demo:tree:query") @GetMapping("/{id}") - public R<TestTreeVo> getInfo(@ApiParam("娴嬭瘯鏍慖D") - @NotNull(message = "涓婚敭涓嶈兘涓虹┖") - @PathVariable("id") Long id) { + public R<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable("id") Long id) { return R.ok(iTestTreeService.queryById(id)); } /** * 鏂板娴嬭瘯鏍戣〃 */ - @ApiOperation("鏂板娴嬭瘯鏍戣〃") @SaCheckPermission("demo:tree:add") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT) @RepeatSubmit @PostMapping() public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { - return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0); + return toAjax(iTestTreeService.insertByBo(bo)); } /** * 淇敼娴嬭瘯鏍戣〃 */ - @ApiOperation("淇敼娴嬭瘯鏍戣〃") @SaCheckPermission("demo:tree:edit") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE) @RepeatSubmit @PutMapping() public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { - return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0); + return toAjax(iTestTreeService.updateByBo(bo)); } /** * 鍒犻櫎娴嬭瘯鏍戣〃 + * + * @param ids 娴嬭瘯鏍慖D涓� */ - @ApiOperation("鍒犻櫎娴嬭瘯鏍戣〃") @SaCheckPermission("demo:tree:remove") @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R<Void> remove(@ApiParam("娴嬭瘯鏍慖D涓�") - @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") - @PathVariable Long[] ids) { - return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); + public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable Long[] ids) { + return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true)); } } -- Gitblit v1.9.3