From 5c496dd54359543bf3de71495f170d0303993ce9 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Thu, 19 Dec 2024 09:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AA=97=E5=8F=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/data/service/TDEngineService.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
index 7d85db4e..460805dc 100644
--- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java
+++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java
@@ -526,7 +526,7 @@ public class TDEngineService {
         if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) {
             String intervalStr = convertInterval(interval);
 
-            sb.append("select _WSTART, _WEND, updatetime");
+            sb.append("select _WSTART, _WEND");
             fieldList.forEach(field ->
                     sb.append(" ,").append(calFunction).append("(").append(field).append(") ")
             );
@@ -546,7 +546,7 @@ public class TDEngineService {
                     if (valueMap.get(fieldList.get(i)) == null) {
                         Map<String, Object> map = new HashMap<>();
                         List<Long> timeList = new ArrayList<>();
-                        timeList.add(rs.getTimestamp(3).getTime());
+                        timeList.add(rs.getTimestamp(1).getTime());
                         List<Object> valueList = new ArrayList<>();
                         valueList.add(rs.getObject(fieldList.get(i).toLowerCase()));
                         map.put("times", timeList);
@@ -556,7 +556,7 @@ public class TDEngineService {
                         Map<String, Object> map = valueMap.get(fieldList.get(i));
                         List<Long> times = (List<Long>) map.get("times");
                         List<Object> values = (List<Object>) map.get("values");
-                        times.add(rs.getTimestamp(3).getTime());
+                        times.add(rs.getTimestamp(1).getTime());
                         values.add(rs.getObject(fieldList.get(i).toLowerCase()));
                     }
                 }
@@ -589,7 +589,7 @@ public class TDEngineService {
         if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) {
             String intervalStr = convertInterval(interval);
 
-            sb.append("select _WSTART, _WEND,updatetime");
+            sb.append("select _WSTART, _WEND");
             fieldList.forEach(field ->
                     sb.append(" ,").append(calFunction).append("(").append(field).append(") ")
             );
@@ -609,7 +609,7 @@ public class TDEngineService {
                     if (valueMap.get(fieldList.get(i)) == null) {
                         Map<String, Object> map = new HashMap<>();
                         List<Long> timeList = new ArrayList<>();
-                        timeList.add(rs.getTimestamp(3).getTime());
+                        timeList.add(rs.getTimestamp(1).getTime());
                         List<Object> valueList = new ArrayList<>();
                         valueList.add(rs.getObject(fieldList.get(i).toLowerCase()));
                         map.put("times", timeList);
@@ -619,7 +619,7 @@ public class TDEngineService {
                         Map<String, Object> map = valueMap.get(fieldList.get(i));
                         List<Long> times = (List<Long>) map.get("times");
                         List<Object> values = (List<Object>) map.get("values");
-                        times.add(rs.getTimestamp(3).getTime());
+                        times.add(rs.getTimestamp(1).getTime());
                         values.add(rs.getObject(fieldList.get(i).toLowerCase()));
                     }
                 }
@@ -648,7 +648,7 @@ public class TDEngineService {
 
         StringBuffer sb = new StringBuffer(2048);
         if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) {
-            sb.append("select _WSTART, _WEND,updatetime,");
+            sb.append("select _WSTART, _WEND,");
             sb.append(calFunction).append("(datavalue) as datavalue");
             sb.append(" from c_");
             sb.append(irn).append("_").append(calFieldCode);
@@ -665,7 +665,7 @@ public class TDEngineService {
                 if (valueMap.get(calFieldCode) == null) {
                     Map<String, Object> map = new HashMap<>();
                     List<Long> timeList = new ArrayList<>();
-                    timeList.add(rs.getTimestamp(3).getTime());
+                    timeList.add(rs.getTimestamp(1).getTime());
                     List<Object> valueList = new ArrayList<>();
                     valueList.add(rs.getObject("datavalue"));
                     map.put("times", timeList);
@@ -675,7 +675,7 @@ public class TDEngineService {
                     Map<String, Object> map = valueMap.get(calFieldCode);
                     List<Long> timeList = (List<Long>) map.get("times");
                     List<Object> values = (List<Object>) map.get("values");
-                    timeList.add(rs.getTimestamp(3).getTime());
+                    timeList.add(rs.getTimestamp(1).getTime());
                     values.add(rs.getObject("datavalue"));
                 }