From f1d1ad21cae722ceba4677cc30c133bd8c3b0701 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 14 九月 2021 15:39:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-generator/src/main/java/com/java110/code/TableToJson.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/java110-generator/src/main/java/com/java110/code/TableToJson.java b/java110-generator/src/main/java/com/java110/code/TableToJson.java
index e9f8dfb..5e76bad 100644
--- a/java110-generator/src/main/java/com/java110/code/TableToJson.java
+++ b/java110-generator/src/main/java/com/java110/code/TableToJson.java
@@ -34,20 +34,20 @@
")";
public static void main(String[] args) {
-
+ //涓氬姟鍚嶇О desc 涓氬姟缂栫爜鍚嶇О鐢熸垚鍚庣被鍚� name 涓婚敭 id 闇�瑕佹斁鍒伴偅涓湇鍔� shareName
String newSql = createTableSql.substring(createTableSql.indexOf("(") + 1, createTableSql.lastIndexOf(")"));
String tableName = createTableSql.substring(createTableSql.indexOf("TABLE") + 5, createTableSql.indexOf("("));
tableName = tableName.replaceAll("`", "").trim();
newSql = newSql.replaceAll("\n", "");
- String[] rowSqls = newSql.split(",\\n");
+ String[] rowSqls = newSql.split("',");
JSONObject param = new JSONObject();
param.put("autoMove", true);
param.put("desc", "");
param.put("id", "");
param.put("name", "");
- param.put("shareColumn", "");
+ param.put("shareColumn", "community_id");
param.put("shareName", "");
- param.put("shareParam", "");
+ param.put("shareParam", "communityId");
param.put("tableName", tableName);
JSONObject paramColumn = new JSONObject();
JSONArray requireds = new JSONArray();
@@ -64,13 +64,24 @@
if ("KEY".equals(key)) {
continue;
}
+ if ("b_id".equals(key)) {
+ continue;
+ }
if ("create_time".equals(key)) {
continue;
}
- if(rowSql.toLowerCase().contains("not null")){
- required.put("code",StringUtil.lineToHump(key));
- String comment = rowSql.substring(rowSql.indexOf("COMMENT '")+9,rowSql.lastIndexOf("'"));
- required.put("msg",comment+"涓嶈兘涓虹┖");
+ if (rowSql.toLowerCase().contains("not null")) {
+ required.put("code", StringUtil.lineToHump(key));
+ String comment = rowSql.contains("COMMENT") ? rowSql.substring(rowSql.indexOf("COMMENT '") + 9) : StringUtil.lineToHump(key);
+ comment = comment.trim();
+ if(comment.contains("锛�")){
+ comment = comment.split("锛�")[0];
+ }
+ if(comment.contains(" ")){
+ comment = comment.split(" ")[0];
+ }
+
+ required.put("msg", comment + "涓嶈兘涓虹┖");
requireds.add(required);
}
paramColumn.put(StringUtil.lineToHump(key), key);
--
Gitblit v1.8.0