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>> result = new HashMap<>(); Map> 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 timeList = new ArrayList<>(); timeList.add(rs.getTimestamp(1).getTime()); List 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 times = (List) map.get("times"); List values = (List) map.get("values"); times.add(rs.getTimestamp(1).getTime()); - values.add(rs.getObject(fieldList.get(i))); + values.add(rs.getObject(fieldList.get(i).toLowerCase())); } } }