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-12-19 09:17:51 +08:00
parent 2c5328aa91
commit 5c496dd543
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,7 +526,7 @@ public class TDEngineService {
if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) { if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) {
String intervalStr = convertInterval(interval); String intervalStr = convertInterval(interval);
sb.append("select _WSTART, _WEND, updatetime"); sb.append("select _WSTART, _WEND");
fieldList.forEach(field -> fieldList.forEach(field ->
sb.append(" ,").append(calFunction).append("(").append(field).append(") ") sb.append(" ,").append(calFunction).append("(").append(field).append(") ")
); );
@ -546,7 +546,7 @@ public class TDEngineService {
if (valueMap.get(fieldList.get(i)) == null) { if (valueMap.get(fieldList.get(i)) == null) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
List<Long> timeList = new ArrayList<>(); List<Long> timeList = new ArrayList<>();
timeList.add(rs.getTimestamp(3).getTime()); timeList.add(rs.getTimestamp(1).getTime());
List<Object> valueList = new ArrayList<>(); List<Object> valueList = new ArrayList<>();
valueList.add(rs.getObject(fieldList.get(i).toLowerCase())); valueList.add(rs.getObject(fieldList.get(i).toLowerCase()));
map.put("times", timeList); map.put("times", timeList);
@ -556,7 +556,7 @@ public class TDEngineService {
Map<String, Object> map = valueMap.get(fieldList.get(i)); Map<String, Object> map = valueMap.get(fieldList.get(i));
List<Long> times = (List<Long>) map.get("times"); List<Long> times = (List<Long>) map.get("times");
List<Object> values = (List<Object>) map.get("values"); 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())); values.add(rs.getObject(fieldList.get(i).toLowerCase()));
} }
} }
@ -589,7 +589,7 @@ public class TDEngineService {
if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) { if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) {
String intervalStr = convertInterval(interval); String intervalStr = convertInterval(interval);
sb.append("select _WSTART, _WEND,updatetime"); sb.append("select _WSTART, _WEND");
fieldList.forEach(field -> fieldList.forEach(field ->
sb.append(" ,").append(calFunction).append("(").append(field).append(") ") sb.append(" ,").append(calFunction).append("(").append(field).append(") ")
); );
@ -609,7 +609,7 @@ public class TDEngineService {
if (valueMap.get(fieldList.get(i)) == null) { if (valueMap.get(fieldList.get(i)) == null) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
List<Long> timeList = new ArrayList<>(); List<Long> timeList = new ArrayList<>();
timeList.add(rs.getTimestamp(3).getTime()); timeList.add(rs.getTimestamp(1).getTime());
List<Object> valueList = new ArrayList<>(); List<Object> valueList = new ArrayList<>();
valueList.add(rs.getObject(fieldList.get(i).toLowerCase())); valueList.add(rs.getObject(fieldList.get(i).toLowerCase()));
map.put("times", timeList); map.put("times", timeList);
@ -619,7 +619,7 @@ public class TDEngineService {
Map<String, Object> map = valueMap.get(fieldList.get(i)); Map<String, Object> map = valueMap.get(fieldList.get(i));
List<Long> times = (List<Long>) map.get("times"); List<Long> times = (List<Long>) map.get("times");
List<Object> values = (List<Object>) map.get("values"); 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())); values.add(rs.getObject(fieldList.get(i).toLowerCase()));
} }
} }
@ -648,7 +648,7 @@ public class TDEngineService {
StringBuffer sb = new StringBuffer(2048); StringBuffer sb = new StringBuffer(2048);
if (!(StrUtil.isNotBlank(interval) && interval.equals("NONE"))) { 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(calFunction).append("(datavalue) as datavalue");
sb.append(" from c_"); sb.append(" from c_");
sb.append(irn).append("_").append(calFieldCode); sb.append(irn).append("_").append(calFieldCode);
@ -665,7 +665,7 @@ public class TDEngineService {
if (valueMap.get(calFieldCode) == null) { if (valueMap.get(calFieldCode) == null) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
List<Long> timeList = new ArrayList<>(); List<Long> timeList = new ArrayList<>();
timeList.add(rs.getTimestamp(3).getTime()); timeList.add(rs.getTimestamp(1).getTime());
List<Object> valueList = new ArrayList<>(); List<Object> valueList = new ArrayList<>();
valueList.add(rs.getObject("datavalue")); valueList.add(rs.getObject("datavalue"));
map.put("times", timeList); map.put("times", timeList);
@ -675,7 +675,7 @@ public class TDEngineService {
Map<String, Object> map = valueMap.get(calFieldCode); Map<String, Object> map = valueMap.get(calFieldCode);
List<Long> timeList = (List<Long>) map.get("times"); List<Long> timeList = (List<Long>) map.get("times");
List<Object> values = (List<Object>) map.get("values"); 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")); values.add(rs.getObject("datavalue"));
} }