优化前段代码生成器

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

@@ -106,7 +106,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/component/" + data.getString("templateCode") + "Package/add" + toUpperCaseFirstOne(data.getString("templateCode")) + "/add" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);

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

@@ -1,38 +1,50 @@
 {
-  "templateName":"巡检任务",
-  "templateCode":"inspectionTask",
-  "templateKey":"taskId",
-  "templateKeyName":"任务编码",
-  "searchCode": "taskId",
-  "searchName": "任务编码",
+  "templateName":"旧货",
+  "templateCode":"junkRequirement",
+  "templateKey":"junkRequirementId",
+  "templateKeyName":"旧货编码",
+  "searchCode": "junkRequirementId",
+  "searchName": "旧货编码",
   "conditions": [
     {
-      "name": "执行人",
-      "inputType": "input",
-      "code": "planUserName",
+      "name": "类别",
+      "inputType": "select",
+      "selectValue":"10001,10002",
+      "selectValueName":"家具,电器",
+      "code": "classification",
       "whereCondition": "equal"
     },
     {
-      "name": "巡检计划",
+      "name": "发布人",
       "inputType": "input",
-      "code": "inspectionPlanId",
+      "code": "publishUserName",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "状态",
+      "inputType": "select",
+      "selectValue":"12001,13001,14001,15001",
+      "selectValueName":"未审核,审核通过,审核失败,处理完成",
+      "code": "publishUserLink",
       "whereCondition": "equal"
     },
     {
-      "name": "巡检时间",
+      "name": "发布电话",
       "inputType": "input",
-      "code": "actInsTime",
+      "code": "publishUserLink",
       "whereCondition": "equal"
     }
   ],
   "columns":[
     {
-      "code":"taskId",
-      "cnCode":"任务编码",
-      "desc":"必填，请选择任务编码",
+      "code":"classification",
+      "cnCode":"类别",
+      "desc":"必填，请选择类别",
       "required":true,
       "hasDefaultValue":false,
-      "inputType": "input",
+      "inputType": "select",
+      "selectValue":"10001,10002",
+      "selectValueName":"家具,电器",
       "limit":"num",
       "limitParam":"",
       "limitErrInfo":"任务编码格式错误",
@@ -51,67 +63,65 @@
       "show": true
     },
     {
-      "code":"planInsTime",
-      "cnCode":"巡检时间",
-      "desc":"必填，请选择费用标识",
+      "code":"context",
+      "cnCode":"内容",
+      "desc":"必填，请选择内容",
       "required":true,
       "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"1003006,2006012",
-      "selectValueName":"周期性费用,一次性费用",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"费用类型格式错误",
-      "show": true
+      "inputType": "input",
+      "limit":"maxLength",
+      "limitParam":"200",
+      "limitErrInfo":"内容不能超过200个字符",
+      "show": false
     },
     {
-      "code": "actInsTime",
-      "cnCode":"实际巡检时间",
-      "desc":"必填，请选择计费起始时间",
+      "code": "referencePrice",
+      "cnCode":"参考价格",
+      "desc":"必填，请填写参考价格",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"dateTime",
+      "limit":"money",
       "limitParam":"",
-      "limitErrInfo":"计费起始时间不是有效的时间格式",
+      "limitErrInfo":"参考价格格式错误",
       "show": true
     },
     {
-      "code": "planUserName",
-      "cnCode":"巡检人",
-      "desc":"必填，请选择计费终止时间",
+      "code": "publishUserName",
+      "cnCode":"发布人",
+      "desc":"必填，发布人不能为空",
       "required":true,
       "hasDefaultValue":false,
       "inputType": "input",
-      "limit":"dateTime",
-      "limitParam":"",
-      "limitErrInfo":"计费终止时间不是有效的时间格式",
+      "limit":"maxLength",
+      "limitParam":"50",
+      "limitErrInfo":"发布人不能超过50",
       "show": true
     },
     {
-      "code":"actUserName",
-      "cnCode":"实际巡检人",
-      "desc":"必填，请填写附加费用",
+      "code":"publishUserLink",
+      "cnCode":"联系方式",
+      "desc":"必填，请填写联系方式",
       "required":true,
       "hasDefaultValue":false,
-      "inputType": "select",
-      "selectValue":"1001,2002",
-      "selectValueName":"面积*单价+附加费,固定费用",
-      "limit":"num",
+      "inputType": "input",
+      "limit":"phone",
       "limitParam":"",
-      "limitErrInfo":"计算公式格式错误",
-      "show": false
+      "limitErrInfo":"联系方式不是有效的电话格式",
+      "show": true
     },
     {
-      "code":"signType",
-      "cnCode":"巡检方式",
-      "desc":"必填，请填写计费单价",
+      "code":"state",
+      "cnCode":"状态",
+      "desc":"必填，请填写状态",
       "required":true,
       "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"money",
+      "inputType": "select",
+      "selectValue":"12001,13001,14001,15001",
+      "selectValueName":"未审核,审核通过,审核失败,处理完成",
+      "limit":"num",
       "limitParam":"",
-      "limitErrInfo":"计费单价格式错误",
+      "limitErrInfo":"状态格式错误",
       "show": true
     }
   ]

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

@@ -0,0 +1,118 @@
+{
+  "templateName":"巡检任务",
+  "templateCode":"inspectionTask",
+  "templateKey":"taskId",
+  "templateKeyName":"任务编码",
+  "searchCode": "taskId",
+  "searchName": "任务编码",
+  "conditions": [
+    {
+      "name": "执行人",
+      "inputType": "input",
+      "code": "planUserName",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "巡检计划",
+      "inputType": "input",
+      "code": "inspectionPlanId",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "巡检时间",
+      "inputType": "input",
+      "code": "actInsTime",
+      "whereCondition": "equal"
+    }
+  ],
+  "columns":[
+    {
+      "code":"taskId",
+      "cnCode":"任务编码",
+      "desc":"必填，请选择任务编码",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"任务编码格式错误",
+      "show": true
+    },
+    {
+      "code": "inspectionPlanId",
+      "cnCode":"巡检计划",
+      "desc":"必填，请填写收费项目",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"maxin",
+      "limitParam":"1,100",
+      "limitErrInfo":"收费项目不能超过100位",
+      "show": true
+    },
+    {
+      "code":"planInsTime",
+      "cnCode":"巡检时间",
+      "desc":"必填，请选择费用标识",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"1003006,2006012",
+      "selectValueName":"周期性费用,一次性费用",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"费用类型格式错误",
+      "show": true
+    },
+    {
+      "code": "actInsTime",
+      "cnCode":"实际巡检时间",
+      "desc":"必填，请选择计费起始时间",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"dateTime",
+      "limitParam":"",
+      "limitErrInfo":"计费起始时间不是有效的时间格式",
+      "show": true
+    },
+    {
+      "code": "planUserName",
+      "cnCode":"巡检人",
+      "desc":"必填，请选择计费终止时间",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"dateTime",
+      "limitParam":"",
+      "limitErrInfo":"计费终止时间不是有效的时间格式",
+      "show": true
+    },
+    {
+      "code":"actUserName",
+      "cnCode":"实际巡检人",
+      "desc":"必填，请填写附加费用",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"面积*单价+附加费,固定费用",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"计算公式格式错误",
+      "show": false
+    },
+    {
+      "code":"signType",
+      "cnCode":"巡检方式",
+      "desc":"必填，请填写计费单价",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
+      "limit":"money",
+      "limitParam":"",
+      "limitErrInfo":"计费单价格式错误",
+      "show": true
+    }
+  ]
+}

java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -946,18 +946,21 @@ public class BusinessTypeConstant {
     public static final String BUSINESS_TYPE_DELETE_INSPECTION_TASK_DETAIL="540200050001";
 
     /**
-     *  保存巡检任务
+     *  保存旧货市场
      *  3保存
      */
     public static final String BUSINESS_TYPE_SAVE_JUNK_REQUIREMENT="550200030001";
 
 
     /**
-     *  保存巡检任务
+     *  修改旧货市场
      *  3保存
      */
     public static final String BUSINESS_TYPE_UPDATE_JUNK_REQUIREMENT="550200040001";
 
+    /**
+     * 删除旧货市场
+     */
     public static final String BUSINESS_TYPE_DELETE_JUNK_REQUIREMENT="550200050001";