From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-generator/src/main/java/com/java110/code/TableToJson.java |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 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 300b756..adbb38b 100644
--- a/java110-generator/src/main/java/com/java110/code/TableToJson.java
+++ b/java110-generator/src/main/java/com/java110/code/TableToJson.java
@@ -2,28 +2,41 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.RestTemplate;
+import com.java110.db.dao.IQueryServiceDAO;
+import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.StringUtil;
+import org.springframework.beans.BeansException;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.http.converter.StringHttpMessageConverter;
+
+import java.nio.charset.Charset;
 
 public class TableToJson {
 
     //show create table c_orders  鐢ㄨ繖涓鍙ヨ幏鍙�
-    public static final String createTableSql = "CREATE TABLE `fee_receipt_print` (\n" +
-            "  `print_id` varchar(30) NOT NULL COMMENT '鎵撳嵃ID',\n" +
+    public static final String createTableSql = "CREATE TABLE `parking_space` (\n" +
+            "  `ps_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" +
-            "  `receipt_id` varchar(30) NOT NULL COMMENT '鏀舵嵁ID',\n" +
-            "  `print_pre` varchar(12) NOT NULL COMMENT '鎵撳嵃鍓嶇紑,涓�鑸负鏃ユ湡 渚嬪锛�20211025',\n" +
-            "  `num` BIGINT NOT NULL default 0 COMMENT '搴忓彿',\n" +
-            "   print_num varchar(30) not null comment '鎵撳嵃缂栧彿',\n" +
+            "  `num` varchar(12) NOT NULL COMMENT '杞︿綅缂栧彿',\n" +
+            "  `pa_id` varchar(30) NOT NULL COMMENT '鍋滆溅鍦篒D',\n" +
+            "  `state` varchar(4) NOT NULL COMMENT '杞︿綅鐘舵�� 鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F',\n" +
+            "  `area` decimal(7,2) NOT NULL COMMENT '杞︿綅闈㈢Н',\n" +
+            "  `remark` varchar(300) DEFAULT NULL COMMENT '澶囨敞',\n" +
             "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',\n" +
-            "  `status_cd` varchar(12) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵��',\n" +
-            "  `remark` varchar(200) DEFAULT NULL COMMENT '澶囨敞'\n" +
+            "  `status_cd` varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥',\n" +
+            "  `parking_type` varchar(3) NOT NULL DEFAULT '1' COMMENT '1锛氭櫘閫氳溅浣�  2锛氬瓙姣嶈溅浣�  3锛氳豹鍗庤溅浣�'\n" +
             ")";
 
     public static void main(String[] args) {
-        String desc = "鏀舵嵁鎵撳嵃缂栧彿";
-        String id = "printId";
-        String name = "feeReceiptPrint";
-        String shareName = "fee"; //鐢熸垚鍒伴偅涓湇鍔′笅
+        String desc = "杞︿綅";
+        String id = "psId";
+        String name = "parkingSpace";
+        String shareName = "community"; //鐢熸垚鍒伴偅涓湇鍔′笅
         String shareColumn = "community_id";
         String shareParam = "communityId";
         //涓氬姟鍚嶇О desc 涓氬姟缂栫爜鍚嶇О鐢熸垚鍚庣被鍚� name 涓婚敭 id  闇�瑕佹斁鍒伴偅涓湇鍔� shareName
@@ -56,6 +69,9 @@
             if ("KEY".equals(key)) {
                 continue;
             }
+            if ("PRIMARY".equals(key)) {
+                continue;
+            }
             if ("b_id".equals(key)) {
                 continue;
             }
@@ -82,5 +98,4 @@
         param.put("required", requireds);
         System.out.println(param.toJSONString());
     }
-
 }

--
Gitblit v1.8.0