优化代码生成器

java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java

@@ -7,19 +7,19 @@ import com.java110.utils.util.StringUtil;
 public class TableToJsonWeb {
 
     //show create table c_orders  用这个语句获取
-    public static final String createTableSql = "CREATE TABLE waf_ip_black_white(\n" +
-            "    id          varchar(64) not null COMMENT '编号',\n" +
-            "    type_cd     varchar(64) not null  COMMENT '类型',\n" +
-            "    ip          varchar(64) not null  COMMENT 'IP'\n" +
-            ");";
+    public static final String createTableSql = "CREATE TABLE `fee_combo` (\n" +
+            "  `combo_id` varchar(30) NOT NULL COMMENT '套餐ID',\n" +
+            "  `combo_name` varchar(30) NOT NULL COMMENT '套餐名称',\n" +
+            "  `community_id` varchar(30) NOT NULL COMMENT '小区ID'\n" +
+            ") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
     public static void main(String[] args) {
-        String templateName = "黑白名单"; //业务名称
-        String templateCode = "wafIpBlackWhite"; //表名大写
-        String templateKey = "id"; //表主键
+        String templateName = "费用套餐"; //业务名称
+        String templateCode = "feeCombo"; //表名大写
+        String templateKey = "comboId"; //表主键
         String templateKeyName = "编号";//主键说明
-        String searchCode = "id"; //分片字段
+        String searchCode = "comboId"; //分片字段
         String searchName = "编号"; //分片字段说明
-        String directories = "admin"; //前端生成到那个目录下
+        String directories = "property"; //前端生成到那个目录下
         // templateName 业务名称 业务编码名称生成后文件名 templateCode 主键 templateKey
         // 业务主键名称 templateKeyName=templateName+ID 主机驼峰 searchCode 主键名称 searchName
         // directories 放在前端那个目录下

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

@@ -78,12 +78,12 @@ public class GeneratorAddComponent extends BaseGenerator {
 
                     String value = selectValues[valueIndex];
 
-                    option += "<option  value=\"" + value + "\"><span><vc:i18n name='" + selectValueNames[valueIndex] + "' namespace='add"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></option>\n";
+                    option += "<option  value=\"" + value + "\">{{vc.i18n('" + selectValueNames[valueIndex] + "','add"+toUpperCaseFirstOne(data.getString("templateCode"))+"')}}</option>\n";
 
                 }
 
                 inputStr = "<select class=\"custom-select\" v-model=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">\n" +
-                        "         <option selected  disabled value=\"\"><span><vc:i18n name='" + required + "，请选择" + column.getString("cnCode") + "' namespace='add"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></option>\n" +
+                        "         <option selected  disabled value=\"\">{{vc.i18n('" + required + "，请选择" + column.getString("cnCode") + "','add"+toUpperCaseFirstOne(data.getString("templateCode"))+"')}}</option>\n" +
                         "         " + option +
                         "  </select>";
             } else if ("textarea".equals(column.getString("inputType"))) {

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

@@ -40,18 +40,18 @@ public class GeneratorChooseComponent extends BaseGenerator {
 
         StringBuffer thSb = new StringBuffer();
         StringBuffer tdSb = new StringBuffer();
-        thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + data.getString("templateKeyName") + "' namespace='choose"+data.getString("templateCode")+"'></vc:i18n><span></th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='" + data.getString("templateKeyName") + "' namespace='choose"+data.getString("templateCode")+"'></vc:i18n></span></th>\n");
 
         tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + data.getString("templateKey") + "}}</td>\n");
 
         JSONArray columns = data.getJSONArray("columns");
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
-            thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + column.getString("cnCode") + "' namespace='choose"+data.getString("templateCode")+"'></vc:i18n><span> </th>\n");
+            thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='" + column.getString("cnCode") + "' namespace='choose"+data.getString("templateCode")+"'></vc:i18n></span> </th>\n");
 
             tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + column.getString("code") + "}}</td>\n");
         }
-        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='操作'></i18n></span></th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='操作'></vc:i18n></span></th>\n");
 
         fileContext = fileContext.replace("@@columnsCnCode@@", thSb.toString())
                 .replace("@@columnsName@@", tdSb.toString());

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

@@ -57,12 +57,12 @@ public class GeneratorEditComponent extends BaseGenerator {
 
                     String value = selectValues[valueIndex];
 
-                    option += "<option  value=\"" + value + "\"><span><vc:i18n name='" + selectValueNames[valueIndex] + "' namespace='edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span> </option>\n";
+                    option += "<option  value=\"" + value + "\">{{vc.i18n('" + selectValueNames[valueIndex] + "' ,'edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"')}} </option>\n";
 
                 }
 
                 inputStr = "<select class=\"custom-select\" v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "\">\n" +
