From 8c137fcfb7f02a317047f89df0738ff0eb5ef945 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Thu, 31 Oct 2024 10:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=8E=9F?= =?UTF-8?q?=E5=A7=8B=E5=80=BC=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/node/service/TDEngineService.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 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 5cd18c94..f9c5d209 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 @@ -417,10 +417,15 @@ public class TDEngineService { Map>> result = new HashMap<>(); Map> valueMap = new HashMap<>(); for (String item : fieldList) { - valueMap.put(item, null); + Map timeValueMap = new HashMap<>(); + List times = new ArrayList<>(); + List objects = new ArrayList<>(); + timeValueMap.put("times",times); + timeValueMap.put("values",objects); + valueMap.put(item, timeValueMap); } StringBuffer sb = new StringBuffer(2048); - if (StrUtil.isNotBlank(interval)) { + if (!StrUtil.isNotBlank(interval) && interval.equals("NONE")) { String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime); String endTimeStr = SIMPLE_DATE_FORMAT.format(endTime); String timeStr = String.format("'%s','%s'", startTimeStr, endTimeStr); @@ -490,10 +495,15 @@ public class TDEngineService { Map>> result = new HashMap<>(); Map> valueMap = new HashMap<>(); for (String item : fieldList) { - valueMap.put(item, null); + Map timeValueMap = new HashMap<>(); + List times = new ArrayList<>(); + List objects = new ArrayList<>(); + timeValueMap.put("times",times); + timeValueMap.put("values",objects); + valueMap.put(item, timeValueMap); } StringBuffer sb = new StringBuffer(2048); - if (StrUtil.isNotBlank(interval)) { + if (!StrUtil.isNotBlank(interval) && interval.equals("NONE")) { String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime); String endTimeStr = SIMPLE_DATE_FORMAT.format(endTime); String timeStr = String.format("'%s','%s'", startTimeStr, endTimeStr);