From 971023df5fd3795e24d10d4d4d03ee112df12297 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 24 三月 2022 12:17:41 +0800
Subject: [PATCH] 优化查询为空问题

---
 java110-generator/src/main/java/com/java110/code/TableToJson.java |   96 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 68 insertions(+), 28 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..32523c2 100644
--- a/java110-generator/src/main/java/com/java110/code/TableToJson.java
+++ b/java110-generator/src/main/java/com/java110/code/TableToJson.java
@@ -2,41 +2,66 @@
 
 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 `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" +
-            "  `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" +
-            ")";
+    public static final String createTableSql = "CREATE TABLE `inspection_task` (\n" +
+            "  `task_id` varchar(30) NOT NULL COMMENT '浠诲姟缂栫爜',\n" +
+            "  `b_id` varchar(30) NOT NULL COMMENT '涓氬姟id',\n" +
+            "  `community_id` varchar(30) NOT NULL COMMENT '灏忓尯ID',\n" +
+            "  `inspection_plan_id` varchar(30) NOT NULL COMMENT '璁″垝ID',\n" +
+            "  `plan_ins_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '璁″垝宸℃鏃堕棿',\n" +
+            "  `act_ins_time` datetime DEFAULT NULL COMMENT '瀹為檯宸℃鏃堕棿',\n" +
+            "  `plan_user_id` varchar(60) NOT NULL COMMENT '璁″垝宸℃浜哄憳id',\n" +
+            "  `plan_user_name` varchar(60) DEFAULT NULL COMMENT '璁″垝宸℃浜哄憳濮撳悕',\n" +
+            "  `act_user_id` varchar(30) DEFAULT NULL COMMENT '瀹為檯宸℃浜哄憳id',\n" +
+            "  `act_user_name` varchar(60) DEFAULT NULL COMMENT '瀹為檯宸℃浜哄憳濮撳悕',\n" +
+            "  `sign_type` varchar(200) NOT NULL COMMENT '瀹為檯宸℃鏂瑰紡',\n" +
+            "  `status_cd` varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝0鍦ㄧ敤 1澶辨晥',\n" +
+            "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,\n" +
+            "  `state` varchar(12) NOT NULL DEFAULT '20200405' COMMENT '宸℃鐘舵��',\n" +
+            "  `ip_staff_id` varchar(30) NOT NULL COMMENT '宸℃浜篒D',\n" +
+            "  `original_plan_user_id` varchar(60) DEFAULT NULL COMMENT '鍘熻鍒掑贰妫�浜簎serId',\n" +
+            "  `original_plan_user_name` varchar(60) DEFAULT NULL COMMENT '鍘熻鍒掑贰妫�浜哄悕绉�',\n" +
+            "  `transfer_desc` varchar(255) DEFAULT NULL COMMENT '杞Щ璇存槑',\n" +
+            "  `task_type` varchar(255) DEFAULT NULL COMMENT '浠诲姟绫诲瀷 1000鏃ュ父宸℃浠诲姟 2000娴佽浆宸℃浠诲姟',\n" +
+            "  `plan_end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '璁″垝宸℃缁撴潫鏃堕棿',\n" +
+            ") ";
 
     public static void main(String[] args) {
-
+        String desc = "宸℃浠诲姟";
+        String id = "taskId";
+        String name = "inspectionTask";
+        String shareName = "community"; //鐢熸垚鍒伴偅涓湇鍔′笅
+        String shareColumn = "community_id";
+        String shareParam = "communityId";
+        //涓氬姟鍚嶇О 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("shareName", "");
-        param.put("shareParam", "");
+        param.put("desc", desc);
+        param.put("id", id);
+        param.put("name", name);
+        param.put("shareColumn", shareColumn);
+        param.put("shareName", shareName);
+        param.put("shareParam", shareParam);
         param.put("tableName", tableName);
         JSONObject paramColumn = new JSONObject();
         JSONArray requireds = new JSONArray();
@@ -50,13 +75,30 @@
             if ("UNIQUE".equals(key)) {
                 continue;
             }
+            if ("KEY".equals(key)) {
+                continue;
+            }
+            if ("PRIMARY".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);
@@ -64,7 +106,5 @@
         param.put("param", paramColumn);
         param.put("required", requireds);
         System.out.println(param.toJSONString());
-
     }
-
 }

--
Gitblit v1.8.0