From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 54f1027..8cab868 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,15 +1,16 @@
package com.ruoyi.demo.controller;
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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.demo.bo.TestTreeAddBo;
-import com.ruoyi.demo.bo.TestTreeEditBo;
-import com.ruoyi.demo.bo.TestTreeQueryBo;
+import com.ruoyi.demo.domain.bo.TestTreeBo;
+import com.ruoyi.demo.domain.vo.TestTreeVo;
import com.ruoyi.demo.service.ITestTreeService;
-import com.ruoyi.demo.vo.TestTreeVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -27,8 +28,9 @@
* 娴嬭瘯鏍戣〃Controller
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
+@Validated
@Api(value = "娴嬭瘯鏍戣〃鎺у埗鍣�", tags = {"娴嬭瘯鏍戣〃绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@@ -43,8 +45,9 @@
@ApiOperation("鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
@PreAuthorize("@ss.hasPermi('demo:tree:list')")
@GetMapping("/list")
- public AjaxResult<List<TestTreeVo>> list(@Validated TestTreeQueryBo bo) {
- return AjaxResult.success(iTestTreeService.queryList(bo));
+ public AjaxResult<List<TestTreeVo>> list(@Validated TestTreeBo bo) {
+ List<TestTreeVo> list = iTestTreeService.queryList(bo);
+ return AjaxResult.success(list);
}
/**
@@ -54,7 +57,7 @@
@PreAuthorize("@ss.hasPermi('demo:tree:export')")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult<TestTreeVo> export(@Validated TestTreeQueryBo bo) {
+ public AjaxResult<TestTreeVo> export(@Validated TestTreeBo bo) {
List<TestTreeVo> list = iTestTreeService.queryList(bo);
ExcelUtil<TestTreeVo> util = new ExcelUtil<TestTreeVo>(TestTreeVo.class);
return util.exportExcel(list, "娴嬭瘯鏍戣〃");
@@ -77,9 +80,10 @@
@ApiOperation("鏂板娴嬭瘯鏍戣〃")
@PreAuthorize("@ss.hasPermi('demo:tree:add')")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT)
+ @RepeatSubmit
@PostMapping()
- public AjaxResult<Void> add(@Validated @RequestBody TestTreeAddBo bo) {
- return toAjax(iTestTreeService.insertByAddBo(bo) ? 1 : 0);
+ public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
+ return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0);
}
/**
@@ -88,9 +92,10 @@
@ApiOperation("淇敼娴嬭瘯鏍戣〃")
@PreAuthorize("@ss.hasPermi('demo:tree:edit')")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE)
+ @RepeatSubmit
@PutMapping()
- public AjaxResult<Void> edit(@Validated @RequestBody TestTreeEditBo bo) {
- return toAjax(iTestTreeService.updateByEditBo(bo) ? 1 : 0);
+ public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
+ return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
}
/**
--
Gitblit v1.9.3