From 61a35340a5ff887a78a29a100fa678938ef36787 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 09 十月 2021 15:20:00 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-generator/src/main/java/com/java110/code/TableToJson.java |   70 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 23 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 e38a406..8a9159b 100644
--- a/java110-generator/src/main/java/com/java110/code/TableToJson.java
+++ b/java110-generator/src/main/java/com/java110/code/TableToJson.java
@@ -7,36 +7,46 @@
 public class TableToJson {
 
     //show create table c_orders  鐢ㄨ繖涓鍙ヨ幏鍙�
-    public static final String createTableSql = "CREATE TABLE `c_orders` (\n" +
-            "  `o_id` varchar(30) NOT NULL COMMENT '璁㈠崟ID',\n" +
-            "  `app_id` varchar(30) NOT NULL COMMENT '搴旂敤ID',\n" +
-            "  `ext_transaction_id` varchar(36) DEFAULT NULL,\n" +
-            "  `user_id` varchar(30) NOT NULL COMMENT '鐢ㄦ埛ID',\n" +
-            "  `request_time` varchar(16) NOT NULL COMMENT '澶栭儴绯荤粺璇锋眰鏃堕棿',\n" +
-            "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',\n" +
-            "  `order_type_cd` varchar(4) NOT NULL COMMENT '璁㈠崟绫诲瀷锛屽弬鑰僣_order_type琛�',\n" +
-            "  `finish_time` date DEFAULT NULL COMMENT '璁㈠崟瀹屾垚鏃堕棿',\n" +
+    public static final String createTableSql = "CREATE TABLE `owner_app_user` (\n" +
+            "  `app_user_id` varchar(30) NOT NULL COMMENT 'app鐢ㄦ埛ID',\n" +
+            "  `member_id` varchar(30) NOT NULL COMMENT '涓氫富鎴愬憳ID',\n" +
+            "  `b_id` varchar(30) NOT NULL COMMENT '涓氬姟Id',\n" +
+            "  `community_id` varchar(30) NOT NULL COMMENT '灏忓尯Id',\n" +
+            "  `community_name` varchar(100) NOT NULL COMMENT '灏忓尯鍚嶇О',\n" +
+            "  `app_user_name` varchar(100) NOT NULL COMMENT 'app鐢ㄦ埛鍚嶇О',\n" +
+            "  `id_card` varchar(20) NOT NULL COMMENT '韬唤璇佸彿',\n" +
+            "  `link` varchar(11) NOT NULL COMMENT '鑱旂郴浜烘墜鏈哄彿',\n" +
+            "  `open_id` varchar(30) NOT NULL COMMENT 'app 寮�鏀綢D',\n" +
+            "  `app_type_cd` varchar(12) NOT NULL COMMENT '搴旂敤绫诲瀷 10010 寰俊灏忕▼搴�',\n" +
+            "  `state` varchar(12) NOT NULL COMMENT '鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触',\n" +
             "  `remark` varchar(200) DEFAULT NULL COMMENT '澶囨敞',\n" +
-            "  `status_cd` varchar(2) NOT NULL COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛�',\n" +
-            "  UNIQUE KEY `o_id` (`o_id`) USING BTREE,\n" +
-            "  UNIQUE KEY `o_id_2` (`o_id`) USING BTREE\n" +
+            "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',\n" +
+            "  `status_cd` varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝0, 鍦ㄧ敤 1澶辨晥',\n" +
+            "  `user_id` varchar(30) DEFAULT NULL COMMENT '鐢ㄦ埛ID',\n" +
+            "  `app_type` varchar(12) NOT NULL DEFAULT 'APP' COMMENT '缁戝畾涓氫富鎵嬫満绔被鍨�',\n" +
+            "  `nickname` varchar(255) DEFAULT NULL COMMENT '鏄电О',\n" +
+            "  `headimgurl` varchar(255) DEFAULT NULL COMMENT '寰俊澶村儚',\n" +
+            "  UNIQUE KEY `app_user_id` (`app_user_id`) USING BTREE,\n" +
+            "  UNIQUE KEY `idx_owner_app_user_id` (`app_user_id`) USING BTREE,\n" +
+            "  KEY `idx_owner_app_user_b_id` (`b_id`) USING BTREE\n" +
             ")";
 
     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(",");
+        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("shareName", "");
-        param.put("shareParam", "");
+        param.put("desc", "涓氫富鐢ㄦ埛灏忓尯鍏崇郴");
+        param.put("id", "appUserId");
+        param.put("name", "ownerAppUser");
+        param.put("shareColumn", "community_id");
+        param.put("shareName", "user");
+        param.put("shareParam", "communityId");
         param.put("tableName", tableName);
         JSONObject paramColumn = new JSONObject();
         JSONArray requireds = new JSONArray();
@@ -50,13 +60,27 @@
             if ("UNIQUE".equals(key)) {
                 continue;
             }
+            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