sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

历史数据原始值查询修改

Browse Source
This commit is contained in:
huguanghan 2024-10-31 10:31:02 +08:00
parent a9b4c855d9
commit 8c137fcfb7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
das/src/main/java/com/das/modules/node/service/TDEngineService.java
View File

@ -417,10 +417,15 @@ public class TDEngineService {
Map<String, Map<String, Map<String, Object>>> result = new HashMap<>(); Map<String, Map<String, Map<String, Object>>> result = new HashMap<>();
Map<String, Map<String, Object>> valueMap = new HashMap<>(); Map<String, Map<String, Object>> valueMap = new HashMap<>();
for (String item : fieldList) { for (String item : fieldList) {
valueMap.put(item, null); Map<String,Object> timeValueMap = new HashMap<>();
List<Long> times = new ArrayList<>();
List<Object> objects = new ArrayList<>();
timeValueMap.put("times",times);
timeValueMap.put("values",objects);
valueMap.put(item, timeValueMap);
} }
StringBuffer sb = new StringBuffer(2048); StringBuffer sb = new StringBuffer(2048);
if (StrUtil.isNotBlank(interval)) { if (!StrUtil.isNotBlank(interval) && interval.equals("NONE")) {
String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime); String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime);
String endTimeStr = SIMPLE_DATE_FORMAT.format(endTime); String endTimeStr = SIMPLE_DATE_FORMAT.format(endTime);
String timeStr = String.format("'%s','%s'", startTimeStr, endTimeStr); String timeStr = String.format("'%s','%s'", startTimeStr, endTimeStr);
@ -490,10 +495,15 @@ public class TDEngineService {
Map<String, Map<String, Map<String, Object>>> result = new HashMap<>(); Map<String, Map<String, Map<String, Object>>> result = new HashMap<>();
Map<String, Map<String, Object>> valueMap = new HashMap<>(); Map<String, Map<String, Object>> valueMap = new HashMap<>();
for (String item : fieldList) { for (String item : fieldList) {
valueMap.put(item, null); Map<String,Object> timeValueMap = new HashMap<>();
List<Long> times = new ArrayList<>();
List<Object> objects = new ArrayList<>();
timeValueMap.put("times",times);
timeValueMap.put("values",objects);
valueMap.put(item, timeValueMap);
} }
StringBuffer sb = new StringBuffer(2048); StringBuffer sb = new StringBuffer(2048);
if (StrUtil.isNotBlank(interval)) { if (!StrUtil.isNotBlank(interval) && interval.equals("NONE")) {
String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime); String startTimeStr = SIMPLE_DATE_FORMAT.format(startTime);
String endTimeStr = SIMPLE_DATE_FORMAT.format(endTime); String endTimeStr = SIMPLE_DATE_FORMAT.format(endTime);
String timeStr = String.format("'%s','%s'", startTimeStr, endTimeStr); String timeStr = String.format("'%s','%s'", startTimeStr, endTimeStr);