From b624ae8e09e38d44d2193ed2f0721f01dcdc158f Mon Sep 17 00:00:00 2001
From: saintloong <saintloong@qq.com>
Date: Thu, 14 Feb 2019 07:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=B7=AF=E5=BE=84=E3=80=81=E5=A2=9E=E5=8A=A0swagger?=
 =?UTF-8?q?=20api=E6=B3=A8=E8=A7=A3=E3=80=81Controller=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/pig4cloud/pig/codegen/util/GenUtils.java    | 4 ++--
 .../src/main/resources/template/Controller.java.vm            | 4 ++++
 .../pig-codegen/src/main/resources/template/index.vue.vm      | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

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 @@
 </template>
 
 <script>
-  import { fetchList, getObj, addObj, putObj, delObj } from '@/api/${pathName}'
-  import { tableOption } from '@/const/crud/${pathName}'
+  import { fetchList, getObj, addObj, putObj, delObj } from '@/api/${moduleName}/${pathName}'
+  import { tableOption } from '@/const/crud/${moduleName}/${pathName}'
   import { mapGetters } from 'vuex'
   export default {
     name: '${pathName}',