From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage

---
 src/main/java/com/highdatas/mdm/util/Constant.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/highdatas/mdm/util/Constant.java b/src/main/java/com/highdatas/mdm/util/Constant.java
index af523e7..3c2fe43 100644
--- a/src/main/java/com/highdatas/mdm/util/Constant.java
+++ b/src/main/java/com/highdatas/mdm/util/Constant.java
@@ -76,9 +76,9 @@
     String CreateTableMysql = "CREATE TABLE IF NOT EXISTS `{0}` ({1}) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
     String checkTableByNameBySchema = "select table_name from information_schema.tables where table_schema={0} and table_name = {1};";
     String Temp =  "temp_";
-    String Temp2RecordMySQLTemplate = "INSERT INTO {0} ({1}) SELECT {2}, replace(uuid(),''-'', '''') as std_id, replace(uuid(),''-'', '''') as id, 0 as deal from  {3}";
-    String MYSQLJoinUpdateSql = "INSERT INTO {0} ({1})  SELECT {2} , replace(uuid(),''-'', '''') as id, s1.id as std_id, 0 as deal  FROM {3} t1 inner join {4} s1  on  {5};";
-    String MYSQLJoinAddSql = "INSERT INTO {0} ({1})  SELECT {2} , replace(uuid(),''-'', '''') as std_id, replace(uuid(),''-'', '''') as id, 0 as deal  FROM {3} t1 WHERE NOT EXISTS(SELECT * FROM  {4} s1 WHERE {5});";
+    String Temp2RecordMySQLTemplate = "INSERT INTO {0} ({1}) SELECT {2}, UUID_SHORT() as std_id, UUID_SHORT() as id, 0 as deal from  {3}";
+    String MYSQLJoinUpdateSql = "INSERT INTO {0} ({1})  SELECT {2} , UUID_SHORT() as id, s1.id as std_id, 0 as deal  FROM {3} t1 inner join {4} s1  on  {5};";
+    String MYSQLJoinAddSql = "INSERT INTO {0} ({1})  SELECT {2} , UUID_SHORT() as std_id, UUID_SHORT() as id, 0 as deal  FROM {3} t1 WHERE NOT EXISTS(SELECT * FROM  {4} s1 WHERE {5});";
     String Temp2RecordHbaseTemplate = "INSERT INTO {0} ({1}) SELECT ({2}, ) from {3}";
     String ParamsShell = "@\\{{0}\\}";
     String Cron = "cron";
@@ -130,7 +130,14 @@
     String View = "view";
     String Token = "token";
 
-    int MaxDispenseSize = Double.valueOf(1024 * 1024 * 1.5).intValue();
+    int MaxDispenseSize = Double.valueOf(1024 * 1024 * 0.5).intValue();
     String RECORDS =  "records";
     String SUCCESSCODE = "200";
+    String Star = "*";
+    String operate  = "operate";
+    String timeZone = "serverTimezone";
+    String TM = "tm";
+    String MT = "mt";
+    String IDX_TEMPLATE = "IDX_{0}_{1}";
+
 }

--
Gitblit v1.8.0