Browse Source

refactor(controller): 修改权限注解为小写格式,更新主子表和树形表格相关模板名称

PIGCLOUD 3 weeks ago
parent
commit
f00c0d5d01
4 changed files with 52 additions and 52 deletions
  1. 8 8
      config.json
  2. 16 16
      multiple/主子Contoller.java
  3. 14 14
      single/Controller.java
  4. 14 14
      tree/树形Controller.java

+ 8 - 8
config.json

@@ -53,12 +53,12 @@
   ],
   "主子表增删改查": [
     {
-      "templateName": "Service",
+      "templateName": "主子Service",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/service/${ClassName}Service.java",
       "templateFile": "multiple/主子Service.java"
     },
     {
-      "templateName": "ServiceImpl",
+      "templateName": "主子ServiceImpl",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/service/impl/${ClassName}ServiceImpl.java",
       "templateFile": "multiple/主子ServiceImpl.java"
     },
@@ -93,7 +93,7 @@
       "templateFile": "multiple/子实体.java"
     },
     {
-      "templateName": "主子Contoller",
+      "templateName": "主子Controller",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/controller/${ClassName}Controller.java",
       "templateFile": "multiple/主子Contoller.java"
     },
@@ -115,22 +115,22 @@
   ],
   "树形表格增删改查": [
     {
-      "templateName": "Controller",
+      "templateName": "树形Controller",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/controller/${ClassName}Controller.java",
       "templateFile": "tree/树形Controller.java"
     },
     {
-      "templateName": "Service",
+      "templateName": "树形Service",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/service/${ClassName}Service.java",
       "templateFile": "tree/树形Service.java"
     },
     {
-      "templateName": "ServiceImpl",
+      "templateName": "树形ServiceImpl",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/service/impl/${ClassName}ServiceImpl.java",
       "templateFile": "tree/树形ServiceImpl.java"
     },
     {
-      "templateName": "实体",
+      "templateName": "树形实体",
       "generatorPath": "${backendPath}/src/main/java/${packagePath}/${moduleName}/entity/${ClassName}Entity.java",
       "templateFile": "tree/树形实体.java"
     },
@@ -150,7 +150,7 @@
       "templateFile": "common/权限菜单.sql"
     },
     {
-      "templateName": "api.ts",
+      "templateName": "树形api.ts",
       "generatorPath": "${frontendPath}/src/api/${moduleName}/${functionName}.ts",
       "templateFile": "tree/树形api.ts"
     },

+ 16 - 16
multiple/主子Contoller.java

