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-generator/src/main/resources/vm/java/controller.java.vm | 79 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 46f5617..ba29e20 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -4,24 +4,20 @@
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
+import javax.validation.constraints.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
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 ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}EditBo;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.service.I${ClassName}Service;
import com.ruoyi.common.utils.poi.ExcelUtil;
#if($table.crud || $table.sub)
@@ -33,14 +29,15 @@
/**
* ${functionName}Controller
- *
+ *
* @author ${author}
* @date ${datetime}
*/
+@Validated
@Api(value = "${functionName}鎺у埗鍣�", tags = {"${functionName}绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
-@RequestMapping("/${moduleName}/${businessName}" )
+@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController {
private final I${ClassName}Service i${ClassName}Service;
@@ -52,13 +49,11 @@
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
@GetMapping("/list")
#if($table.crud || $table.sub)
- public TableDataInfo<${ClassName}Vo> list(${ClassName}QueryBo bo) {
- startPage();
- List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
- return getDataTable(list);
+ public TableDataInfo<${ClassName}Vo> list(@Validated ${ClassName}Bo bo) {
+ return i${ClassName}Service.queryPageList(bo);
}
#elseif($table.tree)
- public AjaxResult<${ClassName}Vo> list(${ClassName}QueryBo bo) {
+ public AjaxResult<List<${ClassName}Vo>> list(@Validated ${ClassName}Bo bo) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
return AjaxResult.success(list);
}
@@ -68,22 +63,23 @@
* 瀵煎嚭${functionName}鍒楄〃
*/
@ApiOperation("瀵煎嚭${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')" )
- @Log(title = "${functionName}" , businessType = BusinessType.EXPORT)
- @GetMapping("/export" )
- public AjaxResult<${ClassName}Vo> export(${ClassName}QueryBo bo) {
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+ @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult<${ClassName}Vo> export(@Validated ${ClassName}Bo bo) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
ExcelUtil<${ClassName}Vo> util = new ExcelUtil<${ClassName}Vo>(${ClassName}Vo.class);
- return util.exportExcel(list, "${businessName}" );
+ return util.exportExcel(list, "${functionName}");
}
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')" )
- @GetMapping(value = "/{${pkColumn.javaField}}" )
- public AjaxResult<${ClassName}Vo> getInfo(@PathVariable("${pkColumn.javaField}" ) ${pkColumn.javaType} ${pkColumn.javaField}) {
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+ @GetMapping("/{${pkColumn.javaField}}")
+ public AjaxResult<${ClassName}Vo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
return AjaxResult.success(i${ClassName}Service.queryById(${pkColumn.javaField}));
}
@@ -91,32 +87,35 @@
* 鏂板${functionName}
*/
@ApiOperation("鏂板${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')" )
- @Log(title = "${functionName}" , businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult<Void> add(@RequestBody ${ClassName}AddBo bo) {
- return toAjax(i${ClassName}Service.insertByAddBo(bo) ? 1 : 0);
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+ @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+ @RepeatSubmit
+ @PostMapping()
+ public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
+ return toAjax(i${ClassName}Service.insertByBo(bo) ? 1 : 0);
}
/**
* 淇敼${functionName}
*/
@ApiOperation("淇敼${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')" )
- @Log(title = "${functionName}" , businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult<Void> edit(@RequestBody ${ClassName}EditBo bo) {
- return toAjax(i${ClassName}Service.updateByEditBo(bo) ? 1 : 0);
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+ @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+ @RepeatSubmit
+ @PutMapping()
+ public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
+ return toAjax(i${ClassName}Service.updateByBo(bo) ? 1 : 0);
}
/**
* 鍒犻櫎${functionName}
*/
@ApiOperation("鍒犻櫎${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')" )
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}" , businessType = BusinessType.DELETE)
- @DeleteMapping("/{${pkColumn.javaField}s}" )
- public AjaxResult<Void> remove(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}s) {
+ @DeleteMapping("/{${pkColumn.javaField}s}")
+ public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);
}
}
--
Gitblit v1.9.3