Explorar o código

代码生成器问题生成代码错误,修复

wuxw %!s(int64=6) %!d(string=hai) anos
pai
achega
06186ba261

+ 5 - 5
FeeService/src/main/java/com/java110/fee/listener/attrs/DeleteFeeAttrInfoListener.java

@@ -77,7 +77,7 @@ public class DeleteFeeAttrInfoListener extends AbstractFeeAttrBusinessServiceDat
                     JSONObject businessFeeAttr = businessFeeAttrs.getJSONObject(_feeAttrIndex);
                     doBusinessFeeAttr(business, businessFeeAttr);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("feeAttrId", businessFeeAttr.getString("feeAttrId"));
+                        dataFlowContext.addParamOut("attrId", businessFeeAttr.getString("attrId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class DeleteFeeAttrInfoListener extends AbstractFeeAttrBusinessServiceDat
                 Map businessFeeAttrInfo = businessFeeAttrInfos.get(_feeAttrIndex);
                 flushBusinessFeeAttrInfo(businessFeeAttrInfo,StatusConstant.STATUS_CD_INVALID);
                 feeAttrServiceDaoImpl.updateFeeAttrInfoInstance(businessFeeAttrInfo);
-                dataFlowContext.addParamOut("feeAttrId",businessFeeAttrInfo.get("feeAttr_id"));
+                dataFlowContext.addParamOut("attrId",businessFeeAttrInfo.get("attr_id"));
             }
         }
 
