From 22b4f87232c9cb1e6f49927c8d0e11ec95f51724 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 09:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
index 9ba8a2a..a3a9d22 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
@@ -1,16 +1,18 @@
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.page.TableDataInfo;
+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.demo.bo.TestDemoAddBo;
-import com.ruoyi.demo.bo.TestDemoEditBo;
-import com.ruoyi.demo.bo.TestDemoQueryBo;
+import com.ruoyi.demo.domain.bo.TestDemoBo;
+import com.ruoyi.demo.domain.vo.TestDemoVo;
import com.ruoyi.demo.service.ITestDemoService;
-import com.ruoyi.demo.vo.TestDemoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -19,17 +21,20 @@
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 java.util.Arrays;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* 娴嬭瘯鍗曡〃Controller
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
+@Validated
@Api(value = "娴嬭瘯鍗曡〃鎺у埗鍣�", tags = {"娴嬭瘯鍗曡〃绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@@ -44,7 +49,7 @@
@ApiOperation("鏌ヨ娴嬭瘯鍗曡〃鍒楄〃")
@PreAuthorize("@ss.hasPermi('demo:demo:list')")
@GetMapping("/list")
- public TableDataInfo<TestDemoVo> list(@Validated TestDemoQueryBo bo) {
+ public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo) {
return iTestDemoService.queryPageList(bo);
}
@@ -54,7 +59,7 @@
@ApiOperation("鑷畾涔夊垎椤垫煡璇�")
@PreAuthorize("@ss.hasPermi('demo:demo:list')")
@GetMapping("/page")
- public TableDataInfo<TestDemoVo> page(@Validated TestDemoQueryBo bo) {
+ public TableDataInfo<TestDemoVo> page(@Validated TestDemoBo bo) {
return iTestDemoService.customPageList(bo);
}
@@ -65,10 +70,13 @@
@PreAuthorize("@ss.hasPermi('demo:demo:export')")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult<TestDemoVo> export(@Validated TestDemoQueryBo bo) {
+ public void export(@Validated TestDemoBo bo, HttpServletResponse response) {
List<TestDemoVo> list = iTestDemoService.queryList(bo);
- ExcelUtil<TestDemoVo> util = new ExcelUtil<TestDemoVo>(TestDemoVo.class);
- return util.exportExcel(list, "娴嬭瘯鍗曡〃");
+ // 娴嬭瘯闆姳id瀵煎嚭
+// for (TestDemoVo vo : list) {
+// vo.setId(1234567891234567893L);
+// }
+ ExcelUtil.exportExcel(list, "娴嬭瘯鍗曡〃", TestDemoVo.class, response);
}
/**
@@ -88,9 +96,10 @@
@ApiOperation("鏂板娴嬭瘯鍗曡〃")
@PreAuthorize("@ss.hasPermi('demo:demo:add')")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.INSERT)
+ @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "涓嶅厑璁搁噸澶嶆彁浜�")
@PostMapping()
- public AjaxResult<Void> add(@Validated @RequestBody TestDemoAddBo bo) {
- return toAjax(iTestDemoService.insertByAddBo(bo) ? 1 : 0);
+ public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody TestDemoBo bo) {
+ return toAjax(iTestDemoService.insertByBo(bo) ? 1 : 0);
}
/**
@@ -99,9 +108,10 @@
@ApiOperation("淇敼娴嬭瘯鍗曡〃")
@PreAuthorize("@ss.hasPermi('demo:demo:edit')")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.UPDATE)
+ @RepeatSubmit
@PutMapping()
- public AjaxResult<Void> edit(@Validated @RequestBody TestDemoEditBo bo) {
- return toAjax(iTestDemoService.updateByEditBo(bo) ? 1 : 0);
+ public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
+ return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0);
}
/**
--
Gitblit v1.9.3