调整代码生成器

java110-code-generator/src/main/java/com/java110/code/back/BaseGenerator.java

@@ -92,6 +92,7 @@ public class BaseGenerator {
                 .replace("@@templateKeyName@@", data.getString("templateKeyName"))
                 .replace("@@TEMPLATECODE@@", data.getString("templateCode").toUpperCase())
                 .replace("@@searchCode@@", data.getString("searchCode"))
+                .replace("@@directories@@", data.getString("directories"))
                 .replace("@@searchName@@", data.getString("searchName"));
     }
 
@@ -104,6 +105,7 @@ public class BaseGenerator {
                 .replace("@@templateKeyName@@", data.getId())
                 .replace("@@TEMPLATECODE@@", data.getName().toUpperCase())
                 .replace("@@searchCode@@", data.getId())
+
                 .replace("@@searchName@@", data.getId());
     }
 }

java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java

@@ -14,9 +14,9 @@ public class GeneratorAddComponent extends BaseGenerator {
         //处理组件
         generatorComponentHtml(data);
         generatorComponentJs(data);
-        generatorComponentJava(data);
-        genneratorIListSmo(data);
-        genneratorListSmoImpl(data);
+        //generatorComponentJava(data);
+        //genneratorIListSmo(data);
+        //genneratorListSmoImpl(data);
 //        genneratorListListener(data);
 
 //        genneratorServiceCodeConstant(data);
@@ -107,7 +107,7 @@ public class GeneratorAddComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/" + data.getString("templateCode") + "Package/add" + toUpperCaseFirstOne(data.getString("templateCode")) + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
+                + "out/web/components/" + data.getString("directories") + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -166,7 +166,7 @@ public class GeneratorAddComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/" + data.getString("templateCode") + "Package/add" + toUpperCaseFirstOne(data.getString("templateCode")) + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
+                + "out/web/components/" + data.getString("directories") + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);

java110-code-generator/src/main/java/com/java110/code/web/GeneratorChooseComponent.java

@@ -19,7 +19,7 @@ public class GeneratorChooseComponent extends BaseGenerator {
         //处理组件
         generatorComponentHtml(data);
         generatorComponentJs(data);
-        generatorComponentJava(data);
+        //generatorComponentJava(data);
 
     }
 
