From fde624998f89ee20394bb5a310eaf53c744286f5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 13 十月 2022 15:59:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 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 4f0b4af..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
@@ -13,9 +13,6 @@
import com.ruoyi.demo.domain.bo.TestTreeBo;
import com.ruoyi.demo.domain.vo.TestTreeVo;
import com.ruoyi.demo.service.ITestTreeService;
-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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -33,7 +30,6 @@
* @date 2021-07-26
*/
@Validated
-@Tag(name ="娴嬭瘯鏍戣〃鎺у埗鍣�", description = "娴嬭瘯鏍戣〃绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/tree")
@@ -44,7 +40,6 @@
/**
* 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃
*/
- @Operation(summary = "鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
@SaCheckPermission("demo:tree:list")
@GetMapping("/list")
public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
@@ -55,7 +50,6 @@
/**
* 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃
*/
- @Operation(summary = "瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃")
@SaCheckPermission("demo:tree:export")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
@@ -66,20 +60,19 @@
/**
* 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅
+ *
+ * @param id 娴嬭瘯鏍慖D
*/
- @Operation(summary = "鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅")
@SaCheckPermission("demo:tree:query")
@GetMapping("/{id}")
- public R<TestTreeVo> getInfo(@Parameter(name = "娴嬭瘯鏍慖D")
- @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable("id") Long id) {
+ public R<TestTreeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable("id") Long id) {
return R.ok(iTestTreeService.queryById(id));
}
/**
* 鏂板娴嬭瘯鏍戣〃
*/
- @Operation(summary = "鏂板娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:add")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT)
@RepeatSubmit
@@ -91,7 +84,6 @@
/**
* 淇敼娴嬭瘯鏍戣〃
*/
- @Operation(summary = "淇敼娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:edit")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE)
@RepeatSubmit
@@ -102,14 +94,14 @@
/**
* 鍒犻櫎娴嬭瘯鏍戣〃
+ *
+ * @param ids 娴嬭瘯鏍慖D涓�
*/
- @Operation(summary = "鍒犻櫎娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:remove")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public R<Void> remove(@Parameter(name = "娴嬭瘯鏍慖D涓�")
- @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