From 3c1353d79a33011d27c7f5f2c3dd1fdb3521fa71 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 31 七月 2019 10:41:03 +0800
Subject: [PATCH] redis 加入 密码支持
---
java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java | 129 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 40 deletions(-)
diff --git a/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java b/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
index 4dfd116..a1362f6 100644
--- a/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
+++ b/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
@@ -19,14 +19,14 @@
genneratorListSmoImpl(data);
- //genneratorListListener(data);
+ genneratorListListener(data);
- //genneratorServiceCodeConstant(data);
+ genneratorServiceCodeConstant(data);
}
- private void genneratorAddHtml(JSONObject data, String componentName){
+ private void genneratorAddHtml(JSONObject data, String componentName) {
StringBuffer sb = readFile(GeneratorStart.class.getResource("/relationship/add/add.html").getFile());
String fileContext = sb.toString();
@@ -61,22 +61,22 @@
}
- inputStr = "<select class=\"custom-select\" v-model=\"" + _currentObj.getString("templateCode") + "ViewInfo."+column.getString("code")+"\">\n" +
- " <option selected disabled value=\"\">"+ required + "锛岃閫夋嫨" + column.getString("cnCode") + "</option>\n" +
- " " +option+
+ inputStr = "<select class=\"custom-select\" v-model=\"" + _currentObj.getString("templateCode") + "ViewInfo." + column.getString("code") + "\">\n" +
+ " <option selected disabled value=\"\">" + required + "锛岃閫夋嫨" + column.getString("cnCode") + "</option>\n" +
+ " " + option +
" </select>";
- } else if("textarea".equals(column.getString("inputType"))){
- inputStr = "<textarea placeholder=\"" + required + "锛岃濉啓" + column.getString("cnCode") + "\" class=\"form-control\""+
- " v-model=\"" + _currentObj.getString("templateCode") + "ViewInfo."+column.getString("code")+"\">"+
+ } else if ("textarea".equals(column.getString("inputType"))) {
+ inputStr = "<textarea placeholder=\"" + required + "锛岃濉啓" + column.getString("cnCode") + "\" class=\"form-control\"" +
+ " v-model=\"" + _currentObj.getString("templateCode") + "ViewInfo." + column.getString("code") + "\">" +
"</textarea>";
- }else {
- inputStr = " <input v-model=\"" + _currentObj.getString("templateCode") + "ViewInfo."+column.getString("code")+"\" " +
+ } else {
+ inputStr = " <input v-model=\"" + _currentObj.getString("templateCode") + "ViewInfo." + column.getString("code") + "\" " +
" type=\"text\" placeholder=\"" + required + "锛岃濉啓" + column.getString("cnCode") + "\" class=\"form-control\">\n";
}
thSb.append("<div class=\"form-group row\">\n" +
" <label class=\"col-sm-2 col-form-label\">" + column.getString("cnCode") + "</label>\n" +
" <div class=\"col-sm-10\">\n" +
- inputStr+
+ inputStr +
" </div>\n" +
"</div>\n");
@@ -86,7 +86,7 @@
String writePath = this.getClass().getResource("/").getPath()
- + "out/relationship/component/"+_currentObj.getString("package")+"/" + _currentObj.getString("templateCode") + "View/" + toUpperCaseFirstOne(_currentObj.getString("templateCode")) + "View.html";
+ + "out/relationship/component/" + _currentObj.getString("package") + "/" + _currentObj.getString("templateCode") + "View/" + toUpperCaseFirstOne(_currentObj.getString("templateCode")) + "View.html";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
@@ -122,33 +122,33 @@
defaultValue = "'" + defaultValue + "'";
variable.append(column.getString("code") + ":" + defaultValue + ",\n");
- validateInfo += "'"+_currentObj.getString("templateCode")+"ViewInfo."+column.getString("code")+"':[\n" ;
- if(column.getBoolean("required")) {
- validateInfo +="{\n" +
+ validateInfo += "'" + _currentObj.getString("templateCode") + "ViewInfo." + column.getString("code") + "':[\n";
+ if (column.getBoolean("required")) {
+ validateInfo += "{\n" +
" limit:\"required\",\n" +
" param:\"\",\n" +
- " errInfo:\""+column.getString("cnCode")+"涓嶈兘涓虹┖\"\n" +
+ " errInfo:\"" + column.getString("cnCode") + "涓嶈兘涓虹┖\"\n" +
" },\n";
}
- if(column.containsKey("limit") && !StringUtils.isEmpty(column.getString("limit"))) {
- validateInfo +=" {\n" +
- " limit:\""+column.getString("limit")+"\",\n" +
- " param:\""+column.getString("limitParam")+"\",\n" +
- " errInfo:\""+column.getString("limitErrInfo")+"\"\n" +
+ if (column.containsKey("limit") && !StringUtils.isEmpty(column.getString("limit"))) {
+ validateInfo += " {\n" +
+ " limit:\"" + column.getString("limit") + "\",\n" +
+ " param:\"" + column.getString("limitParam") + "\",\n" +
+ " errInfo:\"" + column.getString("limitErrInfo") + "\"\n" +
" },\n" +
" ],\n";
}
}
- fileContext = fileContext.replace("@@templateCodeColumns@@", variable.toString());
+ fileContext = fileContext.replace("@@templateCodeColumns@@", variable.toString());
fileContext = fileContext.replace("@@addTemplateCodeValidate@@", validateInfo);
// 鏇挎崲 鏁版嵁鏍￠獙閮ㄥ垎浠ｇ爜
String writePath = this.getClass().getResource("/").getPath()
- + "out/relationship/component/"+_currentObj.getString("package")+"/" + _currentObj.getString("templateCode") + "View/" + toUpperCaseFirstOne(_currentObj.getString("templateCode")) + "View.js";
+ + "out/relationship/component/" + _currentObj.getString("package") + "/" + _currentObj.getString("templateCode") + "View/" + toUpperCaseFirstOne(_currentObj.getString("templateCode")) + "View.js";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
@@ -162,13 +162,19 @@
* @param data
*/
private void genneratorServiceCodeConstant(JSONObject data) {
- StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/constant/ServiceCodeConstant.java").getFile());
+ StringBuffer sb = readFile(GeneratorStart.class.getResource("/relationship/constant/ServiceCodeConstant.java").getFile());
String fileContext = sb.toString();
- fileContext = super.replaceTemplateContext(fileContext, data);
+ fileContext = super.replaceBindingTemplateContext(fileContext, data);
+
+ String variable = data.getString("package").indexOf("Package") >0 ?
+ data.getString("package").replace("Package","") :
+ data.getString("package");
+ variable += ("." + data.getString("templateCode"));
+ fileContext = fileContext.replace("@@constantVariable@@", variable);
String writePath = this.getClass().getResource("/").getPath()
- + "out/web/constant/" + data.getString("templateCode") + "/ServiceCode" + toUpperCaseFirstOne(data.getString("templateCode")) + "Constant.java";
+ + "out/relationship/constant/" + data.getString("templateCode") + "/ServiceCode" + toUpperCaseFirstOne(data.getString("templateCode")) + "Constant.java";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
@@ -202,7 +208,7 @@
" ></vc:create>\n" +
" </div>\n");
//濡傛灉鐩稿簲缁勪欢涓嶅瓨鍦紝鍒欐牴鎹粍浠堕厤缃嚜鍔ㄧ敓鎴�
- if(!flow.getBoolean("existsComponent")){
+ if (!flow.getBoolean("existsComponent")) {
genneratorAddHtml(data, flow.getString("vcName"));
}
}
@@ -253,7 +259,7 @@
validateInfo.append("vc.emit('" + flow.getString("vcName") + "', 'onIndex', vc.component.serviceBindingInfo.index);\n");
//濡傛灉鐩稿簲缁勪欢涓嶅瓨鍦紝鍒欐牴鎹粍浠堕厤缃嚜鍔ㄧ敓鎴�
- if(!flow.getBoolean("existsComponent")){
+ if (!flow.getBoolean("existsComponent")) {
generatorAddJs(data, flow.getString("vcName"));
}
@@ -331,11 +337,11 @@
JSONArray flows = data.getJSONArray("flows");
StringBuffer validateStr = new StringBuffer();
- for(int flowIndex = 0 ; flowIndex < flows.size() ; flowIndex ++) {
+ for (int flowIndex = 0; flowIndex < flows.size(); flowIndex++) {
JSONObject flowObj = flows.getJSONObject(flowIndex);
- if(flowObj.containsKey("existsComponent") && flowObj.getBoolean("existsComponent")){
+ if (flowObj.containsKey("existsComponent") && flowObj.getBoolean("existsComponent")) {
continue;
}
@@ -348,7 +354,7 @@
for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
JSONObject column = columns.getJSONObject(columnIndex);
if (column.getBoolean("required")) {
- validateStr.append("Assert.hasKeyByFlowData(infos, \""+ flowObj.getString("vcName") +"\", \"" + column.getString("code") + "\", \"" + column.getString("desc") + "\");\n");
+ validateStr.append("Assert.hasKeyByFlowData(infos, \"" + flowObj.getString("vcName") + "\", \"" + column.getString("code") + "\", \"" + column.getString("desc") + "\");\n");
}
}
}
@@ -369,26 +375,69 @@
* @param data
*/
private void genneratorListListener(JSONObject data) {
- StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/add/SaveListener.java").getFile());
+ StringBuffer sb = readFile(GeneratorStart.class.getResource("/relationship/binding/BindingListener.java").getFile());
String fileContext = sb.toString();
- fileContext = super.replaceTemplateContext(fileContext, data);
+ fileContext = super.replaceBindingTemplateContext(fileContext, data);
//鏇挎崲鏍￠獙閮ㄥ垎浠ｇ爜 @@validateTemplateColumns@@
- JSONArray columns = data.getJSONArray("columns");
+ JSONArray flows = data.getJSONArray("flows");
StringBuffer validateStr = new StringBuffer();
- for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
- JSONObject column = columns.getJSONObject(columnIndex);
- if (column.getBoolean("required")) {
- validateStr.append("Assert.hasKeyAndValue(reqJson, \"" + column.getString("code") + "\", \"" + column.getString("desc") + "\");\n");
+ StringBuffer variableStr = new StringBuffer();
+
+ StringBuffer ifCode = new StringBuffer();
+
+ StringBuffer methodCode = new StringBuffer();
+ for (int flowIndex = 0; flowIndex < flows.size(); flowIndex++) {
+
+ JSONObject flowObj = flows.getJSONObject(flowIndex);
+
+ String vcName = flowObj.getString("vcName");
+
+ variableStr.append("JSONObject " + vcName + " = getObj(infos, \"" + vcName + "\");\n");
+
+ ifCode.append("" +
+ " if(!hasKey("+vcName+", \"" + flowObj.getString("flowKey") + "\")){\n" +
+ " "+vcName+".put(\"" + flowObj.getString("flowKey") + "\", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_" + flowObj.getString("flowKey") + "));\n" +
+ " businesses.add(add" + toUpperCaseFirstOne(flowObj.getString("businessName")) + "("+vcName+", context));\n" +
+ " }\n");
+
+
+ methodCode.append("private JSONObject add"+toUpperCaseFirstOne(flowObj.getString("businessName"))+"(JSONObject paramInJson, DataFlowContext dataFlowContext) {\n" +
+ " JSONObject business = JSONObject.parseObject(\"{\\\"datas\\\":{}}\");\n" +
+ " business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant."+flowObj.getString("businessType")+");\n" +
+ " business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);\n" +
+ " business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);\n" +
+ " JSONObject businessObj = new JSONObject();\n" +
+ " businessObj.putAll(paramInJson);\n" +
+ " //璁＄畻 搴旀敹閲戦\n" +
+ " business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(\""+flowObj.getString("businessName")+"\", businessObj);\n" +
+ " return business;\n" +
+ " }\n");
+ if (flowObj.containsKey("existsComponent") && flowObj.getBoolean("existsComponent")) {
+ continue;
+ }
+
+
+ JSONObject vcObject = data.getJSONObject("components").getJSONObject(vcName);
+
+ JSONArray columns = vcObject.getJSONArray("columns");
+
+ for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
+ JSONObject column = columns.getJSONObject(columnIndex);
+ if (column.getBoolean("required")) {
+ validateStr.append("Assert.hasKeyByFlowData(infos, \"" + flowObj.getString("vcName") + "\", \"" + column.getString("code") + "\", \"" + column.getString("desc") + "\");\n");
+ }
}
}
fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
+ fileContext = fileContext.replace("@@doSoService@@", variableStr.toString() + ifCode.toString());
+ fileContext = fileContext.replace("@@bindingMethod@@", methodCode.toString());
String writePath = this.getClass().getResource("/").getPath()
- + "out/api/listener/" + data.getString("templateCode") + "/Save" + toUpperCaseFirstOne(data.getString("templateCode")) + "Listener.java";
+ + "out/api/listener/" + data.getString("templateCode") + "/Binding" + toUpperCaseFirstOne(data.getString("templateCode")) + "Listener.java";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
--
Gitblit v1.8.0