From dcf51aaacd7cfcd3b0af16eb50ca1497c43474bb Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 24 Sep 2024 09:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=88=E5=B9=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=202024=E5=B9=B49=E6=9C=8824=E6=97=A509:53:25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/thing/common/tskv/service/LatestNativeSQL.java    | 4 ++--
 .../java/com/thing/common/tskv/service/TsKvNativeSQL.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/tskv/src/main/java/com/thing/common/tskv/service/LatestNativeSQL.java b/common/tskv/src/main/java/com/thing/common/tskv/service/LatestNativeSQL.java
index d10b64d..1c60198 100644
--- a/common/tskv/src/main/java/com/thing/common/tskv/service/LatestNativeSQL.java
+++ b/common/tskv/src/main/java/com/thing/common/tskv/service/LatestNativeSQL.java
@@ -53,9 +53,9 @@ public class LatestNativeSQL {
             }
         });
         if (DatabaseType.MYSQL.equals(dataType) || DatabaseType.Tidb.equals(dataType)) {
-            sql.append(" ON DUPLICATE KEY UPDATE val = VALUES(val),ts = VALUES(ts)");
+            sql.append(" ON DUPLICATE KEY UPDATE val = VALUES(val),ts = VALUES(ts),YEAR = VALUES(YEAR),MONTH = VALUES(MONTH),DAY = VALUES(DAY),HOUR = VALUES(HOUR),MINUTE = VALUES(MINUTE)");
         } else if (DatabaseType.PG.equals(dataType) || DatabaseType.Timescale.equals(dataType)) {
-            sql.append(" ON CONFLICT (thing_code, attr_key) DO UPDATE SET val = EXCLUDED.val,ts= EXCLUDED.ts");
+            sql.append(" ON CONFLICT (thing_code, attr_key) DO UPDATE SET val = EXCLUDED.val,ts= EXCLUDED.ts,YEAR = EXCLUDED.YEAR,MONTH = EXCLUDED.MONTH,DAY = EXCLUDED.DAY,HOUR = EXCLUDED.HOUR,MINUTE = EXCLUDED.MINUTE");
         }
         sql.append(";");
         return sql.toString();
diff --git a/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java b/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java
index 7855988..b4ada46 100644
--- a/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java
+++ b/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java
@@ -111,9 +111,9 @@ public class TsKvNativeSQL {
             }
         });
         if (DatabaseType.MYSQL.equals(dataType) || DatabaseType.Tidb.equals(dataType)) {
-            sql.append(" ON DUPLICATE KEY UPDATE val = VALUES(val)");
+            sql.append(" ON DUPLICATE KEY UPDATE val = VALUES(val),YEAR = VALUES(YEAR),MONTH = VALUES(MONTH),DAY = VALUES(DAY),HOUR = VALUES(HOUR),MINUTE = VALUES(MINUTE)");
         } else if (DatabaseType.PG.equals(dataType) || DatabaseType.Timescale.equals(dataType)) {
-            sql.append(" ON CONFLICT (thing_code, attr_key, ts) DO UPDATE SET val = EXCLUDED.val");
+            sql.append(" ON CONFLICT (thing_code, attr_key, ts) DO UPDATE SET val = EXCLUDED.val,YEAR = EXCLUDED.YEAR,MONTH = EXCLUDED.MONTH,DAY = EXCLUDED.DAY,HOUR = EXCLUDED.HOUR,MINUTE = EXCLUDED.MINUTE");
         }
         sql.append(";");
         return sql.toString();
@@ -161,9 +161,9 @@ public class TsKvNativeSQL {
             }
         });
         if (DatabaseType.MYSQL.equals(dataType) || DatabaseType.Tidb.equals(dataType)) {
-            sql.append(" ON DUPLICATE KEY UPDATE val = VALUES(val)");
+            sql.append(" ON DUPLICATE KEY UPDATE val = VALUES(val),YEAR = VALUES(YEAR),MONTH = VALUES(MONTH),DAY = VALUES(DAY),HOUR = VALUES(HOUR),MINUTE = VALUES(MINUTE)");
         } else if (DatabaseType.PG.equals(dataType) || DatabaseType.Timescale.equals(dataType)) {
-            sql.append(" ON CONFLICT (thing_code, attr_key, ts) DO UPDATE SET val = EXCLUDED.val");
+            sql.append(" ON CONFLICT (thing_code, attr_key, ts) DO UPDATE SET val = EXCLUDED.val,YEAR = EXCLUDED.YEAR,MONTH = EXCLUDED.MONTH,DAY = EXCLUDED.DAY,HOUR = EXCLUDED.HOUR,MINUTE = EXCLUDED.MINUTE");
         }
         sql.append(";");
         return sql.toString();