fix: 修改系统管理员情况下Top10的排名查询及过期租户分页查询返回

@@ -3,16 +3,15 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.query.TsValue;
-import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftBottomDTO;
-import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftTopDTO;
-import org.thingsboard.server.common.data.yunteng.dto.HomePageRightDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
@@ -51,23 +50,32 @@ public class HomePageController extends BaseController {
     return null;
   }
 
-  @GetMapping("right")
-  @ApiOperation(value = "获取右侧信息")
-  public HomePageRightDTO getRightTopInfo(
+  @GetMapping("right/overdue")
+  @ApiOperation(value = "获取右侧过期租户信息")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+  public ResponseEntity<YtPageData<TenantDTO>> getRightTopInfo(
       @RequestParam(PAGE) int page, @RequestParam(PAGE_SIZE) int pageSize) {
     HashMap<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
-    return homePageService.getHomePageRightInfo(queryMap);
+    return ResponseEntity.ok(homePageService.getHomePageRightInfo(queryMap));
+  }
+
+  @GetMapping("right/top10")
+  @ApiOperation(value = "获取右侧Top10")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+  public DeferredResult<List<TenantTransportMessageDTO>> getTop10() {
+    return homePageService.getTop10();
   }
 
   @GetMapping("left/bottom")
   @ApiOperation(value = "获取左侧底部信息")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
   public DeferredResult<List<TsValue>> getLeftBottomInfo(
       @RequestParam(value = "startTs") long startTs,
       @RequestParam("endTs") long endTs,
       @RequestParam("interval") long interval,
       @RequestParam("trend") TrendType trend) {
-    return homePageService.getHomePageLeftBottomInfo(startTs, endTs, interval,trend);
+    return homePageService.getHomePageLeftBottomInfo(startTs, endTs, interval, trend);
   }
 }

