优化代码生成器

FrontService/src/main/java/com/java110/front/smo/common/impl/CommonPostSMOImpl.java

@@ -38,8 +38,9 @@ public class CommonPostSMOImpl extends AbstractComponentSMO implements ICommonPo
     @Override
     protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) throws Exception {
         ResponseEntity<String> responseEntity = null;
-        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
-
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+        paramIn.put("userId",result.getUserId());
+        paramIn.put("storeId",result.getStoreId());
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + pd.getApiUrl(),
                 HttpMethod.POST);

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

@@ -39,7 +39,24 @@ public class BackCoderGeneratorStart extends BaseGenerator {
         //加载配置
         StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/template_1.json").getFile());
 
-        JSONObject data = JSONObject.parseObject(sb.toString());
+        JSONObject dataJson = JSONObject.parseObject(sb.toString());
+
+        Data data = new Data();
+
+        data.setId(dataJson.getString("id"));
+        data.setName(dataJson.getString("name"));
+        data.setDesc(dataJson.getString("desc"));
+        data.setShareParam(dataJson.getString("shareParam"));
+        data.setShareColumn(dataJson.getString("shareColumn"));
+        data.setNewBusinessTypeCd(dataJson.getString("newBusinessTypeCd"));
+        data.setUpdateBusinessTypeCd(dataJson.getString("updateBusinessTypeCd"));
+        data.setDeleteBusinessTypeCd(dataJson.getString("deleteBusinessTypeCd"));
+        data.setNewBusinessTypeCdValue(dataJson.getString("newBusinessTypeCdValue"));
+        data.setUpdateBusinessTypeCdValue(dataJson.getString("updateBusinessTypeCdValue"));
+        data.setDeleteBusinessTypeCdValue(dataJson.getString("deleteBusinessTypeCdValue"));
+        data.setBusinessTableName(dataJson.getString("businessTableName"));
+        data.setTableName(dataJson.getString("tableName"));
+        data.setParams(dataJson.getJSONObject("param"));
 
         GeneratorSaveInfoListener generatorSaveInfoListener = new GeneratorSaveInfoListener();
         generatorSaveInfoListener.generator(data);

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

@@ -0,0 +1,165 @@
+package com.java110.code.back;
+
+import java.util.Map;
+
+/**
+ * @ClassName Data
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2020/3/22 17:00
+ * @Version 1.0
+ * add by wuxw 2020/3/22
+ **/
+public class Data {
+
+    private String packagePath;
+
+    private String id;
+
+    private String name;
+
+    private String desc;
+
+    private String newBusinessTypeCd;
+
+    private String updateBusinessTypeCd;
+
+    private String deleteBusinessTypeCd;
+
+    private String newBusinessTypeCdValue;
+
+    private String updateBusinessTypeCdValue;
+
+    private String deleteBusinessTypeCdValue;
+
+    private String businessTableName;
+
+    private String tableName;
+    //分片数据库字段 如community_id
+    private String shareColumn;
+    //分片传入参数 如communityId
+    private String shareParam;
+
+    private Map params;
+
+    public String getPackagePath() {
+        return packagePath;
+    }
+
+    public void setPackagePath(String packagePath) {
+        this.packagePath = packagePath;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Map getParams() {
+        return params;
+    }
+
+    public void setParams(Map params) {
+        this.params = params;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+
+    public String getBusinessTableName() {
+        return businessTableName;
+    }
+
+    public void setBusinessTableName(String businessTableName) {
+        this.businessTableName = businessTableName;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getNewBusinessTypeCd() {
+        return newBusinessTypeCd;
+    }
+
+    public void setNewBusinessTypeCd(String newBusinessTypeCd) {
+        this.newBusinessTypeCd = newBusinessTypeCd;
+    }
+
+    public String getUpdateBusinessTypeCd() {
+        return updateBusinessTypeCd;
+    }
+
+    public void setUpdateBusinessTypeCd(String updateBusinessTypeCd) {
+        this.updateBusinessTypeCd = updateBusinessTypeCd;
+    }
+
+    public String getDeleteBusinessTypeCd() {
+        return deleteBusinessTypeCd;
+    }
+
+    public void setDeleteBusinessTypeCd(String deleteBusinessTypeCd) {
+        this.deleteBusinessTypeCd = deleteBusinessTypeCd;
+    }
+
+    public String getNewBusinessTypeCdValue() {
+        return newBusinessTypeCdValue;
+    }
+
+    public void setNewBusinessTypeCdValue(String newBusinessTypeCdValue) {
+        this.newBusinessTypeCdValue = newBusinessTypeCdValue;
+    }
+
+    public String getUpdateBusinessTypeCdValue() {
+        return updateBusinessTypeCdValue;
+    }
+
+    public void setUpdateBusinessTypeCdValue(String updateBusinessTypeCdValue) {
+        this.updateBusinessTypeCdValue = updateBusinessTypeCdValue;
+    }
+
+    public String getDeleteBusinessTypeCdValue() {
+        return deleteBusinessTypeCdValue;
+    }
+
+    public void setDeleteBusinessTypeCdValue(String deleteBusinessTypeCdValue) {
+        this.deleteBusinessTypeCdValue = deleteBusinessTypeCdValue;
+    }
+
+    public String getShareColumn() {
+        return shareColumn;
+    }
+
+    public void setShareColumn(String shareColumn) {
+        this.shareColumn = shareColumn;
+    }
+
+    public String getShareParam() {
+        return shareParam;
+    }
+
+    public void setShareParam(String shareParam) {
+        this.shareParam = shareParam;
+    }
+}

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

@@ -15,8 +15,8 @@ public class GeneratorAbstractBussiness extends BaseGenerator {
         fileContext = fileContext.replace("store", toLowerCaseFirstOne(data.getName()))
                 .replace("Store", toUpperCaseFirstOne(data.getName()))
                 .replace("商户", data.getDesc())
-                .replace(data.getName()+"Id", data.getId())
-                .replace(data.getName()+"_id", data.getParams().get(data.getId()).toString());
+                .replace(data.getName() + "Id", data.getId())
+                .replace(data.getName() + "_id", data.getParams().get(data.getId()).toString());
         Map<String, String> param = data.getParams();
         String mappingContext = "";
         String autoMappingContext = "";
@@ -33,8 +33,8 @@ public class GeneratorAbstractBussiness extends BaseGenerator {
 
         fileContext = fileContext.replace("$flushBusinessInfo$", mappingContext);
         fileContext = fileContext.replace("$autoSaveDelBusiness$", autoMappingContext);
-        System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePath = this.getClass().getResource("/listener").getPath() + "/Abstract" + toUpperCaseFirstOne(data.getName()) + "BusinessServiceDataFlowListener.java";
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() + "/Abstract" + toUpperCaseFirstOne(data.getName()) + "BusinessServiceDataFlowListener.java";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -21,8 +21,9 @@ public class GeneratorDeleteInfoListener extends BaseGenerator {
                 .replace("BUSINESS_TYPE_DELETE_STORE_INFO",data.getDeleteBusinessTypeCd())
                 .replace(data.getName()+"Id", data.getId())
                 .replace(data.getName()+"_id", data.getParams().get(data.getId()).toString());
-        System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePath = this.getClass().getResource("/listener").getPath()+"/Delete"+toUpperCaseFirstOne(data.getName())+"InfoListener.java";
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() +"/Delete"+toUpperCaseFirstOne(data.getName())+"InfoListener.java";
+
         writeFile(writePath,
                 fileContext);
 

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

@@ -59,8 +59,9 @@ public class GeneratorDtoBean extends BaseGenerator {
                 .replace("商户", data.getDesc());
 
         fileContext = dealVariableAndGetSet(data, fileContext);
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/dto/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "Dto.java";
 
-        String writePath = this.getClass().getResource("/listener").getPath() + "/" + toUpperCaseFirstOne(data.getName()) + "Dto.java";
         writeFile(writePath,
                 fileContext);
     }

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

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

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

@@ -16,8 +16,9 @@ public class GeneratorIServiceDaoListener extends BaseGenerator {
         fileContext = fileContext.replace("store",toLowerCaseFirstOne(data.getName()))
                 .replace("Store",toUpperCaseFirstOne(data.getName()))
                 .replace("商户",data.getDesc());
-        System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePath = this.getClass().getResource("/listener").getPath()+"/I"+toUpperCaseFirstOne(data.getName())+"ServiceDao.java";
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() + "/I"+toUpperCaseFirstOne(data.getName())+"ServiceDao.java";
         writeFile(writePath,
                 fileContext);
     }

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

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

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

@@ -13,11 +13,11 @@ public class GeneratorSaveInfoListener extends BaseGenerator {
      *
      * @param data
      */
-    public void generator(JSONObject data) {
+    public void generator(Data data) {
         StringBuffer sb = readFile(this.getClass().getResource("/template/SaveListener.txt").getFile());
         String fileContext = sb.toString();
-        if (StringUtils.isEmpty(data.getString("shareParam"))) {
-            data.put("shareParam",data.getString("id"));
+        if (StringUtils.isEmpty(data.getShareParam())) {
+            data.setShareParam(data.getId());
         }
 
         if (StringUtils.isEmpty(data.getShareColumn())) {
@@ -31,8 +31,9 @@ public class GeneratorSaveInfoListener extends BaseGenerator {
                 .replace("shareId", data.getShareParam())
                 .replace(data.getName()+"Id", data.getId())
                 .replace(data.getName()+"_id", data.getParams().get(data.getId()).toString());
-        System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePath = this.getClass().getResource("/listener").getPath() + "/Save" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java";
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() + "/Save" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java";
+        System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
 
@@ -62,7 +63,8 @@ public class GeneratorSaveInfoListener extends BaseGenerator {
         fileContextDoc = fileContextDoc.replace("$busienssInfo$", tmpLine);
         fileContextDoc = fileContextDoc.replace("$businessInfoJson$", _tmpLine);
         System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePathDoc = this.getClass().getResource("/listener").getPath() + "/Save" + toUpperCaseFirstOne(data.getName()) + "Info.md";
+        String writePathDoc = this.getClass().getResource("/").getPath()
+                + "out/back/docs/" + data.getName() + "/Save" + toUpperCaseFirstOne(data.getName()) + "Info.md";
         writeFile(writePathDoc,
                 fileContextDoc);
     }

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

@@ -3,21 +3,19 @@ package com.java110.code.back;
 public class GeneratorServiceDaoImplListener extends BaseGenerator {
 
 
-
-
-
     /**
      * 生成代码
+     *
      * @param data
      */
-    public void generator(Data data){
+    public void generator(Data data) {
         StringBuffer sb = readFile(this.getClass().getResource("/template/ServiceDaoImpl.txt").getFile());
         String fileContext = sb.toString();
-        fileContext = fileContext.replace("store",toLowerCaseFirstOne(data.getName()))
-                .replace("Store",toUpperCaseFirstOne(data.getName()))
-                .replace("商户",data.getDesc());
-        System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePath = this.getClass().getResource("/listener").getPath()+"/"+toUpperCaseFirstOne(data.getName())+"ServiceDaoImpl.java";
+        fileContext = fileContext.replace("store", toLowerCaseFirstOne(data.getName()))
+                .replace("Store", toUpperCaseFirstOne(data.getName()))
+                .replace("商户", data.getDesc());
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImpl.java";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -321,9 +321,9 @@ public class GeneratorServiceDaoImplMapperListener extends BaseGenerator {
         fileContext = dealGetInfo(data, fileContext);
         fileContext = dealUpdateInfoInstance(data, fileContext);
         fileContext = dealGetCount(data, fileContext);
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() + "/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImplMapper.xml";
 
-        System.out.println(this.getClass().getResource("/listener").getPath());
-        String writePath = this.getClass().getResource("/listener").getPath() + "/" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImplMapper.xml";
         writeFile(writePath,
                 fileContext);
     }

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

@@ -24,8 +24,9 @@ public class GeneratorUpdateInfoListener extends BaseGenerator {
                 .replace("BUSINESS_TYPE_UPDATE_STORE_INFO", data.getUpdateBusinessTypeCd())
                 .replace(data.getName()+"Id", data.getId())
                 .replace(data.getName()+"_id", data.getParams().get(data.getId()).toString());
-        String writePath = this.getClass().getResource("/listener").getPath()
-                + "/Update" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java";
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/back/listener/" + data.getName() + "/Update" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java";
         writeFile(writePath,
                 fileContext);
 

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

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

@@ -12,9 +12,9 @@ public class GeneratorManagerComponent extends BaseGenerator {
         //处理组件
         generatorComponentHtml(data);
         generatorComponentJs(data);
-        generatorComponentJava(data);
-        genneratorIListSmo(data);
-        genneratorListSmoImpl(data);
+        //generatorComponentJava(data);
+        //genneratorIListSmo(data);
+        //genneratorListSmoImpl(data);
         genneratorListListener(data);
         genneratorVo(data);
 

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

@@ -12,8 +12,8 @@ public class GeneratorStart extends BaseGenerator {
         JSONObject data = JSONObject.parseObject(sb.toString());
 
 
-        GeneratorFlow flow = new GeneratorFlow();
-        flow.generator(data);
+//        GeneratorFlow flow = new GeneratorFlow();
+//        flow.generator(data);
 
 
         GeneratorManagerComponent managerComponent = new GeneratorManagerComponent();