@@ -61,9 +61,9 @@ public class ${ClassName}Controller {
     @Operation(summary = "分页查询" , description = "分页查询" )
     @GetMapping("/page" )
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_view")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_view)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_view')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_view)')" )
     #end
     public R get${ClassName}Page(@ParameterObject Page page, @ParameterObject ${ClassName}Entity ${className}) {
         LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery();
@@ -111,9 +111,9 @@ public class ${ClassName}Controller {
     @Operation(summary = "通过条件查询" , description = "通过条件查询对象" )
     @GetMapping("/details" )
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_view")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_view)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_view')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_view)')" )
     #end
     public R getDetails(@ParameterObject ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.listDeep(Wrappers.query(${className})));
@@ -128,9 +128,9 @@ public class ${ClassName}Controller {
     @SysLog("新增${tableComment}" )
     @PostMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_add")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_add)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_add')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_add)')" )
     #end
     public R save(@RequestBody ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.saveDeep(${className}));
@@ -145,9 +145,9 @@ public class ${ClassName}Controller {
     @SysLog("修改${tableComment}" )
     @PutMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_edit")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_edit)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_edit')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_edit)')" )
     #end
     public R updateById(@RequestBody ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.updateDeep(${className}));
@@ -162,9 +162,9 @@ public class ${ClassName}Controller {
     @SysLog("通过id删除${tableComment}" )
     @DeleteMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_del")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_del)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_del')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_del)')" )
     #end
     public R removeById(@RequestBody ${pk.attrType}[] ids) {
         return R.ok(${className}Service.removeDeep(ids));
@@ -179,9 +179,9 @@ public class ${ClassName}Controller {
     @SysLog("通过id删除${tableComment}子表数据" )
     @DeleteMapping("/child")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_del")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_del)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_del')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_del)')" )
     #end
     public R removeChild(@RequestBody ${pk.attrType}[] ids) {
         return R.ok(${className}Service.removeChild(ids));
@@ -196,9 +196,9 @@ public class ${ClassName}Controller {
     @ResponseExcel
     @GetMapping("/export")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_export")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_export)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_export)')" )
     #end
     public List<${ClassName}Entity> exportExcel(${ClassName}Entity ${className},${pk.attrType}[] ids) {
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
@@ -212,9 +212,9 @@ public class ${ClassName}Controller {
      */
     @PostMapping("/import")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_export")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_export)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_export)')" )
     #end
     public R importExcel(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
         return R.ok(${className}Service.saveBatch(${className}List));

+ 14 - 14
single/Controller.java

@@ -62,9 +62,9 @@ public class ${ClassName}Controller {
     @Operation(summary = "分页查询" , description = "分页查询" )
     @GetMapping("/page" )
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_view")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_view)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_view')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_view)')" )
     #end
     public R get${ClassName}Page(@ParameterObject Page page, @ParameterObject ${ClassName}Entity ${className}) {
         LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery();
@@ -112,9 +112,9 @@ public class ${ClassName}Controller {
     @Operation(summary = "通过条件查询" , description = "通过条件查询对象" )
     @GetMapping("/details" )
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_view")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_view)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_view')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_view)')" )
     #end
     public R getDetails(@ParameterObject ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.list(Wrappers.query(${className})));
@@ -129,9 +129,9 @@ public class ${ClassName}Controller {
     @SysLog("新增${tableComment}" )
     @PostMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_add")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_add)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_add')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_add)')" )
     #end
     public R save(@RequestBody ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.save(${className}));
@@ -146,9 +146,9 @@ public class ${ClassName}Controller {
     @SysLog("修改${tableComment}" )
     @PutMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_edit")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_edit)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_edit')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_edit)')" )
     #end
     public R updateById(@RequestBody ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.updateById(${className}));
@@ -163,9 +163,9 @@ public class ${ClassName}Controller {
     @SysLog("通过id删除${tableComment}" )
     @DeleteMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_del")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_del)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_del')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_del)')" )
     #end
     public R removeById(@RequestBody ${pk.attrType}[] ids) {
         return R.ok(${className}Service.removeBatchByIds(CollUtil.toList(ids)));
@@ -181,9 +181,9 @@ public class ${ClassName}Controller {
     @ResponseExcel
     @GetMapping("/export")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_export")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_export)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_export)')" )
     #end
     public List<${ClassName}Entity> exportExcel(${ClassName}Entity ${className},${pk.attrType}[] ids) {
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
@@ -197,9 +197,9 @@ public class ${ClassName}Controller {
      */
     @PostMapping("/import")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_export")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_export)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_export)')" )
     #end
     public R importExcel(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
         return R.ok(${className}Service.saveBatch(${className}List));

+ 14 - 14
tree/树形Controller.java

@@ -60,9 +60,9 @@ public class ${ClassName}Controller {
     @Operation(summary = "获取树形列表" , description = "获取树形列表" )
     @GetMapping("/tree" )
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_view")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_view)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_view')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_view)')" )
     #end
     public R get${ClassName}Tree(@ParameterObject ${ClassName}Entity ${className}) {
         LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery();
@@ -109,9 +109,9 @@ public class ${ClassName}Controller {
     @Operation(summary = "通过条件查询" , description = "通过条件查询对象" )
     @GetMapping("/details" )
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_view")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_view)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_view')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_view)')" )
     #end
     public R getDetails(@ParameterObject ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.list(Wrappers.query(${className})));
@@ -126,9 +126,9 @@ public class ${ClassName}Controller {
     @SysLog("新增${tableComment}" )
     @PostMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_add")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_add)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_add')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_add)')" )
     #end
     public R save(@RequestBody ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.save(${className}));
@@ -143,9 +143,9 @@ public class ${ClassName}Controller {
     @SysLog("修改${tableComment}" )
     @PutMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_edit")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_edit)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_edit')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_edit)')" )
     #end
     public R updateById(@RequestBody ${ClassName}Entity ${className}) {
         return R.ok(${className}Service.updateById(${className}));
@@ -160,9 +160,9 @@ public class ${ClassName}Controller {
     @SysLog("通过id删除${tableComment}" )
     @DeleteMapping
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_del")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_del)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_del')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_del)')" )
     #end
     public R removeById(@RequestBody ${pk.attrType}[] ids) {
         return R.ok(${className}Service.removeBatchByIds(CollUtil.toList(ids)));
@@ -177,9 +177,9 @@ public class ${ClassName}Controller {
     @ResponseExcel
     @GetMapping("/export")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_export")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_export)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_export)')" )
     #end
     public List<${ClassName}Entity> exportExcel(${ClassName}Entity ${className},${pk.attrType}[] ids) {
         return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));
@@ -193,9 +193,9 @@ public class ${ClassName}Controller {
      */
     @PostMapping("/import")
     #if($isSpringBoot3)
-    @HasPermission("${moduleName}_${functionName}_export")
+    @HasPermission("$str.toLowerCase(${moduleName}_${functionName}_export)")
     #else
-    @PreAuthorize("@pms.hasPermission('${moduleName}_${functionName}_export')" )
+    @PreAuthorize("@pms.hasPermission('$str.toLowerCase(${moduleName}_${functionName}_export)')" )
     #end
     public R importExcel(@RequestExcel List<${ClassName}Entity> ${className}List, BindingResult bindingResult) {
         return R.ok(${className}Service.saveBatch(${className}List));