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 | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 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..5e76bad 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,47 @@
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" +
+ public static final String createTableSql = "CREATE TABLE `building_room` (\n" +
+ " `room_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" +
- " `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" +
" `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琛紝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" +
")";
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("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();
@@ -50,13 +61,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