jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 使用 @param 注释替换 @Parameter 注解

Browse Source 
fix 修复 token 无法传递 与 无法持久化问题
This commit is contained in:
疯狂的狮子li
2022-07-08 15:49:15 +08:00
parent d9e54388e7
commit dd25573ebc
40 changed files with 464 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
View File

@ -48,6 +48,8 @@ public class GenController extends BaseController {
/**
* 修改代码生成业务
*
* @param tableId 表ID
*/
@SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{tableId}")
@ -73,6 +75,8 @@ public class GenController extends BaseController {
/**
* 查询数据表字段列表
*
* @param tableId 表ID
*/
@SaCheckPermission("tool:gen:list")
@GetMapping(value = "/column/{tableId}")
@ -86,6 +90,8 @@ public class GenController extends BaseController {
/**
* 导入表结构（保存）
*
* @param tables 表名串
*/
@SaCheckPermission("tool:gen:import")
@Log(title = "代码生成", businessType = BusinessType.IMPORT)
@ -112,6 +118,8 @@ public class GenController extends BaseController {
/**
* 删除代码生成
*
* @param tableIds 表ID串
*/
@SaCheckPermission("tool:gen:remove")
@Log(title = "代码生成", businessType = BusinessType.DELETE)
@ -123,6 +131,8 @@ public class GenController extends BaseController {
/**
* 预览代码
*
* @param tableId 表ID
*/
@SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
@ -133,6 +143,8 @@ public class GenController extends BaseController {
/**
* 生成代码（下载方式）
*
* @param tableName 表名
*/
@SaCheckPermission("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)
@ -144,6 +156,8 @@ public class GenController extends BaseController {
/**
* 生成代码（自定义路径）
*
* @param tableName 表名
*/
@SaCheckPermission("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)
@ -155,6 +169,8 @@ public class GenController extends BaseController {
/**
* 同步数据库
*
* @param tableName 表名
*/
@SaCheckPermission("tool:gen:edit")
@Log(title = "代码生成", businessType = BusinessType.UPDATE)
@ -166,6 +182,8 @@ public class GenController extends BaseController {
/**
* 批量生成代码
*
* @param tables 表名串
*/
@SaCheckPermission("tool:gen:code")
@Log(title = "代码生成", businessType = BusinessType.GENCODE)

14
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View File

@ -73,12 +73,13 @@ public class ${ClassName}Controller extends BaseController {
/**
* 获取${functionName}详细信息
*
* @param ${pkColumn.javaField} 主键
*/
@SaCheckPermission("${permissionPrefix}:query")
@GetMapping("/{${pkColumn.javaField}}")
public R<${ClassName}Vo> getInfo(@Parameter(name = "主键")
@NotNull(message = "主键不能为空")
@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
return R.ok(i${ClassName}Service.queryById(${pkColumn.javaField}));
}
@ -106,13 +107,14 @@ public class ${ClassName}Controller extends BaseController {
/**
* 删除${functionName}
*
* @param ${pkColumn.javaField}s 主键串
*/
@SaCheckPermission("${permissionPrefix}:remove")
@Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}")
public R<Void> remove(@Parameter(name = "主键串")
@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);
}
}