-                        "         <option selected  disabled value=\"\"> <span><vc:i18n name='" + required + "，请选择" + column.getString("cnCode") + "' namespace='edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"'></vc:i18n></span></option>\n" +
+                        "         <option selected  disabled value=\"\">{{vc.i18n('" + required + "，请选择" + column.getString("cnCode") + "' ,'edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"')}}</option>\n" +
                         "         " + option +
                         "  </select>";
             } else if ("textarea".equals(column.getString("inputType"))) {

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

@@ -139,7 +139,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
 
         StringBuffer thSb = new StringBuffer();
         StringBuffer tdSb = new StringBuffer();
-        thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + data.getString("templateKeyName") + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n><span></th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='" + data.getString("templateKeyName") + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n></span></th>\n");
 
         tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + data.getString("templateKey") + "}}</td>\n");
 
@@ -147,16 +147,16 @@ public class GeneratorManagerComponent extends BaseGenerator {
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
             if (column.getBoolean("show")) {
-                thSb.append("                            <th class=\"text-center\"><span><vc:i18n='" + column.getString("cnCode") + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n><span></th>\n");
+                thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='" + column.getString("cnCode") + "' namespace='"+data.getString("templateCode")+"Manage'></vc:i18n></span></th>\n");
                 tdSb.append("                            <td class=\"text-center\">{{" + data.getString("templateCode") + "." + column.getString("code") + "}}</td>\n");
             }
         }
-        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='操作'></i18n></span></th>\n");
+        thSb.append("                            <th class=\"text-center\"><span><vc:i18n name='操作'></vc:i18n></span></th>\n");
         tdSb.append("                            <td class=\"text-center\"><div class=\"btn-group\">\n" +
-                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\"><span><vc:i18n name='修改'></i18n></span></button>\n" +
+                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\"><span><vc:i18n name='修改'></vc:i18n></span></button>\n" +
                 "                                </div>\n" +
                 "                                <div class=\"btn-group\">\n" +
-                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\"><span><vc:i18n name='删除'></i18n></span></button>\n" +
+                "                                    <button class=\"btn-white btn btn-xs\" v-on:click=\"_openDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Model(" + data.getString("templateCode") + ")\"><span><vc:i18n name='删除'></vc:i18n></span></button>\n" +
                 "                                </div></td>\n");
 
         fileContext = fileContext.replace("@@columnsCnCode@@", thSb.toString())

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

@@ -47,7 +47,7 @@ public class GeneratorViewComponent extends BaseGenerator {
 
             thSb.append("<div class=\"col-sm-4\">\n" +
                     "                        <div class=\"form-group\">\n" +
-                    "                            <label class=\"col-form-label\" > <span><vc:i18n='" + column.getString("cnCode") + "' namespace='view"+data.getString("templateCode")+"Info'></vc:i18n><span>：</label>\n" +
+                    "                            <label class=\"col-form-label\" > <span><vc:i18n name='" + column.getString("cnCode") + "' namespace='view"+data.getString("templateCode")+"Info'></vc:i18n></span>：</label>\n" +
                     "                            <label class=\"\">{{view" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info." + column.getString("code") + "}}</label>\n" +
                     "                        </div>\n" +
                     "</div>\n");

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

@@ -1,59 +1,43 @@
 {
   "templateKeyName": "编号",
-  "templateName": "黑白名单",
+  "templateName": "费用套餐",
   "columns": [
     {
       "hasDefaultValue": false,
-      "limitParam": "64",
-      "code": "typeCd",
-      "limitErrInfo": "类型不能超过64",
-      "cnCode": "类型",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "select",
-      "selectValue":"B,W",
-      "selectValueName":"黑名单,白名单",
-      "required": true,
-      "desc": "必填，类型"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "64",
-      "code": "ip",
-      "limitErrInfo": "IP'不能超过64",
-      "cnCode": "IP'",
+      "limitParam": "30",
+      "code": "comboName",
+      "limitErrInfo": "套餐名称不能超过30",
+      "cnCode": "套餐名称",
       "limit": "maxLength",
       "show": true,
       "inputType": "input",
       "required": true,
-      "desc": "必填，IP"
+      "desc": "必填，套餐名称"
     }
   ],
   "searchName": "编号",
-  "directories": "admin",
-  "searchCode": "id",
-  "templateCode": "wafIpBlackWhite",
+  "directories": "property",
+  "searchCode": "comboId",
+  "templateCode": "feeCombo",
   "conditions": [
     {
       "whereCondition": "equal",
-      "code": "id",
-      "name": "编号",
+      "code": "comboId",
+      "name": "套餐ID",
       "inputType": "input"
     },
     {
       "whereCondition": "equal",
-      "code": "typeCd",
-      "name": "类型",
-      "inputType": "select",
-      "selectValue":"B,W",
-      "selectValueName":"黑名单,白名单"
+      "code": "comboName",
+      "name": "套餐名称",
+      "inputType": "input"
     },
     {
       "whereCondition": "equal",
-      "code": "ip",
-      "name": "IP",
+      "code": "communityId",
+      "name": "小区ID",
       "inputType": "input"
     }
   ],
-  "templateKey": "id"
-}
+  "templateKey": "comboId"
+}

service-fee/src/main/java/com/java110/fee/cmd/feeComboMember/UpdateFeeComboMemberCmd.java

@@ -55,7 +55,7 @@ public class UpdateFeeComboMemberCmd extends AbstractServiceCmdListener {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "comboId", "comboId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }