新增监控指标展示功能

- 解决大数据量场景的卡顿问题。

Author: loveher147

backend/src/main/java/org/apache/iotdb/admin/controller/IotDBController.java

@@ -98,12 +98,12 @@ public BaseVO<DataModelVO> getDataModel(
   @GetMapping("/dataModel/detail")
   @ApiOperation("Get IoTDB data model in detail")
   public BaseVO<DataModelVO> getDataModelDetail(
-          @PathVariable("serverId") Integer serverId,
-          @RequestParam(value = "path", required = false, defaultValue = "root") String path,
-          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-          @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-          HttpServletRequest request)
-          throws BaseException {
+      @PathVariable("serverId") Integer serverId,
+      @RequestParam(value = "path", required = false, defaultValue = "root") String path,
+      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+      HttpServletRequest request)
+      throws BaseException {
     check(request, serverId);
     Connection connection = connectionService.getById(serverId);
     DataModelVO dataModelVO = iotDBService.getDataModelDetail(connection, path, pageSize, pageNum);
@@ -113,11 +113,11 @@ public BaseVO<DataModelVO> getDataModelDetail(
   @GetMapping("/storageGroups/info")
   @ApiOperation("Get information of the storage group list")
   public BaseVO<GroupInfoVO> getAllStorageGroupsInfo(
-          @PathVariable("serverId") Integer serverId,
-          @RequestParam(value = "pageSize", required = false, defaultValue = "15") Integer pageSize,
-          @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-          HttpServletRequest request)
-          throws BaseException {
+      @PathVariable("serverId") Integer serverId,
+      @RequestParam(value = "pageSize", required = false, defaultValue = "15") Integer pageSize,
+      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+      HttpServletRequest request)
+      throws BaseException {
     check(request, serverId);
     Connection connection = connectionService.getById(serverId);
     List<String> groupNames = iotDBService.getAllStorageGroups(connection);
@@ -162,8 +162,6 @@ public BaseVO<List<StorageGroupVO>> getAllStorageGroups(
     String host = connection.getHost();
     for (String groupName : groupNames) {
       StorageGroupVO storageGroupVO = new StorageGroupVO();
-      Integer id = groupService.getGroupId(host, groupName);
-      storageGroupVO.setGroupId(id);
       storageGroupVO.setGroupName(groupName);
       storageGroupVOList.add(storageGroupVO);
     }
@@ -193,9 +191,9 @@ public BaseVO saveStorageGroup(
     Connection connection = connectionService.getById(serverId);
     Long ttl = groupDTO.getTtl();
     String ttlUnit = groupDTO.getTtlUnit();
-    checkTtl(ttl, ttlUnit);
     Integer groupId = groupDTO.getGroupId();
     groupDTO.setGroupName(groupName);
+
     List<String> groupNames = iotDBService.getAllStorageGroups(connection);
     if (groupId == null) {
       if (!groupNames.contains(groupDTO.getGroupName())) {
@@ -206,6 +204,7 @@ public BaseVO saveStorageGroup(
       groupService.updateStorageGroupInfo(connection, groupDTO);
     }
     if (ttl != null && ttlUnit != null) {
+      checkTtl(ttl, ttlUnit);
       if (ttl >= 0) {
         Long times = switchTime(ttlUnit);
         iotDBService.saveGroupTtl(connection, groupName, ttl * times);
@@ -354,12 +353,19 @@ public BaseVO<List<NodeTreeVO>> getDevicesNodeTreeByGroup(
   public BaseVO<NodeTreeVO> getDevicesTreeByGroup(
       @PathVariable("serverId") Integer serverId,
       @PathVariable("groupName") String groupName,
+      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
       HttpServletRequest request)
       throws BaseException {
     checkParameter(groupName);
     check(request, serverId);
     Connection connection = connectionService.getById(serverId);
-    NodeTreeVO deviceList = iotDBService.getDeviceList(connection, groupName);
+    NodeTreeVO deviceList = iotDBService.getDeviceList(connection, groupName, pageSize, pageNum);
+    if (deviceList == null) {
+      deviceList = new NodeTreeVO(groupName);
+    }
+    deviceList.setPageNum(pageNum);
+    deviceList.setPageSize(pageSize);
     return BaseVO.success("Get successfully", deviceList);
   }
 
@@ -461,8 +467,8 @@ public BaseVO<MeasuremtnInfoVO> getMeasurementsByDeviceName(
       @PathVariable("serverId") Integer serverId,
       @PathVariable("groupName") String groupName,
       @PathVariable("deviceName") String deviceName,
-      @RequestParam("pageSize") Integer pageSize,
-      @RequestParam("pageNum") Integer pageNum,
+      @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+      @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
       @RequestParam(value = "keyword", required = false) String keyword,
       HttpServletRequest request)
       throws BaseException {
@@ -475,17 +481,26 @@ public BaseVO<MeasuremtnInfoVO> getMeasurementsByDeviceName(
     List<MeasurementVO> measurementVOList = new ArrayList<>();
     String host = connection.getHost();
     if (measurementDTOList != null) {
+      List<String> timeseriesList = new ArrayList<>();
+      for (MeasurementDTO measurementDTO : measurementDTOList) {
+        timeseriesList.add(measurementDTO.getTimeseries());
+      }
+      List<String> batchNewValue =
+          iotDBService.getBatchLastMeasurementValue(connection, timeseriesList);
+      List<String> batchDataCount =
+          iotDBService.getBatchDataCount(connection, deviceName, timeseriesList);
+      int index = 0;
       for (MeasurementDTO measurementDTO : measurementDTOList) {
         MeasurementVO measurementVO = new MeasurementVO();
         BeanUtils.copyProperties(measurementDTO, measurementVO);
         String description =
             measurementService.getDescription(host, measurementDTO.getTimeseries());
-        String newValue =
-            iotDBService.getLastMeasurementValue(connection, measurementDTO.getTimeseries());
-        Integer dataCount =
-            iotDBService.getOneDataCount(connection, deviceName, measurementDTO.getTimeseries());
-        measurementVO.setDataCount(dataCount);
-        measurementVO.setNewValue(newValue);
+        if (batchNewValue.size() != 0) {
+          measurementVO.setNewValue(batchNewValue.get(index));
+        }
+        if (batchDataCount.size() != 0) {
+          measurementVO.setDataCount(Integer.parseInt(batchDataCount.get(index)));
+        }
         measurementVO.setDescription(description);
         ObjectMapper mapper = new ObjectMapper();
         List<List<String>> tags = new ArrayList<>();
@@ -519,6 +534,7 @@ public BaseVO<MeasuremtnInfoVO> getMeasurementsByDeviceName(
           throw new BaseException(ErrorCode.GET_MSM_FAIL, ErrorCode.GET_MSM_FAIL_MSG);
         }
         measurementVOList.add(measurementVO);
+        index++;
       }
     }
     MeasuremtnInfoVO measuremtnInfoVO = new MeasuremtnInfoVO();

backend/src/main/java/org/apache/iotdb/admin/model/dto/DataModelDetailDTO.java

@@ -1,8 +1,9 @@
 package org.apache.iotdb.admin.model.dto;
 
-import lombok.Data;
 import org.apache.iotdb.admin.model.vo.DataModelVO;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 

backend/src/main/java/org/apache/iotdb/admin/model/vo/NodeTreeVO.java

@@ -31,10 +31,19 @@ public class NodeTreeVO implements Serializable {
 
   private List<NodeTreeVO> children;
 
+  private Integer pageSize;
+
+  private Integer pageNum;
+
+  private Integer total;
+  //  private List<String> childrenName;
+
   public NodeTreeVO(String name) {
     this.name = name;
   }
 
+  public NodeTreeVO() {}
+
   public List<NodeTreeVO> initChildren() {
     if (children == null) {
       children = new ArrayList<>();

backend/src/main/java/org/apache/iotdb/admin/service/IotDBService.java

@@ -62,9 +62,6 @@ CountDTO getMeasurementsByDevice(
 
   void setIotDBRole(Connection connection, IotDBRole iotDBRole) throws BaseException;
 
-  DataModelVO getDataModelDetail(
-          Connection connection, String path, Integer pageSize, Integer pageNum) throws BaseException;
-
   UserRolesVO getRolesOfUser(Connection connection, String userName) throws BaseException;
 
   void userGrant(Connection connection, String userName, UserGrantDTO userGrantDTO)
@@ -122,7 +119,9 @@ Integer getOneDataCount(Connection connection, String deviceName, String measure
 
   List<NodeTreeVO> getDeviceNodeTree(Connection connection, String groupName) throws BaseException;
 
-  NodeTreeVO getDeviceList(Connection connection, String groupName) throws BaseException;
+  NodeTreeVO getDeviceList(
+      Connection connection, String groupName, Integer pageSize, Integer pageNum)
+      throws BaseException;
 
   List<String> getDeviceParents(Connection connection, String groupName, String deviceName)
       throws BaseException;
@@ -155,6 +154,8 @@ void upsertDataPrivileges(
       Connection connection, String userOrRole, String name, PrivilegeInfoDTO privilegeInfoDTO)
       throws BaseException;
 
+  public List<QueryMetricsVO> getSlowQueryMetricsData();
+
   RecordVO getRecords(
       Connection connection, String deviceName, String timeseriesName, String dataType)
       throws BaseException;
@@ -164,9 +165,7 @@ List<SqlResultVO> queryAll(Connection connection, List<String> sqls, Long timest
 
   void updatePwd(Connection connection, IotDBUser iotDBUser) throws BaseException;
 
-  void stopQuery(Integer serverId, Long timestamp) throws BaseException;
-
-  QueryInfoDTO getQueryInfoListByQueryClassificationId(
+  public QueryInfoDTO getQueryInfoListByQueryClassificationId(
       Connection connection,
       Integer queryClassificationId,
       Integer pageSize,
@@ -177,10 +176,19 @@ QueryInfoDTO getQueryInfoListByQueryClassificationId(
       Integer executionResult)
       throws BaseException;
 
-  MetricsDataForDiagramVO getMetricDataByMetricId(Connection connection, Integer metricId)
+  public List<QueryMetricsVO> getTopQueryMetricsData();
+
+  public MetricsDataForDiagramVO getMetricDataByMetricId(Connection connection, Integer metricId)
       throws BaseException;
 
-  List<QueryMetricsVO> getTopQueryMetricsData();
+  void stopQuery(Integer serverId, Long timestamp) throws BaseException;
+
+  DataModelVO getDataModelDetail(
+      Connection connection, String path, Integer pageSize, Integer pageNum) throws BaseException;
+
+  List<String> getBatchLastMeasurementValue(Connection connection, List<String> timeseriesList)
+      throws BaseException;
 
-  List<QueryMetricsVO> getSlowQueryMetricsData();
+  List<String> getBatchDataCount(
+      Connection connection, String deviceName, List<String> timeseriesList) throws BaseException;
 }