From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 18:08:14 +0800
Subject: [PATCH] add 整合 springdoc 移除 knife4j
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 f1d3b3c..4f0b4af 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
@@ -4,7 +4,7 @@
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;
@@ -13,10 +13,10 @@
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.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -33,8 +33,8 @@
* @date 2021-07-26
*/
@Validated
-@Api(value = "娴嬭瘯鏍戣〃鎺у埗鍣�", tags = {"娴嬭瘯鏍戣〃绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@Tag(name ="娴嬭瘯鏍戣〃鎺у埗鍣�", description = "娴嬭瘯鏍戣〃绠＄悊")
+@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/tree")
public class TestTreeController extends BaseController {
@@ -44,70 +44,72 @@
/**
* 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃
*/
- @ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
+ @Operation(summary = "鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
@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("瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃")
+ @Operation(summary = "瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃")
@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);
}
/**
* 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅")
+ @Operation(summary = "鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅")
@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(@Parameter(name = "娴嬭瘯鏍慖D")
+ @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable("id") Long id) {
+ return R.ok(iTestTreeService.queryById(id));
}
/**
* 鏂板娴嬭瘯鏍戣〃
*/
- @ApiOperation("鏂板娴嬭瘯鏍戣〃")
+ @Operation(summary = "鏂板娴嬭瘯鏍戣〃")
@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("淇敼娴嬭瘯鏍戣〃")
+ @Operation(summary = "淇敼娴嬭瘯鏍戣〃")
@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);
}
/**
* 鍒犻櫎娴嬭瘯鏍戣〃
*/
- @ApiOperation("鍒犻櫎娴嬭瘯鏍戣〃")
+ @Operation(summary = "鍒犻櫎娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:remove")
- @Log(title = "娴嬭瘯鏍戣〃" , businessType = BusinessType.DELETE)
+ @Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ids) {
+ public R<Void> remove(@Parameter(name = "娴嬭瘯鏍慖D涓�")
+ @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ids) {
return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}
--
Gitblit v1.9.3