From b12abbe1ad2f584212c3e296ed049474065ccbe9 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Wed, 30 Oct 2024 09:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/node/service/TDEngineService.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/service/TDEngineService.java b/das/src/main/java/com/das/modules/node/service/TDEngineService.java
index 0e656c62..51c33b95 100644
--- a/das/src/main/java/com/das/modules/node/service/TDEngineService.java
+++ b/das/src/main/java/com/das/modules/node/service/TDEngineService.java
@@ -80,7 +80,7 @@ public class TDEngineService {
                 }
                 sb.append(") TAGS (`deviceid` BIGINT);");
                 try {
-                    System.out.println(sb.toString());
+                    log.info(sb.toString());
                     pstmt.executeUpdate(sb.toString());
                 } catch (Exception e) {
                     log.error("创建超级表失败,失败原因{}", e);
@@ -353,6 +353,9 @@ public class TDEngineService {
         }
         Map<String, Map<String, Map<String, Object>>> result = new HashMap<>();
         Map<String, Map<String, Object>> valueMap = new HashMap<>();
+        for (String item : fieldList){
+            valueMap.put(item,null);
+        }
         StringBuffer sb = new StringBuffer(2048);
         if (StrUtil.isNotBlank(interval)) {
             String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime);
@@ -392,7 +395,7 @@ public class TDEngineService {
                         List<Long> timeList = new ArrayList<>();
                         timeList.add(rs.getTimestamp(1).getTime());
                         List<Object> valueList = new ArrayList<>();
-                        valueList.add(rs.getObject(fieldList.get(i)));
+                        valueList.add(rs.getObject(fieldList.get(i).toLowerCase()));
                         map.put("times",timeList);
                         map.put("values",valueList);
                         valueMap.put(fieldList.get(i),map);
@@ -401,7 +404,7 @@ public class TDEngineService {
                         List<Long> times = (List<Long>) map.get("times");
                         List<Object> values = (List<Object>) map.get("values");
                         times.add(rs.getTimestamp(1).getTime());
-                        values.add(rs.getObject(fieldList.get(i)));
+                        values.add(rs.getObject(fieldList.get(i).toLowerCase()));
                     }
                 }
             }