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 | 67 +++++++++++++++++++--------------
1 files changed, 39 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 1a43f08..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,50 @@
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 `machine` (\n" +
- " `machine_id` varchar(30) NOT NULL COMMENT '璁惧ID',\n" +
- " `b_id` varchar(30) NOT NULL COMMENT '涓氬姟Id',\n" +
- " `machine_code` varchar(30) NOT NULL COMMENT '璁惧缂栫爜',\n" +
- " `machine_version` varchar(30) NOT NULL COMMENT '璁惧鐗堟湰',\n" +
- " `machine_type_cd` varchar(30) NOT NULL COMMENT '璁惧绫诲瀷 闂ㄧ9999 璇︽儏鏌ョ湅t_dict 琛�',\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" +
- " `machine_name` varchar(200) NOT NULL COMMENT '璁惧鍚嶇О',\n" +
- " `auth_code` varchar(64) NOT NULL COMMENT '鎺堟潈鐮�',\n" +
- " `machine_ip` varchar(64) DEFAULT NULL COMMENT '璁惧IP',\n" +
- " `machine_mac` varchar(64) DEFAULT NULL COMMENT '璁惧mac',\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" +
- " `location_type_cd` varchar(30) NOT NULL COMMENT '浣嶇疆ID,璇锋煡鐪� community_location',\n" +
- " `location_obj_id` varchar(30) NOT NULL DEFAULT '-1' COMMENT '瀵硅薄ID锛屽ぇ闂ㄦ椂灏忓尯ID锛屽崟鍏冮棬 鏃跺崟鍏僆D 鎴垮眿鏃舵埧灞婭D',\n" +
- " `state` varchar(12) NOT NULL DEFAULT '1000' COMMENT '璁惧鐘舵�侊紝璁惧閰嶇疆鍚屾鐘舵�� 1000 鏈悓姝� 1100 鍚屾涓� 1200 宸插悓姝�',\n" +
- " `direction` varchar(12) NOT NULL DEFAULT '3306' COMMENT '璁惧鏂瑰悜杩涘嚭锛�3306 杩� 3307 鍑�',\n" +
- " `heartbeat_time` datetime NOT NULL COMMENT '璁惧蹇冭烦鏃堕棿',\n" +
- " `type_id` varchar(30) NOT NULL COMMENT '璁惧绫诲瀷ID',\n" +
- " UNIQUE KEY `machine_id` (`machine_id`) USING BTREE,\n" +
- " KEY `idx_machine_id` (`machine_id`) USING BTREE,\n" +
- " KEY `idx_machine_b_id` (`b_id`) USING BTREE,\n" +
- " KEY `i_m_community_id` (`community_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 = "machineId";
- String name = "machine";
- String shareName = "common"; //鐢熸垚鍒伴偅涓湇鍔′笅
+ String desc = "宸℃浠诲姟";
+ String id = "taskId";
+ String name = "inspectionTask";
+ String shareName = "community"; //鐢熸垚鍒伴偅涓湇鍔′笅
String shareColumn = "community_id";
String shareParam = "communityId";
//涓氬姟鍚嶇О desc 涓氬姟缂栫爜鍚嶇О鐢熸垚鍚庣被鍚� name 涓婚敭 id 闇�瑕佹斁鍒伴偅涓湇鍔� shareName
@@ -69,6 +78,9 @@
if ("KEY".equals(key)) {
continue;
}
+ if ("PRIMARY".equals(key)) {
+ continue;
+ }
if ("b_id".equals(key)) {
continue;
}
@@ -95,5 +107,4 @@
param.put("required", requireds);
System.out.println(param.toJSONString());
}
-
}
--
Gitblit v1.8.0