@@ -13,6 +13,7 @@ public interface FastIotConstants {
   class MagicNumber{
     public static final int ZERO = 0;
     public static final int ONE = 1;
+    public static final int TEN = 10;
   }
 
   String MOBILE =

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.util.concurrent.*;
 import lombok.RequiredArgsConstructor;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.ApiUsageState;
@@ -106,18 +107,15 @@ public class HomePageServiceImpl implements HomePageService {
   }
 
   @Override
-  public HomePageRightDTO getHomePageRightInfo(Map<String, Object> queryMap) {
-    HomePageRightDTO right = new HomePageRightDTO();
-    YtPageData<TenantDTO> expireTenants = tenantService.getCurrentMonthExpireTenantPage(queryMap);
-    right.setTop10(null);
-    right.setExpireTenant(expireTenants);
-    return right;
+  public YtPageData<TenantDTO> getHomePageRightInfo(Map<String, Object> queryMap) {
+    return tenantService.getCurrentMonthExpireTenantPage(queryMap);
   }
 
   @Override
   public DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
       long startTs, long endTs, long interval, TrendType trend) {
     List<CompletableFuture<TsValue>> futures = new ArrayList<>();
+    interval = interval < 7200000 ? 7200000 : interval;
     long stepTs = startTs;
     while (stepTs < endTs) {
       long tempStartTs = stepTs;
@@ -155,6 +153,70 @@ public class HomePageServiceImpl implements HomePageService {
     return deferredResult;
   }
 
+  @Override
+  public DeferredResult<List<TenantTransportMessageDTO>> getTop10() {
+    List<TenantDTO> tenants = tenantService.getAllTenant();
+    List<CompletableFuture<TenantTransportMessageDTO>> futures = new ArrayList<>();
+    tenants.forEach(
+        tenant -> {
+          TenantId tenantId = new TenantId(UUID.fromString(tenant.getTenantId()));
+          futures.add(getTransportMessageByTenantId(tenantId, tenant.getName()));
+        });
+    final DeferredResult<List<TenantTransportMessageDTO>> deferredResult = new DeferredResult<>();
+    if (futures.size() > FastIotConstants.MagicNumber.ZERO) {
+      ListenableFuture<List<TenantTransportMessageDTO>> listenableFuture =
+          Futures.transform(
+              settableFuture(futures),
+              transportMessage -> {
+                if (transportMessage != null && !transportMessage.isEmpty()) {
+                  return transportMessage;
+                } else {
+                  return null;
+                }
+              },
+              MoreExecutors.directExecutor());
+      Futures.addCallback(
+          listenableFuture,
+          getTransportMessageCallback(deferredResult),
+          MoreExecutors.directExecutor());
+    }
+    return deferredResult;
+  }
+
+  @Override
+  @Async
+  public CompletableFuture<TenantTransportMessageDTO> getTransportMessageByTenantId(
+      TenantId tenantId, String tenantName) {
+    List<EntityKey> latestValues = new ArrayList<>();
+    latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "transportMsgCount"));
+    PageData<EntityData> pageData = queryEntityData(tenantId, null, latestValues);
+    Map<EntityKeyType, Map<String, TsValue>> latest = pageData.getData().get(0).getLatest();
+    TenantTransportMessageDTO transportMessage = new TenantTransportMessageDTO();
+    latest
+        .keySet()
+        .forEach(
+            item -> {
+              if (item.equals(EntityKeyType.TIME_SERIES)) {
+                Map<String, TsValue> tsValueMap = latest.get(item);
+                tsValueMap
+                    .keySet()
+                    .forEach(
+                        mapKey -> {
+                          Long value =
+                              Long.valueOf(
+                                  tsValueMap.get(mapKey).getValue().isEmpty()
+                                      ? FastIotConstants.MagicNumber.ZERO + ""
+                                      : tsValueMap.get(mapKey).getValue());
+                          if (mapKey.equals("transportMsgCount")) {
+                            transportMessage.setName(tenantName);
+                            transportMessage.setCount(value);
+                          }
+                        });
+              }
+            });
+    return CompletableFuture.supplyAsync(() -> transportMessage);
+  }
+
   /**
    * 设置设备相关的数据
    *
@@ -221,15 +283,6 @@ public class HomePageServiceImpl implements HomePageService {
   private void setAlarmAndMessageInfo(
       String tenantId, HomePageTopMessage messageInfo, BaseHomePageTop alarm)
       throws ExecutionException, InterruptedException {
-    TenantId currentTenantId = new TenantId(UUID.fromString(tenantId));
-    CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
-    EntityKey key = new EntityKey(EntityKeyType.ENTITY_FIELD, "createdTime");
-    EntityDataSortOrder sortOrder =
-        new EntityDataSortOrder(key, EntityDataSortOrder.Direction.DESC);
-    EntityDataPageLink pageLink =
-        new EntityDataPageLink(
-            FastIotConstants.MagicNumber.ONE, FastIotConstants.MagicNumber.ZERO, null, sortOrder);
-
     List<EntityKey> entityFields = new ArrayList<>();
     entityFields.add(new EntityKey(EntityKeyType.ENTITY_FIELD, "name"));
     entityFields.add(new EntityKey(EntityKeyType.ENTITY_FIELD, "label"));
@@ -239,14 +292,9 @@ public class HomePageServiceImpl implements HomePageService {
     latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "transportDataPointsCount"));
     latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "createdAlarmsCount"));
 
-    SingleEntityFilter singleEntityFilter = new SingleEntityFilter();
+    TenantId currentTenantId = new TenantId(UUID.fromString(tenantId));
     ApiUsageState apiUsageState = apiUsageStateService.findTenantApiUsageState(currentTenantId);
-    singleEntityFilter.setSingleEntity(apiUsageState.getId());
-
-    EntityDataQuery query =
-        new EntityDataQuery(singleEntityFilter, pageLink, entityFields, latestValues, null);
-    PageData<EntityData> pageData =
-        entityService.findEntityDataByQuery(currentTenantId, customerId, query);
+    PageData<EntityData> pageData = queryEntityData(currentTenantId, entityFields, latestValues);
     Map<EntityKeyType, Map<String, TsValue>> latest = pageData.getData().get(0).getLatest();
     latest
         .keySet()
@@ -335,6 +383,24 @@ public class HomePageServiceImpl implements HomePageService {
           }
         });
   }
+
+  private PageData<EntityData> queryEntityData(
+      TenantId currentTenantId, List<EntityKey> entityFields, List<EntityKey> latestValues) {
+    CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
+    EntityKey key = new EntityKey(EntityKeyType.ENTITY_FIELD, "createdTime");
+    EntityDataSortOrder sortOrder =
+        new EntityDataSortOrder(key, EntityDataSortOrder.Direction.DESC);
+    EntityDataPageLink pageLink =
+        new EntityDataPageLink(
+            FastIotConstants.MagicNumber.ONE, FastIotConstants.MagicNumber.ZERO, null, sortOrder);
+    SingleEntityFilter singleEntityFilter = new SingleEntityFilter();
+    ApiUsageState apiUsageState = apiUsageStateService.findTenantApiUsageState(currentTenantId);
+    singleEntityFilter.setSingleEntity(apiUsageState.getId());
+
+    EntityDataQuery query =
+        new EntityDataQuery(singleEntityFilter, pageLink, entityFields, latestValues, null);
+    return entityService.findEntityDataByQuery(currentTenantId, customerId, query);
+  }
   /**
    * 设置客户返回信息
    *
@@ -378,6 +444,24 @@ public class HomePageServiceImpl implements HomePageService {
     return listenableFuture;
   }
 
+  private SettableFuture<List<TenantTransportMessageDTO>> settableFuture(
+      List<CompletableFuture<TenantTransportMessageDTO>> tsFutures) {
+    SettableFuture<List<TenantTransportMessageDTO>> listenableFuture = SettableFuture.create();
+    CompletableFuture<List<TenantTransportMessageDTO>> entities =
+        CompletableFuture.allOf(tsFutures.toArray(new CompletableFuture[tsFutures.size()]))
+            .thenApply(
+                v -> tsFutures.stream().map(CompletableFuture::join).collect(Collectors.toList()));
+    entities.whenComplete(
+        (tsValues, throwable) -> {
+          if (throwable != null) {
+            listenableFuture.setException(throwable);
+          } else {
+            listenableFuture.set(tsValues);
+          }
+        });
+    return listenableFuture;
+  }
+
   private FutureCallback<List<TsValue>> getTsValueCallback(
       final DeferredResult<List<TsValue>> response) {
     return new FutureCallback<>() {
@@ -392,4 +476,41 @@ public class HomePageServiceImpl implements HomePageService {
       }
     };
   }
+
+  private FutureCallback<List<TenantTransportMessageDTO>> getTransportMessageCallback(
+      final DeferredResult<List<TenantTransportMessageDTO>> response) {
+    return new FutureCallback<>() {
+      @Override
+      public void onSuccess(@Nullable List<TenantTransportMessageDTO> values) {
+        // sort
+        if (null != values && values.size() > FastIotConstants.MagicNumber.ZERO) {
+          int length = values.size() - FastIotConstants.MagicNumber.ONE;
+          for (int i = FastIotConstants.MagicNumber.ZERO; i < length; i++) {
+            for (int j = FastIotConstants.MagicNumber.ZERO; j < length - i; j++) {
+              if (values.get(j).getCount()
+                  < values.get(j + FastIotConstants.MagicNumber.ONE).getCount()) {
+                String name = values.get(j).getName();
+                Long count = values.get(j).getCount();
+                values.get(j).setName(values.get(j + FastIotConstants.MagicNumber.ONE).getName());
+                values.get(j).setCount(values.get(j + FastIotConstants.MagicNumber.ONE).getCount());
+                values.get(j + FastIotConstants.MagicNumber.ONE).setName(name);
+                values.get(j + FastIotConstants.MagicNumber.ONE).setCount(count);
+              }
+            }
+          }
+          values =
+              values.size() > FastIotConstants.MagicNumber.TEN
+                  ? values.subList(
+                      FastIotConstants.MagicNumber.ZERO, FastIotConstants.MagicNumber.TEN)
+                  : values;
+        }
+        response.setResult(values);
+      }
+
+      @Override
+      public void onFailure(Throwable throwable) {
+        response.setResult(null);
+      }
+    };
+  }
 }

 package org.thingsboard.server.dao.yunteng.service;
 
 import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.TsValue;
-import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftBottomDTO;
 import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftTopDTO;
 import org.thingsboard.server.common.data.yunteng.dto.HomePageRightDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TenantTransportMessageDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 public interface HomePageService {
@@ -36,7 +41,7 @@ public interface HomePageService {
    * @param queryMap 查询条件
    * @return 右侧信息
    */
-  HomePageRightDTO getHomePageRightInfo(Map<String, Object> queryMap);
+  YtPageData<TenantDTO> getHomePageRightInfo(Map<String, Object> queryMap);
 
   /**
    * 获取首页左侧底部信息
@@ -48,4 +53,18 @@ public interface HomePageService {
    * @return 左侧底部信息
    */
   DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(long startTs, long endTs, long interval, TrendType trend);
+
+  /**
+   * 获取首页TOP10
+   * @return top10
+   */
+  DeferredResult<List<TenantTransportMessageDTO>> getTop10();
+
+  /**
+   * 获取租户的传输信息
+   * @param tenantId 租户ID
+   * @param tenantName 租户姓名
+   * @return 传输信息
+   */
+  CompletableFuture<TenantTransportMessageDTO> getTransportMessageByTenantId(TenantId tenantId,String tenantName);
 }