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/TableToJsonWeb.java | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java b/java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java
index a8b877b..e426032 100644
--- a/java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java
+++ b/java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java
@@ -7,30 +7,13 @@
public class TableToJsonWeb {
//show create table c_orders 鐢ㄨ繖涓鍙ヨ幏鍙�
- 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" +
- " `remark` varchar(200) DEFAULT NULL COMMENT '澶囨敞',\n" +
+ public static final String createTableSql = "CREATE TABLE `meter_type` (\n" +
+ " `type_id` varchar(30) NOT NULL COMMENT '绫诲瀷ID',\n" +
+ " `type_name` varchar(12) NOT NULL COMMENT '鍚嶇О',\n" +
+ " `community_id` varchar(30) NOT NULL COMMENT '灏忓尯ID',\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" +
")";
public static void main(String[] args) {
@@ -76,10 +59,10 @@
}
String comment = rowSql.contains("COMMENT") ? rowSql.substring(rowSql.indexOf("COMMENT '") + 9) : StringUtil.lineToHump(key);
comment = comment.trim();
- if(comment.contains("锛�")){
+ if (comment.contains("锛�")) {
comment = comment.split("锛�")[0];
}
- if(comment.contains(" ")){
+ if (comment.contains(" ")) {
comment = comment.split(" ")[0];
}
paramColumn.put("desc", comment);
@@ -90,10 +73,10 @@
condition.put("code", StringUtil.lineToHump(key));
condition.put("whereCondition", "equal");
conditions.add(condition);
- paramColumn.put("desc", "蹇呭～锛�"+comment);
+ paramColumn.put("desc", "蹇呭～锛�" + comment);
}
- String limit = rowSql.substring(rowSql.indexOf("(") + 1,rowSql.indexOf(")"));
- if(limit.contains(",")){
+ String limit = rowSql.substring(rowSql.indexOf("(") + 1, rowSql.indexOf(")"));
+ if (limit.contains(",")) {
limit = limit.split(",")[0];
}
@@ -103,8 +86,8 @@
paramColumn.put("hasDefaultValue", false);
paramColumn.put("inputType", "input");
paramColumn.put("limit", "maxLength");
- paramColumn.put("limitParam",limit );
- paramColumn.put("limitErrInfo", comment+"涓嶈兘瓒呰繃"+limit);
+ paramColumn.put("limitParam", limit);
+ paramColumn.put("limitErrInfo", comment + "涓嶈兘瓒呰繃" + limit);
paramColumn.put("show", true);
paramColumns.add(paramColumn);
}
--
Gitblit v1.8.0