调整代码生成器

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

@@ -38,7 +38,7 @@ public class BackCoderGeneratorStart extends BaseGenerator {
     public static void main(String[] args) {
 
         //加载配置
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/template_1.json").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/back/template_1.json").getFile());
 
         JSONObject dataJson = JSONObject.parseObject(sb.toString());
 

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

@@ -17,7 +17,7 @@ public class GeneratorIInnerServiceSMO extends BaseGenerator {
                 .replace("Store", toUpperCaseFirstOne(data.getName()))
                 .replace("商户", data.getDesc());
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/back/dto/" + data.getName() + "/I" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMO.java";
+                + "out/back/core/smo/" + data.getName() + "/I" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMO.java";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -18,7 +18,7 @@ public class GeneratorIServiceDaoListener extends BaseGenerator {
                 .replace("商户",data.getDesc());
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/back/listener/" + data.getName() + "/I"+toUpperCaseFirstOne(data.getName())+"ServiceDao.java";
+                + "out/back/dao/I"+toUpperCaseFirstOne(data.getName())+"ServiceDao.java";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -17,7 +17,7 @@ public class GeneratorInnerServiceSMOImpl extends BaseGenerator {
                 .replace("Store", toUpperCaseFirstOne(data.getName()))
                 .replace("商户", data.getDesc());
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/back/listener/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMOImpl.java";
+                + "out/back/smo/impl/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMOImpl.java";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -15,7 +15,7 @@ public class GeneratorServiceDaoImplListener extends BaseGenerator {
                 .replace("Store", toUpperCaseFirstOne(data.getName()))
                 .replace("商户", data.getDesc());
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/back/listener/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImpl.java";
+                + "out/back/dao/impl/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImpl.java";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -322,7 +322,7 @@ public class GeneratorServiceDaoImplMapperListener extends BaseGenerator {
         fileContext = dealUpdateInfoInstance(data, fileContext);
         fileContext = dealGetCount(data, fileContext);
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/back/listener/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImplMapper.xml";
+                + "out/back/mapper/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImplMapper.xml";
 
         writeFile(writePath,
                 fileContext);

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

@@ -1,38 +1,56 @@
 {
-  "id": "activitiesId",
-  "name": "activities",
+  "id": "taskId",
+  "name": "inspectionTask",
   "desc": "活动",
   "shareParam": "communityId",
   "shareColumn": "community_id",
-  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_ACTIVITIES",
-  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_ACTIVITIES",
-  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_ACTIVITIES",
-  "newBusinessTypeCdValue": "290200030001",
-  "updateBusinessTypeCdValue": "290200040001",
-  "deleteBusinessTypeCdValue": "290200050001",
-  "businessTableName": "business_activities",
-  "tableName": "activities",
+  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_INSPECTION_TASK",
+  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_INSPECTION_TASK",
+  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_INSPECTION_TASK",
+  "newBusinessTypeCdValue": "530200030001",
+  "updateBusinessTypeCdValue": "530200030001",
+  "deleteBusinessTypeCdValue": "530200030001",
+  "businessTableName": "business_inspection_task",
+  "tableName": "inspection_task",
   "param": {
-    "activitiesId": "activities_id",
-    "title": "title",
-    "typeCd": "type_cd",
-    "headerImg": "header_img",
-    "context": "context",
+    "taskId": "task_id",
+    "inspectionPlanId": "inspection_plan_id",
+    "planInsTime": "plan_ins_time",
+    "actInsTime": "act_ins_time",
+    "planUserId": "plan_user_id",
     "communityId": "community_id",
-    "readCount": "read_count",
-    "likeCount": "like_count",
-    "collectCount": "collect_count",
-    "userId": "user_id",
-    "userName": "user_name",
-    "startTime": "start_time",
-    "endTime": "end_time",
+    "planUserName": "plan_user_name",
+    "actUserId": "act_user_id",
+    "actUserName": "act_user_name",
+    "signType": "sign_type",
     "statusCd": "status_cd",
     "operate": "operate",
     "bId": "b_id"
   },
   "required": [
     {
-      "code": "activitiesId"
+      "code": "inspectionPlanId",
+      "msg": "巡检计划不能为空"
+    },
+    {
+      "code": "actInsTime",
+      "msg": "巡检时间不能为空"
+    },
+    {
+      "code": "communityId",
+      "msg": "小区不能为空"
+    },
+    {
+      "code": "actUserId",
+      "msg": "巡检人不能为空"
+    },
+    {
+      "code": "actUserName",
+      "msg": "巡检人不能为空"
+    },
+    {
+      "code": "signType",
+      "msg": "巡检方式不能为空"
     }
   ]
 }

java110-code-generator/src/main/resources/back/template_demo.json

@@ -0,0 +1,38 @@
+{
+  "id": "activitiesId",
+  "name": "activities",
+  "desc": "活动",
+  "shareParam": "communityId",
+  "shareColumn": "community_id",
+  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_ACTIVITIES",
+  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_ACTIVITIES",
+  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_ACTIVITIES",
+  "newBusinessTypeCdValue": "290200030001",
+  "updateBusinessTypeCdValue": "290200040001",
+  "deleteBusinessTypeCdValue": "290200050001",
+  "businessTableName": "business_activities",
+  "tableName": "activities",
+  "param": {
+    "activitiesId": "activities_id",
+    "title": "title",
+    "typeCd": "type_cd",
+    "headerImg": "header_img",
+    "context": "context",
+    "communityId": "community_id",
+    "readCount": "read_count",
+    "likeCount": "like_count",
+    "collectCount": "collect_count",
+    "userId": "user_id",
+    "userName": "user_name",
+    "startTime": "start_time",
+    "endTime": "end_time",
+    "statusCd": "status_cd",
+    "operate": "operate",
+    "bId": "b_id"
+  },
+  "required": [
+    {
+      "code": "activitiesId"
+    }
+  ]
+}

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

@@ -909,4 +909,12 @@ public class BusinessTypeConstant {
     public static final String BUSINESS_TYPE_DELETE_INSPECTION_PLAN ="520200050001";
 
 
+    /**
+     *  保存巡检任务
+     *  3保存
+     */
+    public static final String BUSINESS_TYPE_SAVE_INSPECTION_TASK="530200030001";
+
+
+
 }