|
|
@@ -55,166 +55,74 @@ public class QueryTdengineDataServiceImpl extends AbstractCrudService<QueryTdeng
|
|
|
List<String> deviceUUIds = requestVO.getDeviceuuid();
|
|
|
List<String> metrics = requestVO.getMetrics();
|
|
|
|
|
|
- try {
|
|
|
- Connection connection = dataSource.getConnection();
|
|
|
- Statement statement = connection.createStatement();
|
|
|
-
|
|
|
-// // 将查询数据整理到各个超级表的数据集合中
|
|
|
-// List<SuperTableVO> supertablelist = new ArrayList<>();
|
|
|
-//
|
|
|
-// for (int i = 0; i < deviceUUIds.size(); i++) {
|
|
|
-// String superTablename = deviceUUIds.get(i);
|
|
|
-// if(supertablelist.stream().noneMatch(item -> item.getSuperTableName().equals(superTablename))){
|
|
|
-// SuperTableVO superTableVO = new SuperTableVO();
|
|
|
-// superTableVO.setSuperTableName(superTablename);
|
|
|
-// List<String> tableNames = new ArrayList<>();
|
|
|
-// tableNames.add(deviceUUIds.get(i));
|
|
|
-// superTableVO.setTableNames(tableNames);
|
|
|
-// supertablelist.add(superTableVO);
|
|
|
-// }else{
|
|
|
-// SuperTableVO superTableVO = supertablelist.stream().filter(item -> item.getSuperTableName().equals(superTablename)).findFirst().get();
|
|
|
-// List<String> tableNames = superTableVO.getTableNames();
|
|
|
-// tableNames.add(deviceUUIds.get(i));
|
|
|
-// superTableVO.setTableNames(tableNames);
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// // 遍历超级表集合，自动忽略表中不存在的字段，用有效字段构建查询，避免错误
|
|
|
-// for (int i = 0; i < supertablelist.size(); i++) {
|
|
|
-// String superTablename = supertablelist.get(i).getSuperTableName();
|
|
|
-//
|
|
|
-// String sql = "describe " + superTablename;
|
|
|
-// ResultSet resultSet = statement.executeQuery(sql);
|
|
|
-// List<Map<String, Object>> descList = new ArrayList<>();
|
|
|
-// while (resultSet.next()) {
|
|
|
-// Map<String, Object> map = new HashMap<>();
|
|
|
-// map.put("field", resultSet.getString("field"));
|
|
|
-// map.put("note", resultSet.getString("note"));
|
|
|
-// descList.add(map);
|
|
|
-// }
|
|
|
-// resultSet.close();
|
|
|
-//
|
|
|
-// String tagStr = "";
|
|
|
-// List<String> taglist = new ArrayList<>();
|
|
|
-// List<String> fieldKeys = new ArrayList<>();
|
|
|
-// for(Map<String, Object> map: descList){
|
|
|
-// String note = map.get("note").toString();
|
|
|
-// if("TAG".equals(note)){
|
|
|
-// tagStr = tagStr.concat(map.get("field").toString()+",");
|
|
|
-// taglist.add(map.get("field").toString());
|
|
|
-// }else{
|
|
|
-// fieldKeys.add(map.get("field").toString());
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-//
|
|
|
-// // 过滤有效字段
|
|
|
-// List<String> filterValidFields = new ArrayList<>();
|
|
|
-// if(CollectionUtils.isNotEmpty(metrics)){
|
|
|
-// filterValidFields = metrics.stream().filter(item -> fieldKeys.contains(item)).collect(Collectors.toList());
|
|
|
-// }else{
|
|
|
-// filterValidFields = fieldKeys;
|
|
|
-// }
|
|
|
-// String filterValidFieldStr = filterValidFields.stream().collect(Collectors.joining(","));
|
|
|
-// if(CollectionUtils.isEmpty(filterValidFields)){
|
|
|
-// throw new BusinessException(superTablename+"没有可用属性，请添加");
|
|
|
-// }
|
|
|
-//
|
|
|
-// String tableNames = "";
|
|
|
-// for (int j = 0; j < supertablelist.get(i).getTableNames().size(); j++) {
|
|
|
-// if(j == 0){
|
|
|
-// tableNames = "'"+supertablelist.get(i).getTableNames().get(j)+"'";
|
|
|
-// }else{
|
|
|
-// tableNames = tableNames.concat(",'"+supertablelist.get(i).getTableNames().get(j)+"'");
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// String query = "SELECT tbname,ts,"+tagStr+filterValidFieldStr+" FROM "+superTablename+" where tbname in ("+tableNames+") group by tbname having ts = last(ts)";
|
|
|
-// ResultSet metricList = statement.executeQuery(query);
|
|
|
-// while (metricList.next()) {
|
|
|
-// LastInnerResultVO resultVO = new LastInnerResultVO();
|
|
|
-// resultVO.setDeviceuuid(metricList.getString("tbname"));
|
|
|
-// Map<String, String> tag = new HashMap<String,String>();
|
|
|
-// for(int k=0;k<taglist.size();k++){
|
|
|
-// tag.put(taglist.get(k),metricList.getString(taglist.get(k)));
|
|
|
-// }
|
|
|
-// resultVO.setTags(tag);
|
|
|
-//
|
|
|
-// Map<String, Object> field = new HashMap<String,Object>();
|
|
|
-// field.put("time",metricList.getString("ts"));
|
|
|
-// for(int k =0;k<filterValidFields.size();k++){
|
|
|
-// field.put(filterValidFields.get(k),metricList.getString(filterValidFields.get(k)));
|
|
|
-// }
|
|
|
-// resultVO.setMetrics(field);
|
|
|
-// list.add(resultVO);
|
|
|
-// }
|
|
|
-// metricList.close();
|
|
|
-// }
|
|
|
|
|
|
+ // 遍历设备表集合，自动忽略表中不存在的字段，用有效字段构建查询，避免错误
|
|
|
+ for (int i = 0; i < deviceUUIds.size(); i++) {
|
|
|
+ try (Connection connection = dataSource.getConnection()) {
|
|
|
|
|
|
- // 遍历设备表集合，自动忽略表中不存在的字段，用有效字段构建查询，避免错误
|
|
|
- for (int i = 0; i < deviceUUIds.size(); i++) {
|
|
|
String tablename = "_"+deviceUUIds.get(i);
|
|
|
|
|
|
String sql = "describe " + tablename;
|
|
|
- ResultSet resultSet = statement.executeQuery(sql);
|
|
|
- String tagStr = "";
|
|
|
- List<String> taglist = new ArrayList<>();
|
|
|
- List<String> fieldKeys = new ArrayList<>();
|
|
|
- while (resultSet.next()) {
|
|
|
- String note = resultSet.getString("note");
|
|
|
- if("TAG".equals(note)){
|
|
|
- tagStr = tagStr.concat(resultSet.getString("field")+",");
|
|
|
- taglist.add(resultSet.getString("field"));
|
|
|
- }else{
|
|
|
- fieldKeys.add(resultSet.getString("field"));
|
|
|
- }
|
|
|
- }
|
|
|
- resultSet.close();
|
|
|
-
|
|
|
- // 过滤有效字段
|
|
|
- List<String> filterValidFields = new ArrayList<>();
|
|
|
- if(CollectionUtils.isNotEmpty(metrics)){
|
|
|
- filterValidFields = metrics.stream().filter(item -> fieldKeys.contains(item)).collect(Collectors.toList());
|
|
|
- }else{
|
|
|
- filterValidFields = fieldKeys;
|
|
|
- }
|
|
|
- String filterValidFieldStr = filterValidFields.stream().collect(Collectors.joining(","));
|
|
|
- if(CollectionUtils.isEmpty(filterValidFields)){
|
|
|
- throw new BusinessException(tablename+"没有可用属性，请添加");
|
|
|
- }
|
|
|
|
|
|
- String query = "SELECT ts,"+tagStr+filterValidFieldStr+" FROM "+tablename+" order by ts desc limit 1";
|
|
|
- ResultSet metricList = statement.executeQuery(query);
|
|
|
- while (metricList.next()) {
|
|
|
- LastInnerResultVO resultVO = new LastInnerResultVO();
|
|
|
- resultVO.setDeviceuuid(deviceUUIds.get(i));
|
|
|
- Map<String, String> tag = new HashMap<String,String>();
|
|
|
- for(int k=0;k<taglist.size();k++){
|
|
|
- tag.put(taglist.get(k),metricList.getString(taglist.get(k)));
|
|
|
- }
|
|
|
- resultVO.setTags(tag);
|
|
|
+ try (PreparedStatement itemStmt = connection.prepareStatement(sql)) {
|
|
|
+ try (ResultSet resultSet = itemStmt.executeQuery()) {
|
|
|
+ String tagStr = "";
|
|
|
+ List<String> taglist = new ArrayList<>();
|
|
|
+ List<String> fieldKeys = new ArrayList<>();
|
|
|
+ while (resultSet.next()) {
|
|
|
+ String note = resultSet.getString("note");
|
|
|
+ if("TAG".equals(note)){
|
|
|
+ tagStr = tagStr.concat(resultSet.getString("field")+",");
|
|
|
+ taglist.add(resultSet.getString("field"));
|
|
|
+ }else{
|
|
|
+ fieldKeys.add(resultSet.getString("field"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ resultSet.close();
|
|
|
+
|
|
|
+ // 过滤有效字段
|
|
|
+ List<String> filterValidFields = new ArrayList<>();
|
|
|
+ if(CollectionUtils.isNotEmpty(metrics)){
|
|
|
+ filterValidFields = metrics.stream().filter(item -> fieldKeys.contains(item)).collect(Collectors.toList());
|
|
|
+ }else{
|
|
|
+ filterValidFields = fieldKeys;
|
|
|
+ }
|
|
|
+ String filterValidFieldStr = filterValidFields.stream().collect(Collectors.joining(","));
|
|
|
+ if(CollectionUtils.isEmpty(filterValidFields)){
|
|
|
+ throw new BusinessException(tablename+"没有可用属性，请添加");
|
|
|
+ }
|
|
|
+
|
|
|
+ String query = "SELECT ts,"+tagStr+filterValidFieldStr+" FROM "+tablename+" order by ts desc limit 1";
|
|
|
+ try (PreparedStatement itemStmt1 = connection.prepareStatement(query)) {
|
|
|
+ try (ResultSet metricList = itemStmt1.executeQuery()) {
|
|
|
+ while (metricList.next()) {
|
|
|
+ LastInnerResultVO resultVO = new LastInnerResultVO();
|
|
|
+ resultVO.setDeviceuuid(deviceUUIds.get(i));
|
|
|
+ Map<String, String> tag = new HashMap<String,String>();
|
|
|
+ for(int k=0;k<taglist.size();k++){
|
|
|
+ tag.put(taglist.get(k),metricList.getString(taglist.get(k)));
|
|
|
+ }
|
|
|
+ resultVO.setTags(tag);
|
|
|
+
|
|
|
+ Map<String, Object> field = new HashMap<String,Object>();
|
|
|
+ field.put("realtime",metricList.getTimestamp("ts").getTime());
|
|
|
+ for(int k =0;k<filterValidFields.size();k++){
|
|
|
+ field.put(filterValidFields.get(k),metricList.getString(filterValidFields.get(k)));
|
|
|
+ }
|
|
|
+ resultVO.setMetrics(field);
|
|
|
+ list.add(resultVO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- Map<String, Object> field = new HashMap<String,Object>();
|
|
|
- field.put("realtime",metricList.getTimestamp("ts").getTime());
|
|
|
- for(int k =0;k<filterValidFields.size();k++){
|
|
|
- field.put(filterValidFields.get(k),metricList.getString(filterValidFields.get(k)));
|
|
|
}
|
|
|
- resultVO.setMetrics(field);
|
|
|
- list.add(resultVO);
|
|
|
}
|
|
|
- metricList.close();
|
|
|
- }
|
|
|
-
|
|
|
- statement.close();
|
|
|
- connection.close();
|
|
|
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
@@ -226,214 +134,100 @@ public class QueryTdengineDataServiceImpl extends AbstractCrudService<QueryTdeng
|
|
|
List<String> deviceUUIds = requestVO.getDeviceuuid();
|
|
|
List<String> metrics = requestVO.getMetrics();
|
|
|
|
|
|
- try {
|
|
|
- Connection connection = dataSource.getConnection();
|
|
|
- Statement statement = connection.createStatement();
|
|
|
-
|
|
|
-// // 将查询数据整理到各个超级表的数据集合中
|
|
|
-// List<SuperTableVO> supertablelist = new ArrayList<>();
|
|
|
-//
|
|
|
-// for (int i = 0; i < deviceUUIds.size(); i++) {
|
|
|
-// String superTablename = deviceUUIds.get(i).substring(0,deviceUUIds.get(i).lastIndexOf("_"));
|
|
|
-// if(supertablelist.stream().noneMatch(item -> item.getSuperTableName().equals(superTablename))){
|
|
|
-// SuperTableVO superTableVO = new SuperTableVO();
|
|
|
-// superTableVO.setSuperTableName(superTablename);
|
|
|
-// List<String> tableNames = new ArrayList<>();
|
|
|
-// tableNames.add(deviceUUIds.get(i));
|
|
|
-// superTableVO.setTableNames(tableNames);
|
|
|
-// supertablelist.add(superTableVO);
|
|
|
-// }else{
|
|
|
-// SuperTableVO superTableVO = supertablelist.stream().filter(item -> item.getSuperTableName().equals(superTablename)).findFirst().get();
|
|
|
-// List<String> tableNames = superTableVO.getTableNames();
|
|
|
-// tableNames.add(deviceUUIds.get(i));
|
|
|
-// superTableVO.setTableNames(tableNames);
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// // 遍历超级表集合，自动忽略表中不存在的字段，用有效字段构建查询，避免错误
|
|
|
-// for (int i = 0; i < supertablelist.size(); i++) {
|
|
|
-// String superTablename = supertablelist.get(i).getSuperTableName();
|
|
|
-//
|
|
|
-// String sql = "describe " + superTablename;
|
|
|
-// ResultSet resultSet = statement.executeQuery(sql);
|
|
|
-// List<Map<String, Object>> descList = new ArrayList<>();
|
|
|
-// while (resultSet.next()) {
|
|
|
-// Map<String, Object> map = new HashMap<>();
|
|
|
-// map.put("field", resultSet.getString("field"));
|
|
|
-// map.put("note", resultSet.getString("note"));
|
|
|
-// descList.add(map);
|
|
|
-// }
|
|
|
-// resultSet.close();
|
|
|
-//
|
|
|
-// String tagStr = "";
|
|
|
-// List<String> taglist = new ArrayList<>();
|
|
|
-// List<String> fieldKeys = new ArrayList<>();
|
|
|
-// for(Map<String, Object> map: descList){
|
|
|
-// String note = map.get("note").toString();
|
|
|
-// if("TAG".equals(note)){
|
|
|
-// tagStr = tagStr.concat(map.get("field").toString()+",");
|
|
|
-// taglist.add(map.get("field").toString());
|
|
|
-// }else{
|
|
|
-// fieldKeys.add(map.get("field").toString());
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-//
|
|
|
-// // 过滤有效字段
|
|
|
-// List<String> filterValidFields = new ArrayList<>();
|
|
|
-// if(CollectionUtils.isNotEmpty(metrics)){
|
|
|
-// filterValidFields = metrics.stream().filter(item -> fieldKeys.contains(item)).collect(Collectors.toList());
|
|
|
-// }else{
|
|
|
-// filterValidFields = fieldKeys;
|
|
|
-// }
|
|
|
-// String filterValidFieldStr = filterValidFields.stream().collect(Collectors.joining(","));
|
|
|
-// if(CollectionUtils.isEmpty(filterValidFields)){
|
|
|
-// throw new BusinessException(superTablename+"没有可用属性，请添加");
|
|
|
-// }
|
|
|
-//
|
|
|
-// for (int j = 0; j < supertablelist.get(i).getTableNames().size(); j++) {
|
|
|
-// String tableName = supertablelist.get(i).getTableNames().get(j);
|
|
|
-// HistorysInnerResultVO resultVO = new HistorysInnerResultVO();
|
|
|
-// resultVO.setDeviceuuid(tableName);
|
|
|
-//
|
|
|
-// String query = "SELECT ts,"+tagStr+filterValidFieldStr+" FROM "+tableName+" where ts >= '"+startTime+"' and ts <= '"+endTime+"'";
|
|
|
-// ResultSet resultSet1 = statement.executeQuery(query);
|
|
|
-// int count = resultSet1.getMetaData().getColumnCount();
|
|
|
-// List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
-// while (resultSet1.next()) {
|
|
|
-// Map<String, Object> map = new HashMap<>();
|
|
|
-// for (int k = 1; k <= count; k++) {
|
|
|
-// String key = resultSet1.getMetaData().getColumnName(k);
|
|
|
-// Object value = resultSet1.getString(k);
|
|
|
-// map.put(key, value);
|
|
|
-// }
|
|
|
-// resultList.add(map);
|
|
|
-// }
|
|
|
-// resultSet1.close();
|
|
|
-//
|
|
|
-// if(CollectionUtils.isNotEmpty(resultList)){
|
|
|
-// Map<String, String> tag = new HashMap<>();
|
|
|
-// for (int k = 0; k < taglist.size(); k++) {
|
|
|
-// tag.put(taglist.get(k), resultList.get(0).get(taglist.get(k)).toString());
|
|
|
-// }
|
|
|
-// resultVO.setTags(tag);
|
|
|
-//
|
|
|
-// List<MetricVO> metricList = new ArrayList<>();
|
|
|
-// for (int h = 0; h < filterValidFields.size(); h++) {
|
|
|
-// if(!"ts".equals(filterValidFields.get(h))){
|
|
|
-// MetricVO metricVO = new MetricVO();
|
|
|
-// metricVO.setMetric(filterValidFields.get(h));
|
|
|
-// List<Map<String,Object>> metircItems = new ArrayList<>();
|
|
|
-// for (int k = 0; k < resultList.size(); k++) {
|
|
|
-// String field = filterValidFields.get(h);
|
|
|
-// Map<String,Object> map = new HashMap<>();
|
|
|
-// map.put("timestamp",resultList.get(k).get("ts"));
|
|
|
-// map.put("value",resultList.get(k).get(field));
|
|
|
-// metircItems.add(map);
|
|
|
-// }
|
|
|
-// metricVO.setMetricItems(metircItems);
|
|
|
-// metricList.add(metricVO);
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-// resultVO.setMetrics(metricList);
|
|
|
-// list.add(resultVO);
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-
|
|
|
+ // 遍历设备表集合，自动忽略表中不存在的字段，用有效字段构建查询，避免错误
|
|
|
+ for (int i = 0; i < deviceUUIds.size(); i++) {
|
|
|
+ try (Connection connection = dataSource.getConnection()) {
|
|
|
|
|
|
- // 遍历超级表集合，自动忽略表中不存在的字段，用有效字段构建查询，避免错误
|
|
|
- for (int i = 0; i < deviceUUIds.size(); i++) {
|
|
|
String tablename = "_"+deviceUUIds.get(i);
|
|
|
|
|
|
String sql = "describe " + tablename;
|
|
|
- ResultSet resultSet = statement.executeQuery(sql);
|
|
|
- String tagStr = "";
|
|
|
- List<String> taglist = new ArrayList<>();
|
|
|
- List<String> fieldKeys = new ArrayList<>();
|
|
|
- while (resultSet.next()) {
|
|
|
- String note = resultSet.getString("note");
|
|
|
- if("TAG".equals(note)){
|
|
|
- tagStr = tagStr.concat(resultSet.getString("field")+",");
|
|
|
- taglist.add(resultSet.getString("field"));
|
|
|
- }else{
|
|
|
- fieldKeys.add(resultSet.getString("field"));
|
|
|
- }
|
|
|
- }
|
|
|
- resultSet.close();
|
|
|
-
|
|
|
- // 过滤有效字段
|
|
|
- List<String> filterValidFields = new ArrayList<>();
|
|
|
- if(CollectionUtils.isNotEmpty(metrics)){
|
|
|
- filterValidFields = metrics.stream().filter(item -> fieldKeys.contains(item)).collect(Collectors.toList());
|
|
|
- }else{
|
|
|
- filterValidFields = fieldKeys;
|
|
|
- }
|
|
|
- String filterValidFieldStr = filterValidFields.stream().collect(Collectors.joining(","));
|
|
|
- if(CollectionUtils.isEmpty(filterValidFields)){
|
|
|
- throw new BusinessException(tablename+"没有可用属性，请添加");
|
|
|
- }
|
|
|
|
|
|
- HistorysInnerResultVO resultVO = new HistorysInnerResultVO();
|
|
|
- resultVO.setDeviceuuid(deviceUUIds.get(i));
|
|
|
-
|
|
|
- String query = "SELECT ts,"+tagStr+filterValidFieldStr+" FROM "+tablename+" where ts >= '"+startTime+"' and ts <= '"+endTime+"'";
|
|
|
- ResultSet resultSet1 = statement.executeQuery(query);
|
|
|
- int count = resultSet1.getMetaData().getColumnCount();
|
|
|
- List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
- while (resultSet1.next()) {
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
- for (int k = 1; k <= count; k++) {
|
|
|
- String key = resultSet1.getMetaData().getColumnName(k);
|
|
|
- Object value = resultSet1.getString(k);
|
|
|
- map.put(key, value);
|
|
|
- }
|
|
|
- resultList.add(map);
|
|
|
- }
|
|
|
- resultSet1.close();
|
|
|
+ try (PreparedStatement itemStmt = connection.prepareStatement(sql)) {
|
|
|
+ try (ResultSet resultSet = itemStmt.executeQuery()) {
|
|
|
+ String tagStr = "";
|
|
|
+ List<String> taglist = new ArrayList<>();
|
|
|
+ List<String> fieldKeys = new ArrayList<>();
|
|
|
+ while (resultSet.next()) {
|
|
|
+ String note = resultSet.getString("note");
|
|
|
+ if("TAG".equals(note)){
|
|
|
+ tagStr = tagStr.concat(resultSet.getString("field")+",");
|
|
|
+ taglist.add(resultSet.getString("field"));
|
|
|
+ }else{
|
|
|
+ fieldKeys.add(resultSet.getString("field"));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ resultSet.close();
|
|
|
+
|
|
|
+ // 过滤有效字段
|
|
|
+ List<String> filterValidFields = new ArrayList<>();
|
|
|
+ if(CollectionUtils.isNotEmpty(metrics)){
|
|
|
+ filterValidFields = metrics.stream().filter(item -> fieldKeys.contains(item)).collect(Collectors.toList());
|
|
|
+ }else{
|
|
|
+ filterValidFields = fieldKeys;
|
|
|
+ }
|
|
|
+ String filterValidFieldStr = filterValidFields.stream().collect(Collectors.joining(","));
|
|
|
+ if(CollectionUtils.isEmpty(filterValidFields)){
|
|
|
+ throw new BusinessException(tablename+"没有可用属性，请添加");
|
|
|
+ }
|
|
|
|
|
|
- if(CollectionUtils.isNotEmpty(resultList)){
|
|
|
- Map<String, String> tag = new HashMap<>();
|
|
|
- for (int k = 0; k < taglist.size(); k++) {
|
|
|
- tag.put(taglist.get(k), resultList.get(0).get(taglist.get(k)).toString());
|
|
|
- }
|
|
|
- resultVO.setTags(tag);
|
|
|
-
|
|
|
- List<MetricVO> metricList = new ArrayList<>();
|
|
|
- for (int h = 0; h < filterValidFields.size(); h++) {
|
|
|
- if(!"ts".equals(filterValidFields.get(h))){
|
|
|
- MetricVO metricVO = new MetricVO();
|
|
|
- metricVO.setMetric(filterValidFields.get(h));
|
|
|
- List<Map<String,Object>> metircItems = new ArrayList<>();
|
|
|
- for (int k = 0; k < resultList.size(); k++) {
|
|
|
- String field = filterValidFields.get(h);
|
|
|
- Map<String,Object> map = new HashMap<>();
|
|
|
- map.put("timestamp",resultList.get(k).get("ts"));
|
|
|
- map.put("value",resultList.get(k).get(field));
|
|
|
- metircItems.add(map);
|
|
|
+ HistorysInnerResultVO resultVO = new HistorysInnerResultVO();
|
|
|
+ resultVO.setDeviceuuid(deviceUUIds.get(i));
|
|
|
+
|
|
|
+ String query = "SELECT ts,"+tagStr+filterValidFieldStr+" FROM "+tablename+" where ts >= '"+startTime+"' and ts <= '"+endTime+"'";
|
|
|
+ try (PreparedStatement itemStmt1 = connection.prepareStatement(query)) {
|
|
|
+ try (ResultSet resultSet1 = itemStmt1.executeQuery()) {
|
|
|
+ int count = resultSet1.getMetaData().getColumnCount();
|
|
|
+ List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
+ while (resultSet1.next()) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ for (int k = 1; k <= count; k++) {
|
|
|
+ String key = resultSet1.getMetaData().getColumnName(k);
|
|
|
+ Object value = resultSet1.getString(k);
|
|
|
+ map.put(key, value);
|
|
|
+ }
|
|
|
+ resultList.add(map);
|
|
|
+ }
|
|
|
+ resultSet1.close();
|
|
|
+
|
|
|
+ if(CollectionUtils.isNotEmpty(resultList)){
|
|
|
+ Map<String, String> tag = new HashMap<>();
|
|
|
+ for (int k = 0; k < taglist.size(); k++) {
|
|
|
+ tag.put(taglist.get(k), resultList.get(0).get(taglist.get(k)).toString());
|
|
|
+ }
|
|
|
+ resultVO.setTags(tag);
|
|
|
+
|
|
|
+ List<MetricVO> metricList = new ArrayList<>();
|
|
|
+ for (int h = 0; h < filterValidFields.size(); h++) {
|
|
|
+ if(!"ts".equals(filterValidFields.get(h))){
|
|
|
+ MetricVO metricVO = new MetricVO();
|
|
|
+ metricVO.setMetric(filterValidFields.get(h));
|
|
|
+ List<Map<String,Object>> metircItems = new ArrayList<>();
|
|
|
+ for (int k = 0; k < resultList.size(); k++) {
|
|
|
+ String field = filterValidFields.get(h);
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
+ map.put("timestamp",resultList.get(k).get("ts"));
|
|
|
+ map.put("value",resultList.get(k).get(field));
|
|
|
+ metircItems.add(map);
|
|
|
+ }
|
|
|
+ metricVO.setMetricItems(metircItems);
|
|
|
+ metricList.add(metricVO);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ resultVO.setMetrics(metricList);
|
|
|
+ list.add(resultVO);
|
|
|
+ }
|
|
|
}
|
|
|
- metricVO.setMetricItems(metircItems);
|
|
|
- metricList.add(metricVO);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- resultVO.setMetrics(metricList);
|
|
|
- list.add(resultVO);
|
|
|
}
|
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
-
|
|
|
- statement.close();
|
|
|
- connection.close();
|
|
|
-
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
return list;
|
|
|
|
|
|
}
|
|
|
@@ -455,25 +249,23 @@ public class QueryTdengineDataServiceImpl extends AbstractCrudService<QueryTdeng
|
|
|
// }).collect(Collectors.toList());
|
|
|
List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
|
|
|
- try {
|
|
|
- Connection connection = dataSource.getConnection();
|
|
|
- Statement statement = connection.createStatement();
|
|
|
+ try (Connection connection = dataSource.getConnection()) {
|
|
|
|
|
|
String query = "select device_uuid,realtime,device_id from datarealtime";
|
|
|
- ResultSet resultSet1 = statement.executeQuery(query);
|
|
|
-
|
|
|
- while (resultSet1.next()) {
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("device_uuid", resultSet1.getString("device_uuid"));
|
|
|
- map.put("device_id", resultSet1.getString("device_id"));
|
|
|
- map.put("realtime", resultSet1.getTimestamp("realtime").getTime());
|
|
|
+ try (PreparedStatement itemStmt = connection.prepareStatement(query)) {
|
|
|
+ try (ResultSet resultSet1 = itemStmt.executeQuery()){
|
|
|
+ while (resultSet1.next()) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("device_uuid", resultSet1.getString("device_uuid"));
|
|
|
+ map.put("device_id", resultSet1.getString("device_id"));
|
|
|
+ map.put("realtime", resultSet1.getTimestamp("realtime").getTime());
|
|
|
+
|
|
|
+ resultList.add(map);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- resultList.add(map);
|
|
|
}
|
|
|
- resultSet1.close();
|
|
|
|
|
|
- statement.close();
|
|
|
- connection.close();
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