@@ -57,9 +57,8 @@ public class GeneratorChooseComponent extends BaseGenerator {
                 .replace("@@columnsName@@", tdSb.toString());
 
 
-
         String writePath = this.getClass().getResource("/").getPath()
-                +"out/web/component/"+data.getString("templateCode")+"Package/choose"+toUpperCaseFirstOne(data.getString("templateCode"))+"/choose"+toUpperCaseFirstOne(data.getString("templateCode"))+".html";
+                + "out/web/components/" + data.getString("directories") + "/choose" + toUpperCaseFirstOne(data.getString("templateCode")) + "/choose" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -80,7 +79,7 @@ public class GeneratorChooseComponent extends BaseGenerator {
         fileContext = super.replaceTemplateContext(fileContext, data);
 
         String writePath = this.getClass().getResource("/").getPath()
-                +"out/web/component/"+data.getString("templateCode")+"Package/choose"+toUpperCaseFirstOne(data.getString("templateCode"))+"/choose"+toUpperCaseFirstOne(data.getString("templateCode"))+".js";
+                + "out/web/components/" + data.getString("directories") + "/choose" + toUpperCaseFirstOne(data.getString("templateCode")) + "/choose" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -101,12 +100,12 @@ public class GeneratorChooseComponent extends BaseGenerator {
         fileContext = super.replaceTemplateContext(fileContext, data);
 
         String writePath = this.getClass().getResource("/").getPath()
-                +"out/web/component/java/"+data.getString("templateCode")+"/Choose"+toUpperCaseFirstOne(data.getString("templateCode"))+"Component.java";
+                + "out/web/component/java/" + data.getString("templateCode") + "/Choose" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\components\\" +data.getString("templateCode")+"/Choose"+toUpperCaseFirstOne(data.getString("templateCode"))+"Component.java");
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\components\\" + data.getString("templateCode") + "/Choose" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java");
 
 
     }

java110-code-generator/src/main/java/com/java110/code/web/GeneratorDeleteComponent.java

@@ -13,13 +13,12 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         //处理组件
         generatorComponentHtml(data);
         generatorComponentJs(data);
-        generatorComponentJava(data);
-        genneratorIListSmo(data);
-        genneratorListSmoImpl(data);
+        // generatorComponentJava(data);
+        // genneratorIListSmo(data);
+        // genneratorListSmoImpl(data);
 //        genneratorListListener(data);
 
 
-
     }
 
     /**
@@ -35,9 +34,8 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         fileContext = super.replaceTemplateContext(fileContext, data);
 
 
-
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/"+data.getString("templateCode")+"Package/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
+                + "out/web/components/" + data.getString("directories") + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -62,7 +60,7 @@ public class GeneratorDeleteComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/"+data.getString("templateCode")+"Package/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
+                + "out/web/components/" + data.getString("directories") + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -88,8 +86,7 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\components\\" +data.getString("templateCode") + "/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java");
-
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\components\\" + data.getString("templateCode") + "/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java");
 
 
     }
@@ -111,7 +108,7 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" +data.getString("templateCode") + "/IDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMO.java");
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" + data.getString("templateCode") + "/IDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMO.java");
 
     }
 
@@ -129,7 +126,7 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         //替换校验部分代码 @@validateTemplateColumns@@
         JSONArray columns = data.getJSONArray("columns");
         StringBuffer validateStr = new StringBuffer();
-        validateStr.append("Assert.hasKeyAndValue(paramIn, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+        validateStr.append("Assert.hasKeyAndValue(paramIn, \"" + data.getString("templateKey") + "\", \"" + data.getString("templateKeyName") + "不能为空\");\n");
 
 
         fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
@@ -141,7 +138,7 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" +data.getString("templateCode") + "/impl/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java");
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" + data.getString("templateCode") + "/impl/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java");
 
     }
 
@@ -159,7 +156,7 @@ public class GeneratorDeleteComponent extends BaseGenerator {
         //替换校验部分代码 @@validateTemplateColumns@@
         JSONArray columns = data.getJSONArray("columns");
         StringBuffer validateStr = new StringBuffer();
-        validateStr.append("Assert.hasKeyAndValue(reqJson, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+        validateStr.append("Assert.hasKeyAndValue(reqJson, \"" + data.getString("templateKey") + "\", \"" + data.getString("templateKeyName") + "不能为空\");\n");
 
         fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
 
@@ -172,5 +169,4 @@ public class GeneratorDeleteComponent extends BaseGenerator {
     }
 
 
-
 }

java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java

@@ -14,13 +14,12 @@ public class GeneratorEditComponent extends BaseGenerator {
         //处理组件
         generatorComponentHtml(data);
         generatorComponentJs(data);
-        generatorComponentJava(data);
-        genneratorIListSmo(data);
-        genneratorListSmoImpl(data);
+        // generatorComponentJava(data);
+        // genneratorIListSmo(data);
+        // genneratorListSmoImpl(data);
 //        genneratorListListener(data);
 
 
-
     }
 
     /**
@@ -62,22 +61,22 @@ public class GeneratorEditComponent extends BaseGenerator {
 
                 }
 
-                inputStr = "<select class=\"custom-select\" v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\">\n" +
-                        "         <option selected  disabled value=\"\">"+ required + "，请选择" + column.getString("cnCode") + "</option>\n" +
-                        "         " +option+
+                inputStr = "<select class=\"custom-select\" v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">\n" +
+                        "         <option selected  disabled value=\"\">" + required + "，请选择" + column.getString("cnCode") + "</option>\n" +
+                        "         " + option +
                         "  </select>";
-            } else if("textarea".equals(column.getString("inputType"))){
-                inputStr = "<textarea  placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\""+
-                        " v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\">"+
+            } else if ("textarea".equals(column.getString("inputType"))) {
+                inputStr = "<textarea  placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\"" +
+                        " v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">" +
                         "</textarea>";
-            }else {
-                inputStr = "           <input v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\" " +
+            } else {
+                inputStr = "           <input v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\" " +
                         "                  type=\"text\" placeholder=\"" + required + "，请填写" + column.getString("cnCode") + "\" class=\"form-control\">\n";
             }
             thSb.append("<div class=\"form-group row\">\n" +
                     "         <label class=\"col-sm-2 col-form-label\">" + column.getString("cnCode") + "</label>\n" +
                     "         <div class=\"col-sm-10\">\n" +
-                    inputStr+
+                    inputStr +
                     "         </div>\n" +
                     "</div>\n");
 
@@ -87,7 +86,7 @@ public class GeneratorEditComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/"+data.getString("templateCode")+"Package/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
+                + "out/web/components/" + data.getString("directories") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -111,7 +110,7 @@ public class GeneratorEditComponent extends BaseGenerator {
         JSONArray columns = data.getJSONArray("columns");
 
         StringBuffer variable = new StringBuffer();
-        variable.append(data.getString("templateKey")+":'',\n");
+        variable.append(data.getString("templateKey") + ":'',\n");
         String defaultValue = "";
 
 
@@ -122,39 +121,39 @@ public class GeneratorEditComponent extends BaseGenerator {
             defaultValue = "'" + defaultValue + "'";
             variable.append(column.getString("code") + ":" + defaultValue + ",\n");
 
-            validateInfo += "'edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"Info."+column.getString("code")+"':[\n" ;
-            if(column.getBoolean("required")) {
-                validateInfo +="{\n" +
+            validateInfo += "'edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "':[\n";
+            if (column.getBoolean("required")) {
+                validateInfo += "{\n" +
                         "                            limit:\"required\",\n" +
                         "                            param:\"\",\n" +
-                        "                            errInfo:\""+column.getString("cnCode")+"不能为空\"\n" +
+                        "                            errInfo:\"" + column.getString("cnCode") + "不能为空\"\n" +
                         "                        },\n";
             }
 
-            if(column.containsKey("limit") && !StringUtils.isEmpty(column.getString("limit"))) {
-                validateInfo +=" {\n" +
-                        "                            limit:\""+column.getString("limit")+"\",\n" +
-                        "                            param:\""+column.getString("limitParam")+"\",\n" +
-                        "                            errInfo:\""+column.getString("limitErrInfo")+"\"\n" +
+            if (column.containsKey("limit") && !StringUtils.isEmpty(column.getString("limit"))) {
+                validateInfo += " {\n" +
+                        "                            limit:\"" + column.getString("limit") + "\",\n" +
+                        "                            param:\"" + column.getString("limitParam") + "\",\n" +
+                        "                            errInfo:\"" + column.getString("limitErrInfo") + "\"\n" +
                         "                        },\n" +
                         "                    ],\n";
             }
 
         }
-        validateInfo += "'edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"Info."+data.getString("templateKey")+"':[\n" ;
-        validateInfo +="{\n" +
+        validateInfo += "'edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + data.getString("templateKey") + "':[\n";
+        validateInfo += "{\n" +
                 "                            limit:\"required\",\n" +
                 "                            param:\"\",\n" +
-                "                            errInfo:\""+data.getString("templateKeyName")+"不能为空\"\n" +
+                "                            errInfo:\"" + data.getString("templateKeyName") + "不能为空\"\n" +
                 "                        }]\n";
-        fileContext =  fileContext.replace("@@templateCodeColumns@@", variable.toString());
+        fileContext = fileContext.replace("@@templateCodeColumns@@", variable.toString());
         fileContext = fileContext.replace("@@editTemplateCodeValidate@@", validateInfo);
 
         // 替换 数据校验部分代码
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/"+data.getString("templateCode")+"Package/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
+                + "out/web/components/" + data.getString("directories") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -180,8 +179,7 @@ public class GeneratorEditComponent extends BaseGenerator {
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\components\\" +data.getString("templateCode") + "/Edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java");
-
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\components\\" + data.getString("templateCode") + "/Edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java");
 
 
     }
@@ -203,7 +201,7 @@ public class GeneratorEditComponent extends BaseGenerator {
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" +data.getString("templateCode") + "/IEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMO.java");
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" + data.getString("templateCode") + "/IEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMO.java");
 
     }
 
@@ -222,11 +220,11 @@ public class GeneratorEditComponent extends BaseGenerator {
         JSONArray columns = data.getJSONArray("columns");
         StringBuffer validateStr = new StringBuffer();
 
-        validateStr.append("Assert.hasKeyAndValue(paramIn, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+        validateStr.append("Assert.hasKeyAndValue(paramIn, \"" + data.getString("templateKey") + "\", \"" + data.getString("templateKeyName") + "不能为空\");\n");
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
-            if(column.getBoolean("required")) {
-                validateStr.append("Assert.hasKeyAndValue(paramIn, \""+column.getString("code")+"\", \""+column.getString("desc")+"\");\n");
+            if (column.getBoolean("required")) {
+                validateStr.append("Assert.hasKeyAndValue(paramIn, \"" + column.getString("code") + "\", \"" + column.getString("desc") + "\");\n");
             }
         }
 
@@ -239,7 +237,7 @@ public class GeneratorEditComponent extends BaseGenerator {
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
-        FileUtilBase.copyfile(writePath,"FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" +data.getString("templateCode") + "/impl/Edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java");
+        FileUtilBase.copyfile(writePath, "FrontService\\src\\main\\java\\com\\java110\\front\\smo\\" + data.getString("templateCode") + "/impl/Edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java");
 
     }
 
@@ -257,11 +255,11 @@ public class GeneratorEditComponent extends BaseGenerator {
         //替换校验部分代码 @@validateTemplateColumns@@
         JSONArray columns = data.getJSONArray("columns");
         StringBuffer validateStr = new StringBuffer();
-        validateStr.append("Assert.hasKeyAndValue(reqJson, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+        validateStr.append("Assert.hasKeyAndValue(reqJson, \"" + data.getString("templateKey") + "\", \"" + data.getString("templateKeyName") + "不能为空\");\n");
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
-            if(column.getBoolean("required")) {
-                validateStr.append("Assert.hasKeyAndValue(reqJson, \""+column.getString("code")+"\", \""+column.getString("desc")+"\");\n");
+            if (column.getBoolean("required")) {
+                validateStr.append("Assert.hasKeyAndValue(reqJson, \"" + column.getString("code") + "\", \"" + column.getString("desc") + "\");\n");
             }
         }
 
@@ -276,5 +274,4 @@ public class GeneratorEditComponent extends BaseGenerator {
     }
 
 
-
 }

java110-code-generator/src/main/java/com/java110/code/web/GeneratorFlow.java

@@ -1,44 +0,0 @@
-package com.java110.code.web;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.code.back.BaseGenerator;
-
-public class GeneratorFlow extends BaseGenerator {
-
-    public void generator(JSONObject data) {
-
-        //处理组件
-        generatorComponentHtml(data);
-
-
-
-
-    }
-
-    /**
-     * 生成 html js java 类
-     *
-     * @param data
-     */
-    private void generatorComponentHtml(JSONObject data) {
-
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/flow.html").getFile());
-        String fileContext = sb.toString();
-
-        fileContext = super.replaceTemplateContext(fileContext, data);
-
-
-        String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/" + data.getString("templateCode") + "/" + data.getString("templateCode") + "Flow.html";
-        System.out.printf("writePath: " + writePath);
-        writeFile(writePath,
-                fileContext);
-
-
-    }
-
-
-
-
-}

