From 9c368e8e68f769ee76a968033f9806787b7d857c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 28 十一月 2022 13:57:30 +0800
Subject: [PATCH] update springboot 2.7.5 => 2.7.6 update lock4j 2.2.2 => 2.2.3 update s3-adk 1.12.324 => 1.12.349
---
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 89 +++++++++++++++++++++-----------------------
1 files changed, 43 insertions(+), 46 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 a87c6cd..3edbc33 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -2,40 +2,40 @@
import java.util.List;
import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.dev33.satoken.annotation.SaCheckPermission;
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.domain.PageQuery;
+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 ${packageName}.vo.${ClassName}Vo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}EditBo;
-import ${packageName}.service.I${ClassName}Service;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
+import ${packageName}.service.I${ClassName}Service;
#if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo;
#elseif($table.tree)
#end
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
/**
- * ${functionName}Controller
+ * ${functionName}
*
* @author ${author}
* @date ${datetime}
*/
@Validated
-@Api(value = "${functionName}鎺у埗鍣�", tags = {"${functionName}绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController {
@@ -45,77 +45,74 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*/
- @ApiOperation("鏌ヨ${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+ @SaCheckPermission("${permissionPrefix}:list")
@GetMapping("/list")
#if($table.crud || $table.sub)
- public TableDataInfo<${ClassName}Vo> list(@Validated ${ClassName}QueryBo bo) {
- return i${ClassName}Service.queryPageList(bo);
+ public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) {
+ return i${ClassName}Service.queryPageList(bo, pageQuery);
}
#elseif($table.tree)
- public AjaxResult<List<${ClassName}Vo>> list(@Validated ${ClassName}QueryBo bo) {
+ public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
- return AjaxResult.success(list);
+ return R.ok(list);
}
#end
/**
* 瀵煎嚭${functionName}鍒楄〃
*/
- @ApiOperation("瀵煎嚭${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+ @SaCheckPermission("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult<${ClassName}Vo> export(@Validated ${ClassName}QueryBo bo) {
+ @PostMapping("/export")
+ public void export(${ClassName}Bo bo, HttpServletResponse response) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
- ExcelUtil<${ClassName}Vo> util = new ExcelUtil<${ClassName}Vo>(${ClassName}Vo.class);
- return util.exportExcel(list, "${functionName}");
+ ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
}
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
+ *
+ * @param ${pkColumn.javaField} 涓婚敭
*/
- @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+ @SaCheckPermission("${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}));
+ public R<${ClassName}Vo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
+ return R.ok(i${ClassName}Service.queryById(${pkColumn.javaField}));
}
/**
* 鏂板${functionName}
*/
- @ApiOperation("鏂板${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+ @SaCheckPermission("${permissionPrefix}:add")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
- @RepeatSubmit
+ @RepeatSubmit()
@PostMapping()
- public AjaxResult<Void> add(@Validated @RequestBody ${ClassName}AddBo bo) {
- return toAjax(i${ClassName}Service.insertByAddBo(bo) ? 1 : 0);
+ public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
+ return toAjax(i${ClassName}Service.insertByBo(bo));
}
/**
* 淇敼${functionName}
*/
- @ApiOperation("淇敼${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+ @SaCheckPermission("${permissionPrefix}:edit")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
- @RepeatSubmit
+ @RepeatSubmit()
@PutMapping()
- public AjaxResult<Void> edit(@Validated @RequestBody ${ClassName}EditBo bo) {
- return toAjax(i${ClassName}Service.updateByEditBo(bo) ? 1 : 0);
+ public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
+ return toAjax(i${ClassName}Service.updateByBo(bo));
}
/**
* 鍒犻櫎${functionName}
+ *
+ * @param ${pkColumn.javaField}s 涓婚敭涓�
*/
- @ApiOperation("鍒犻櫎${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
- @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
+ @SaCheckPermission("${permissionPrefix}:remove")
+ @Log(title = "${functionName}", businessType = BusinessType.DELETE)
@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);
+ public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+ return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true));
}
}
--
Gitblit v1.9.3