From d50d64595a629c34e7ae9de2b8415a9679b42ec7 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 22 九月 2021 11:56:32 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 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 995efaa..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,14 +7,13 @@
 public class TableToJsonWeb {
 
     //show create table c_orders  鐢ㄨ繖涓鍙ヨ幏鍙�
-    public static final String createTableSql = "CREATE TABLE `fee_print_page` (\n" +
-            "  `page_id` varchar(30) NOT NULL COMMENT '椤甸潰ID',\n" +
-            "  `page_name` varchar(128) NOT 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" +
-            "  `page_url` varchar(512) NOT NULL COMMENT '鏀舵嵁椤甸潰',\n" +
-            "  `state` varchar(12) NOT NULL DEFAULT 'F' COMMENT '鐘舵�� T 鏈夋晥 F涓烘棤鏁�',\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 '鏁版嵁鐘舵�� 1琛ㄧず 澶辨晥 0 鏈夋晥'\n" +
+            "  `status_cd` varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝0, 鍦ㄧ敤 1澶辨晥'\n" +
             ")";
 
     public static void main(String[] args) {
@@ -60,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);
@@ -74,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];
             }
 
@@ -87,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