java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java

@@ -13,9 +13,9 @@ public class GeneratorManagerComponent extends BaseGenerator {
         //处理组件
         generatorComponentHtml(data);
         generatorComponentJs(data);
-        generatorComponentJava(data);
-        genneratorIListSmo(data);
-        genneratorListSmoImpl(data);
+      //  generatorComponentJava(data);
+      //  genneratorIListSmo(data);
+      //  genneratorListSmoImpl(data);
 //        genneratorVo(data);
 
 //        genneratorDataVo(data);
@@ -165,7 +165,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/" + data.getString("templateCode") + "Package/" + data.getString("templateCode") + "Manage/" + data.getString("templateCode") + "Manage.html";
+                + "out/web/pages/" + data.getString("directories") + "/" + data.getString("templateCode") + "Manage/" + data.getString("templateCode") + "Manage.html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -221,7 +221,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
         fileContext = fileContext.replace("@@extendEvent@@", conditionEvent.toString());
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/" + data.getString("templateCode") + "Package/" + data.getString("templateCode") + "Manage/" + data.getString("templateCode") + "Manage.js";
+                + "out/web/pages/" + data.getString("directories") + "/" + data.getString("templateCode") + "Manage/" + data.getString("templateCode") + "Manage.js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);

java110-code-generator/src/main/java/com/java110/code/web/GeneratorStart.java

@@ -7,15 +7,11 @@ public class GeneratorStart extends BaseGenerator {
 
     public static void main(String[] args) throws Exception {
         //加载配置
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/template_company.json").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/template_1.json").getFile());
 
         JSONObject data = JSONObject.parseObject(sb.toString());
 
 
-        GeneratorFlow flow = new GeneratorFlow();
-//        flow.generator(data);     //生成flow页面
-
-
         GeneratorManagerComponent managerComponent = new GeneratorManagerComponent();
         managerComponent.generator(data);
 

java110-code-generator/src/main/java/com/java110/code/web/GeneratorViewComponent.java

@@ -41,18 +41,18 @@ public class GeneratorViewComponent extends BaseGenerator {
         cols.addAll(columns);
         for (int columnIndex = 0; columnIndex < cols.size(); columnIndex++) {
             JSONObject column = cols.getJSONObject(columnIndex);
-            if(columnIndex % 3 == 0){
+            if (columnIndex % 3 == 0) {
                 thSb.append("<div class=\"row\">\n");
             }
 
             thSb.append("<div class=\"col-sm-4\">\n" +
                     "                        <div class=\"form-group\">\n" +
-                    "                            <label class=\"col-form-label\" >"+column.getString("cnCode")+"：</label>\n" +
-                    "                            <label class=\"\">{{view"+toUpperCaseFirstOne(data.getString("templateCode"))+"Info."+column.getString("code")+"}}</label>\n" +
+                    "                            <label class=\"col-form-label\" >" + column.getString("cnCode") + "：</label>\n" +
+                    "                            <label class=\"\">{{view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "}}</label>\n" +
                     "                        </div>\n" +
                     "</div>\n");
 
-            if(columnIndex % 3 == 2 || columnIndex == columns.size() -1){
+            if (columnIndex % 3 == 2 || columnIndex == columns.size() - 1) {
                 thSb.append("</div>\n");
             }
 
@@ -62,7 +62,7 @@ public class GeneratorViewComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/"+data.getString("templateCode")+"Package/view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info/view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info.html";
+                + "out/web/components/" + data.getString("directories") + "/view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info/view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info.html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -93,13 +93,13 @@ public class GeneratorViewComponent extends BaseGenerator {
             variable.append(column.getString("code") + ":'',\n");
 
         }
-        fileContext =  fileContext.replace("@@templateCodeColumns@@", variable.toString());
+        fileContext = fileContext.replace("@@templateCodeColumns@@", variable.toString());
 
         // 替换 数据校验部分代码
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/"+data.getString("templateCode")+"Package/view"
+                + "out/web/components/" + data.getString("directories") + "/view"
                 + toUpperCaseFirstOne(data.getString("templateCode")) + "Info/view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info.js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,

java110-code-generator/src/main/resources/web/manage/manage.html

@@ -52,7 +52,7 @@
                         </tfoot>
                     </table>
                     <!-- 分页 -->
-                    <vc:create path="pagination"></vc:create>
+                    <vc:create path="frame/pagination"></vc:create>
                 </div>
             </div>
         </div>
@@ -60,11 +60,11 @@
 
     @@vcCreate@@
 
-    <vc:create path="add@@TemplateCode@@"
+    <vc:create path="@@directories@@/add@@TemplateCode@@"
                callBackListener=""
                callBackFunction=""
     ></vc:create>
-    <vc:create path="edit@@TemplateCode@@"></vc:create>
-    <vc:create path="delete@@TemplateCode@@"></vc:create>
+    <vc:create path="@@directories@@/edit@@TemplateCode@@"></vc:create>
+    <vc:create path="@@directories@@/delete@@TemplateCode@@"></vc:create>
 
 </div>

java110-code-generator/src/main/resources/web/template_1.json

@@ -1,5 +1,6 @@
 {
   "templateName":"小程序管理",
+  "directories": "property",
   "templateCode":"smallWeChat",
   "templateKey":"weChatId",
   "templateKeyName":"编码",

java110-code-generator/src/main/resources/web/view/viewInfo.html

@@ -17,13 +17,13 @@
         </div>
     </div>
 
-    <vc:create path="add@@TemplateCode@@"
+    <vc:create path="@@directories@@/add@@TemplateCode@@"
                callBackListener="view@@TemplateCode@@Info"
                callBackFunction="choose@@TemplateCode@@"
     ></vc:create>
 
 
-    <vc:create path="choose@@TemplateCode@@"
+    <vc:create path="@@directories@@/choose@@TemplateCode@@"
                emitChoose@@TemplateCode@@="view@@TemplateCode@@Info"
                emitLoadData="view@@TemplateCode@@Info"
     ></vc:create>