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 |   57 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 32 insertions(+), 25 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 f5dcebf..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,34 +7,33 @@
 public class TableToJson {
 
     //show create table c_orders  鐢ㄨ繖涓鍙ヨ幏鍙�
-    public static final String createTableSql = "CREATE TABLE `building_room` (\n" +
-            "  `room_id` varchar(30) NOT NULL COMMENT '鎴垮眿ID',\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" +
-            "  `room_num` varchar(12) NOT NULL COMMENT '鎴垮眿缂栧彿',\n" +
-            "  `unit_id` varchar(30) NOT NULL COMMENT '鍗曞厓ID',\n" +
-            "  `layer` int(11) NOT NULL COMMENT '灞傛暟',\n" +
-            "  `section` int(11) DEFAULT NULL COMMENT '瀹�',\n" +
-            "  `apartment` varchar(20) NOT NULL COMMENT '鎴峰瀷',\n" +
-            "  `built_up_area` decimal(6,2) NOT NULL COMMENT '寤虹瓚闈㈢Н',\n" +
-            "  `fee_coefficient` decimal(12,2) NOT NULL DEFAULT '1.00' COMMENT '绠楄垂绯绘暟',\n" +
-            "  `user_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" +
             "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',\n" +
-            "  `status_cd` varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥',\n" +
-            "  `state` varchar(4) NOT NULL COMMENT '鎴垮眿鐘舵�侊紝濡傛埧灞嬪嚭鍞瓑锛岃鏌ョ湅state 琛�',\n" +
-            "  `community_id` varchar(30) DEFAULT NULL COMMENT '灏忓尯ID',\n" +
-            "  `room_type` varchar(12) NOT NULL DEFAULT '1010301' COMMENT '鎴垮眿绫诲瀷',\n" +
-            "  `room_sub_type` varchar(12) NOT NULL DEFAULT '110' COMMENT '鎴垮眿绫诲瀷 110 浣忓畢鎴垮眿锛�119 鍔炲叕瀹� 120 瀹胯垗',\n" +
-            "  `room_area` decimal(6,2) NOT NULL COMMENT '瀹ゅ唴闈㈢Н',\n" +
-            "  `room_rent` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '绉熼噾',\n" +
-            "  UNIQUE KEY `room_id` (`room_id`) USING BTREE,\n" +
-            "  UNIQUE KEY `idx_room_id` (`room_id`) USING BTREE,\n" +
-            "  KEY `idx_room_b_id` (`b_id`) USING BTREE,\n" +
-            "  KEY `i_br_unit_id` (`unit_id`)\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();
@@ -42,11 +41,11 @@
         String[] rowSqls = newSql.split("',");
         JSONObject param = new JSONObject();
         param.put("autoMove", true);
-        param.put("desc", "");
-        param.put("id", "");
-        param.put("name", "");
+        param.put("desc", "涓氫富鐢ㄦ埛灏忓尯鍏崇郴");
+        param.put("id", "appUserId");
+        param.put("name", "ownerAppUser");
         param.put("shareColumn", "community_id");
-        param.put("shareName", "");
+        param.put("shareName", "user");
         param.put("shareParam", "communityId");
         param.put("tableName", tableName);
         JSONObject paramColumn = new JSONObject();
@@ -73,6 +72,14 @@
             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);
             }

--
Gitblit v1.8.0