From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题
---
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 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 0bbb677..550be92 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -7,14 +7,14 @@
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;
@@ -27,8 +27,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
#elseif($table.tree)
#end
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
/**
* ${functionName}Controller
@@ -37,8 +36,8 @@
* @date ${datetime}
*/
@Validated
-@Api(value = "${functionName}鎺у埗鍣�", tags = {"${functionName}绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@Tag(name ="${functionName}鎺у埗鍣�", description = "${functionName}绠＄悊")
+@RequiredArgsConstructor
@RestController
@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController {
@@ -48,76 +47,74 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*/
- @ApiOperation("鏌ヨ${functionName}鍒楄〃")
@SaCheckPermission("${permissionPrefix}:list")
@GetMapping("/list")
#if($table.crud || $table.sub)
- public TableDataInfo<${ClassName}Vo> list(@Validated(QueryGroup.class) ${ClassName}Bo 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(QueryGroup.class) ${ClassName}Bo 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}鍒楄〃")
@SaCheckPermission("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public void export(@Validated ${ClassName}Bo bo, HttpServletResponse response) {
+ @PostMapping("/export")
+ public void export(${ClassName}Bo bo, HttpServletResponse response) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
}
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
+ *
+ * @param ${pkColumn.javaField} 涓婚敭
*/
- @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
@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}")
@SaCheckPermission("${permissionPrefix}:add")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
- public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
+ public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
return toAjax(i${ClassName}Service.insertByBo(bo) ? 1 : 0);
}
/**
* 淇敼${functionName}
*/
- @ApiOperation("淇敼${functionName}")
@SaCheckPermission("${permissionPrefix}:edit")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
- public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
+ public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
return toAjax(i${ClassName}Service.updateByBo(bo) ? 1 : 0);
}
/**
* 鍒犻櫎${functionName}
+ *
+ * @param ${pkColumn.javaField}s 涓婚敭涓�
*/
- @ApiOperation("鍒犻櫎${functionName}")
@SaCheckPermission("${permissionPrefix}:remove")
- @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
+ @Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}")
- public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+ public R<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