diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenUtils.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenUtils.java index 1d3125bb..a3bbd1e6 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenUtils.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenUtils.java @@ -278,12 +278,12 @@ public class GenUtils { } if (template.contains(API_JS_VM)) { - return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js"; + return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + moduleName + File.separator + className.toLowerCase() + ".js"; } if (template.contains(CRUD_JS_VM)) { return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" + - File.separator + "crud" + File.separator + className.toLowerCase() + ".js"; + File.separator + "crud" + File.separator + moduleName + File.separator + className.toLowerCase() + ".js"; } return null; diff --git a/pig-visual/pig-codegen/src/main/resources/template/Controller.java.vm b/pig-visual/pig-codegen/src/main/resources/template/Controller.java.vm index 4431259d..1e3c9030 100755 --- a/pig-visual/pig-codegen/src/main/resources/template/Controller.java.vm +++ b/pig-visual/pig-codegen/src/main/resources/template/Controller.java.vm @@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @RequestMapping("/${pathName}") +@Api(value = "${pathName}", description = "${comments}") public class ${className}Controller { private final ${className}Service ${classname}Service; @@ -68,6 +69,7 @@ public class ${className}Controller { */ @SysLog("新增${comments}") @PostMapping + @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_add')") public R save(@RequestBody ${className} ${classname}){ return new R<>(${classname}Service.save(${classname})); } @@ -79,6 +81,7 @@ public class ${className}Controller { */ @SysLog("修改${comments}") @PutMapping + @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_edit')") public R update(@RequestBody ${className} ${classname}){ return new R<>(${classname}Service.updateById(${classname})); } @@ -90,6 +93,7 @@ public class ${className}Controller { */ @SysLog("删除${comments}") @DeleteMapping("/{${pk.lowerAttrName}}") + @PreAuthorize("@pms.hasPermission('${moduleName}_${pathName}_del')") public R removeById(@PathVariable ${pk.attrType} ${pk.lowerAttrName}){ return new R<>(${classname}Service.removeById(${pk.lowerAttrName})); } diff --git a/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm b/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm index 1ea1d095..93a13fa1 100755 --- a/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm +++ b/pig-visual/pig-codegen/src/main/resources/template/index.vue.vm @@ -40,8 +40,8 @@