@@ -158,10 +158,10 @@ public class DeleteFeeAttrInfoListener extends AbstractFeeAttrBusinessServiceDat
      */
     private void doBusinessFeeAttr(Business business,JSONObject businessFeeAttr){
 
-        Assert.jsonObjectHaveKey(businessFeeAttr,"feeAttrId","businessFeeAttr 节点下没有包含 feeAttrId 节点");
+        Assert.jsonObjectHaveKey(businessFeeAttr,"attrId","businessFeeAttr 节点下没有包含 attrId 节点");
 
-        if(businessFeeAttr.getString("feeAttrId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeAttrId 错误,不能自动生成(必须已经存在的feeAttrId)"+businessFeeAttr);
+        if(businessFeeAttr.getString("attrId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessFeeAttr);
         }
         //自动插入DEL
         autoSaveDelBusinessFeeAttr(business,businessFeeAttr);

+ 5 - 5
FeeService/src/main/java/com/java110/fee/listener/attrs/UpdateFeeAttrInfoListener.java

@@ -78,7 +78,7 @@ public class UpdateFeeAttrInfoListener extends AbstractFeeAttrBusinessServiceDat
                     JSONObject businessFeeAttr = businessFeeAttrs.getJSONObject(_feeAttrIndex);
                     doBusinessFeeAttr(business, businessFeeAttr);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("feeAttrId", businessFeeAttr.getString("feeAttrId"));
+                        dataFlowContext.addParamOut("attrId", businessFeeAttr.getString("attrId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class UpdateFeeAttrInfoListener extends AbstractFeeAttrBusinessServiceDat
                 flushBusinessFeeAttrInfo(businessFeeAttrInfo,StatusConstant.STATUS_CD_VALID);
                 feeAttrServiceDaoImpl.updateFeeAttrInfoInstance(businessFeeAttrInfo);
                 if(businessFeeAttrInfo.size() == 1) {
-                    dataFlowContext.addParamOut("feeAttrId", businessFeeAttrInfo.get("feeAttr_id"));
+                    dataFlowContext.addParamOut("attrId", businessFeeAttrInfo.get("attr_id"));
                 }
             }
         }
@@ -159,10 +159,10 @@ public class UpdateFeeAttrInfoListener extends AbstractFeeAttrBusinessServiceDat
      */
     private void doBusinessFeeAttr(Business business,JSONObject businessFeeAttr){
 
-        Assert.jsonObjectHaveKey(businessFeeAttr,"feeAttrId","businessFeeAttr 节点下没有包含 feeAttrId 节点");
+        Assert.jsonObjectHaveKey(businessFeeAttr,"attrId","businessFeeAttr 节点下没有包含 attrId 节点");
 
-        if(businessFeeAttr.getString("feeAttrId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeAttrId 错误,不能自动生成(必须已经存在的feeAttrId)"+businessFeeAttr);
+        if(businessFeeAttr.getString("attrId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessFeeAttr);
         }
         //自动保存DEL
         autoSaveDelBusinessFeeAttr(business,businessFeeAttr);

+ 5 - 5
FeeService/src/main/java/com/java110/fee/listener/config/DeleteFeeConfigInfoListener.java

@@ -77,7 +77,7 @@ public class DeleteFeeConfigInfoListener extends AbstractFeeConfigBusinessServic
                     JSONObject businessFeeConfig = businessFeeConfigs.getJSONObject(_feeConfigIndex);
                     doBusinessFeeConfig(business, businessFeeConfig);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("feeConfigId", businessFeeConfig.getString("feeConfigId"));
+                        dataFlowContext.addParamOut("configId", businessFeeConfig.getString("configId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class DeleteFeeConfigInfoListener extends AbstractFeeConfigBusinessServic
                 Map businessFeeConfigInfo = businessFeeConfigInfos.get(_feeConfigIndex);
                 flushBusinessFeeConfigInfo(businessFeeConfigInfo,StatusConstant.STATUS_CD_INVALID);
                 feeConfigServiceDaoImpl.updateFeeConfigInfoInstance(businessFeeConfigInfo);
-                dataFlowContext.addParamOut("feeConfigId",businessFeeConfigInfo.get("feeConfig_id"));
+                dataFlowContext.addParamOut("configId",businessFeeConfigInfo.get("config_id"));
             }
         }
 
@@ -158,10 +158,10 @@ public class DeleteFeeConfigInfoListener extends AbstractFeeConfigBusinessServic
      */
     private void doBusinessFeeConfig(Business business,JSONObject businessFeeConfig){
 
-        Assert.jsonObjectHaveKey(businessFeeConfig,"feeConfigId","businessFeeConfig 节点下没有包含 feeConfigId 节点");
+        Assert.jsonObjectHaveKey(businessFeeConfig,"configId","businessFeeConfig 节点下没有包含 configId 节点");
 
-        if(businessFeeConfig.getString("feeConfigId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeConfigId 错误,不能自动生成(必须已经存在的feeConfigId)"+businessFeeConfig);
+        if(businessFeeConfig.getString("configId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"configId 错误,不能自动生成(必须已经存在的configId)"+businessFeeConfig);
         }
         //自动插入DEL
         autoSaveDelBusinessFeeConfig(business,businessFeeConfig);

+ 5 - 5
FeeService/src/main/java/com/java110/fee/listener/config/UpdateFeeConfigInfoListener.java

@@ -78,7 +78,7 @@ public class UpdateFeeConfigInfoListener extends AbstractFeeConfigBusinessServic
                     JSONObject businessFeeConfig = businessFeeConfigs.getJSONObject(_feeConfigIndex);
                     doBusinessFeeConfig(business, businessFeeConfig);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("feeConfigId", businessFeeConfig.getString("feeConfigId"));
+                        dataFlowContext.addParamOut("configId", businessFeeConfig.getString("configId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class UpdateFeeConfigInfoListener extends AbstractFeeConfigBusinessServic
                 flushBusinessFeeConfigInfo(businessFeeConfigInfo,StatusConstant.STATUS_CD_VALID);
                 feeConfigServiceDaoImpl.updateFeeConfigInfoInstance(businessFeeConfigInfo);
                 if(businessFeeConfigInfo.size() == 1) {
-                    dataFlowContext.addParamOut("feeConfigId", businessFeeConfigInfo.get("feeConfig_id"));
+                    dataFlowContext.addParamOut("configId", businessFeeConfigInfo.get("config_id"));
                 }
             }
         }
@@ -159,10 +159,10 @@ public class UpdateFeeConfigInfoListener extends AbstractFeeConfigBusinessServic
      */
     private void doBusinessFeeConfig(Business business,JSONObject businessFeeConfig){
 
-        Assert.jsonObjectHaveKey(businessFeeConfig,"feeConfigId","businessFeeConfig 节点下没有包含 feeConfigId 节点");
+        Assert.jsonObjectHaveKey(businessFeeConfig,"configId","businessFeeConfig 节点下没有包含 configId 节点");
 
-        if(businessFeeConfig.getString("feeConfigId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeConfigId 错误,不能自动生成(必须已经存在的feeConfigId)"+businessFeeConfig);
+        if(businessFeeConfig.getString("configId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"configId 错误,不能自动生成(必须已经存在的configId)"+businessFeeConfig);
         }
         //自动保存DEL
         autoSaveDelBusinessFeeConfig(business,businessFeeConfig);

+ 5 - 5
FeeService/src/main/java/com/java110/fee/listener/detail/DeleteFeeDetailInfoListener.java

@@ -77,7 +77,7 @@ public class DeleteFeeDetailInfoListener extends AbstractFeeDetailBusinessServic
                     JSONObject businessFeeDetail = businessFeeDetails.getJSONObject(_feeDetailIndex);
                     doBusinessFeeDetail(business, businessFeeDetail);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("feeDetailId", businessFeeDetail.getString("feeDetailId"));
+                        dataFlowContext.addParamOut("detailId", businessFeeDetail.getString("detailId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class DeleteFeeDetailInfoListener extends AbstractFeeDetailBusinessServic
                 Map businessFeeDetailInfo = businessFeeDetailInfos.get(_feeDetailIndex);
                 flushBusinessFeeDetailInfo(businessFeeDetailInfo,StatusConstant.STATUS_CD_INVALID);
                 feeDetailServiceDaoImpl.updateFeeDetailInfoInstance(businessFeeDetailInfo);
-                dataFlowContext.addParamOut("feeDetailId",businessFeeDetailInfo.get("feeDetail_id"));
+                dataFlowContext.addParamOut("detailId",businessFeeDetailInfo.get("detail_id"));
             }
         }
 
@@ -158,10 +158,10 @@ public class DeleteFeeDetailInfoListener extends AbstractFeeDetailBusinessServic
      */
     private void doBusinessFeeDetail(Business business,JSONObject businessFeeDetail){
 
-        Assert.jsonObjectHaveKey(businessFeeDetail,"feeDetailId","businessFeeDetail 节点下没有包含 feeDetailId 节点");
+        Assert.jsonObjectHaveKey(businessFeeDetail,"detailId","businessFeeDetail 节点下没有包含 detailId 节点");
 
-        if(businessFeeDetail.getString("feeDetailId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeDetailId 错误,不能自动生成(必须已经存在的feeDetailId)"+businessFeeDetail);
+        if(businessFeeDetail.getString("detailId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"detailId 错误,不能自动生成(必须已经存在的detailId)"+businessFeeDetail);
         }
         //自动插入DEL
         autoSaveDelBusinessFeeDetail(business,businessFeeDetail);

+ 5 - 5
FeeService/src/main/java/com/java110/fee/listener/detail/UpdateFeeDetailInfoListener.java

@@ -78,7 +78,7 @@ public class UpdateFeeDetailInfoListener extends AbstractFeeDetailBusinessServic
                     JSONObject businessFeeDetail = businessFeeDetails.getJSONObject(_feeDetailIndex);
                     doBusinessFeeDetail(business, businessFeeDetail);
                     if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("feeDetailId", businessFeeDetail.getString("feeDetailId"));
+                        dataFlowContext.addParamOut("detailId", businessFeeDetail.getString("detailId"));
                     }
                 }
             }
@@ -108,7 +108,7 @@ public class UpdateFeeDetailInfoListener extends AbstractFeeDetailBusinessServic
                 flushBusinessFeeDetailInfo(businessFeeDetailInfo,StatusConstant.STATUS_CD_VALID);
                 feeDetailServiceDaoImpl.updateFeeDetailInfoInstance(businessFeeDetailInfo);
                 if(businessFeeDetailInfo.size() == 1) {
-                    dataFlowContext.addParamOut("feeDetailId", businessFeeDetailInfo.get("feeDetail_id"));
+                    dataFlowContext.addParamOut("detailId", businessFeeDetailInfo.get("detail_id"));
                 }
             }
         }
@@ -159,10 +159,10 @@ public class UpdateFeeDetailInfoListener extends AbstractFeeDetailBusinessServic
      */
     private void doBusinessFeeDetail(Business business,JSONObject businessFeeDetail){
 
-        Assert.jsonObjectHaveKey(businessFeeDetail,"feeDetailId","businessFeeDetail 节点下没有包含 feeDetailId 节点");
+        Assert.jsonObjectHaveKey(businessFeeDetail,"detailId","businessFeeDetail 节点下没有包含 detailId 节点");
 
-        if(businessFeeDetail.getString("feeDetailId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeDetailId 错误,不能自动生成(必须已经存在的feeDetailId)"+businessFeeDetail);
+        if(businessFeeDetail.getString("detailId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"detailId 错误,不能自动生成(必须已经存在的detailId)"+businessFeeDetail);
         }
         //自动保存DEL
         autoSaveDelBusinessFeeDetail(business,businessFeeDetail);

+ 3 - 1
java110-code-generator/src/main/java/com/java110/code/GeneratorDeleteInfoListener.java

@@ -18,7 +18,9 @@ public class GeneratorDeleteInfoListener extends BaseGenerator {
         fileContext = fileContext.replace("store",toLowerCaseFirstOne(data.getName()))
                 .replace("Store",toUpperCaseFirstOne(data.getName()))
                 .replace("商户",data.getDesc())
-                .replace("BUSINESS_TYPE_DELETE_STORE_INFO",data.getDeleteBusinessTypeCd());
+                .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";
         writeFile(writePath,

+ 3 - 1
java110-code-generator/src/main/java/com/java110/code/GeneratorUpdateInfoListener.java

@@ -21,7 +21,9 @@ public class GeneratorUpdateInfoListener extends BaseGenerator {
         fileContext = fileContext.replace("store", toLowerCaseFirstOne(data.getName()))
                 .replace("Store", toUpperCaseFirstOne(data.getName()))
                 .replace("商户", data.getDesc())
-                .replace("BUSINESS_TYPE_UPDATE_STORE_INFO", data.getUpdateBusinessTypeCd());
+                .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";
         writeFile(writePath,