From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 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 c6bad67..dc080a6 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,27 +1,25 @@
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.R;
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.common.core.web.controller.BaseController;
+import com.ruoyi.common.excel.utils.ExcelUtil;
+import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
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.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
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;
@@ -32,7 +30,6 @@
* @date 2021-07-26
*/
@Validated
-@Tag(name ="娴嬭瘯鏍戣〃鎺у埗鍣�", description = "娴嬭瘯鏍戣〃绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/tree")
@@ -63,12 +60,13 @@
/**
* 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅
+ *
+ * @param id 娴嬭瘯鏍慖D
*/
@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));
}
@@ -80,7 +78,7 @@
@RepeatSubmit
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
- return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
+ return toAjax(iTestTreeService.insertByBo(bo));
}
/**
@@ -91,18 +89,19 @@
@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涓�
*/
@SaCheckPermission("demo:tree:remove")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public R<Void> remove(@Parameter(name = "娴嬭瘯鏍慖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