fix: 首页调整,获取租户、客户的统计,直接返回时间不返回时间戳了

@@ -10,11 +10,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftTopDTO;
 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.dto.TkTsValue;
 import org.thingsboard.server.common.data.yunteng.dto.statistics.HomePageAppDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -71,7 +71,7 @@ public class HomePageController extends BaseController {
     @GetMapping("left/bottom")
     @ApiOperation(value = "获取左侧底部信息")
     @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','CUSTOMER_USER'},{})")
-    public DeferredResult<List<TsValue>> getLeftBottomInfo(
+    public DeferredResult<List<TkTsValue>> getLeftBottomInfo(
             @RequestParam(value = "startTs") long startTs,
             @RequestParam("endTs") long endTs,
             @RequestParam("interval") long interval,
@@ -102,7 +102,7 @@ public class HomePageController extends BaseController {
     @GetMapping("app")
     @ApiOperation(value = "小程序首页统计信息")
     public ResponseEntity<HomePageAppDTO> appStatistics(@ApiParam(value = "只取告警数据") @RequestParam("login") Boolean login)
-            throws ThingsboardException, ExecutionException, InterruptedException {
+            throws ThingsboardException{
         SecurityUser user = getCurrentUser();
         if(user == null){
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import lombok.Data;
+@Data
+public class TkTsValue {
+    private final String date;
+    private final String value;
+}

@@ -673,13 +673,13 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
 
   @Override
   @Async
-  public CompletableFuture<TsValue> findUsersAsyncByTs(
-      LocalDateTime startTs, LocalDateTime endTs, long ts) {
+  public CompletableFuture<TkTsValue> findUsersAsyncByTs(
+      LocalDateTime startTs, LocalDateTime endTs, String date) {
     DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     String startTime = df.format(startTs);
     String endTime = df.format(endTs);
     List<UserDTO> list = baseMapper.findUsersAsyncByTs(startTime, endTime);
-    return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(list.size())));
+    return CompletableFuture.supplyAsync(() -> new TkTsValue(date, String.valueOf(list.size())));
   }
 
   @Override

@@ -35,10 +35,9 @@ import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 import org.thingsboard.server.dao.yunteng.service.TkUserService;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -388,51 +387,66 @@ public class TkHomePageServiceImpl implements HomePageService {
   }
 
   @Override
-  public DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
+  public DeferredResult<List<TkTsValue>> getHomePageLeftBottomInfo(
       String customerId,
       long startTs,
       long endTs,
       long interval,
       TrendType trend,
       boolean isCustomer) {
-    List<CompletableFuture<TsValue>> futures = new ArrayList<>();
-    interval = interval < 7200000 ? 7200000 : interval;
+    List<CompletableFuture<TkTsValue>> futures = new ArrayList<>();
     long stepTs = startTs;
+    boolean isYearQuery = false;
+    if((endTs - startTs)/86400000 >= 365){
+      isYearQuery =true;
+    }
     while (stepTs < endTs) {
-      long tempStartTs = stepTs;
-      long tempEndTs = stepTs + interval;
-      long ts = tempStartTs + (tempEndTs - tempStartTs) / 2;
-      LocalDateTime startTime =
-          LocalDateTime.ofEpochSecond(tempStartTs / 1000, 0, ZoneOffset.ofHours(8));
-      LocalDateTime endTime =
-          LocalDateTime.ofEpochSecond(tempEndTs / 1000, 0, ZoneOffset.ofHours(8));
-      CompletableFuture<TsValue> tsValueCompletableFuture = null;
+      Long tempStartTs = stepTs;
+      Long tempEndTs = stepTs + interval;
+      LocalDateTime startTime;
+      LocalDateTime endTime;
+      if(isYearQuery){
+        //按月份过滤
+        Instant instant = Instant.ofEpochMilli(tempStartTs);
+        LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+        startTime = getMonthStartTime(dateTime);
+        endTime = getNextMonthStartTime(dateTime);
+      }else{
+        //按聚合条件过滤
+        startTime =
+                LocalDateTime.ofEpochSecond(tempStartTs / 1000, 0, ZoneOffset.ofHours(8));
+        endTime =
+                LocalDateTime.ofEpochSecond(tempEndTs / 1000, 0, ZoneOffset.ofHours(8));
+      }
+      CompletableFuture<TkTsValue> tsValueCompletableFuture = null;
       // 客户查询的是告警统计 消息统计
       if (isCustomer) {
+        String date = getDateByLocalTime(startTime,isYearQuery,true);
         if (trend == TrendType.CUSTOMER_ALARM_STATISTICAL) {
           tsValueCompletableFuture =
               findDeviceInfoByTs(
-                  customerId, tempStartTs, tempEndTs, ts, TrendType.CUSTOMER_ALARM_STATISTICAL);
+                  customerId, tempStartTs, tempEndTs, date, TrendType.CUSTOMER_ALARM_STATISTICAL);
         }
         if (trend == TrendType.CUSTOMER_MESSAGE_STATISTICAL) {
           tsValueCompletableFuture =
               findDeviceInfoByTs(
-                  customerId, tempStartTs, tempEndTs, ts, TrendType.CUSTOMER_MESSAGE_STATISTICAL);
+                  customerId, tempStartTs, tempEndTs, date, TrendType.CUSTOMER_MESSAGE_STATISTICAL);
         }
       } else {
+        String date = getDateByLocalTime(startTime,isYearQuery,false);
         if (trend == TrendType.TENANT_TREND) {
-          tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, ts);
+          tsValueCompletableFuture = tenantService.findTenantsByTs(startTime, endTime, date);
         }
         if (trend == TrendType.CUSTOMER_TREND) {
-          tsValueCompletableFuture = tkUserService.findUsersAsyncByTs(startTime, endTime, ts);
+          tsValueCompletableFuture = tkUserService.findUsersAsyncByTs(startTime, endTime, date);
         }
       }
       futures.add(tsValueCompletableFuture);
       stepTs = tempEndTs;
     }
-    final DeferredResult<List<TsValue>> deferredResult = new DeferredResult<>();
+    final DeferredResult<List<TkTsValue>> deferredResult = new DeferredResult<>();
     if (futures.size() > FastIotConstants.MagicNumber.ZERO) {
-      ListenableFuture<List<TsValue>> listenableFuture =
+      ListenableFuture<List<TkTsValue>> listenableFuture =
           Futures.transform(
               setFutures(futures),
               tsValues -> {
@@ -765,9 +779,9 @@ public class TkHomePageServiceImpl implements HomePageService {
     homePageLeftTopDTO.setCustomerInfo(baseHomePageTop);
   }
 
-  private SettableFuture<List<TsValue>> setFutures(List<CompletableFuture<TsValue>> tsFutures) {
-    SettableFuture<List<TsValue>> listenableFuture = SettableFuture.create();
-    CompletableFuture<List<TsValue>> entities =
+  private SettableFuture<List<TkTsValue>> setFutures(List<CompletableFuture<TkTsValue>> tsFutures) {
+    SettableFuture<List<TkTsValue>> listenableFuture = SettableFuture.create();
+    CompletableFuture<List<TkTsValue>> entities =
         CompletableFuture.allOf(tsFutures.toArray(new CompletableFuture[tsFutures.size()]))
             .thenApply(
                 v -> tsFutures.stream().map(CompletableFuture::join).collect(Collectors.toList()));
@@ -800,11 +814,11 @@ public class TkHomePageServiceImpl implements HomePageService {
     return listenableFuture;
   }
 
-  private FutureCallback<List<TsValue>> getTsValueCallback(
-      final DeferredResult<List<TsValue>> response) {
+  private FutureCallback<List<TkTsValue>> getTsValueCallback(
+      final DeferredResult<List<TkTsValue>> response) {
     return new FutureCallback<>() {
       @Override
-      public void onSuccess(@Nullable List<TsValue> tsValues) {
+      public void onSuccess(@Nullable List<TkTsValue> tsValues) {
         response.setResult(tsValues);
       }
 
@@ -852,14 +866,43 @@ public class TkHomePageServiceImpl implements HomePageService {
     };
   }
 
-  private CompletableFuture<TsValue> findDeviceInfoByTs(
-      String customerId, Long startTs, Long endTs, long ts, TrendType trend) {
+  private CompletableFuture<TkTsValue> findDeviceInfoByTs(
+      String customerId, Long startTs, Long endTs, String date, TrendType trend) {
     Integer value;
     if (trend == TrendType.CUSTOMER_MESSAGE_STATISTICAL) {
       value = deviceMapper.findDeviceMessageInfoByTs(customerId, startTs, endTs);
     } else {
       value = deviceMapper.findDeviceAlarmInfoByCreatedTime(customerId, startTs, endTs);
     }
-    return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(value)));
+    return CompletableFuture.supplyAsync(() -> new TkTsValue(date, String.valueOf(value)));
+  }
+
+  /**
+   * 获取本月的开始时间
+   * @param dateTime 本月时间
+   * @return 本月第一天时间
+   */
+  public LocalDateTime getMonthStartTime(LocalDateTime dateTime){
+    // 获取本月的第一天0点的时间戳
+     return dateTime.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0).withNano(0);
+  }
+
+  /**
+   * 获取下个月的开始时间
+   * @param dateTime 本月时间
+   * @return 下个月第一天时间
+   */
+  public LocalDateTime getNextMonthStartTime(LocalDateTime dateTime){
+    // 获取下个月的第一天
+    LocalDateTime firstDayOfNextMonth = dateTime.with(TemporalAdjusters.firstDayOfNextMonth()).with(TemporalAdjusters.firstDayOfMonth());
+    // 将时间设置为0点
+    return firstDayOfNextMonth.withHour(0).withMinute(0).withSecond(0).withNano(0);
+  }
+
+  public String getDateByLocalTime(LocalDateTime startTime,boolean isYearQuery,boolean isCustomer){
+    String format = isYearQuery ?"yyyy-MM":"yyyy-MM-dd";
+    format = isCustomer?"yyyy-MM-dd HH:mm:ss":format;
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+    return startTime.format(formatter);
   }
 }

@@ -14,10 +14,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkTsValue;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TenantReqDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TenantStatusEnum;
@@ -343,14 +343,14 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
 
   @Override
   @Async
-  public CompletableFuture<TsValue> findTenantsByTs(
-      LocalDateTime startTs, LocalDateTime endTs, long ts) {
+  public CompletableFuture<TkTsValue> findTenantsByTs(
+      LocalDateTime startTs, LocalDateTime endTs, String date) {
     List<SysTenantEntity> tenants =
         baseMapper.selectList(
             new LambdaQueryWrapper<SysTenantEntity>()
                 .ge(SysTenantEntity::getCreateTime, startTs)
                 .lt(SysTenantEntity::getCreateTime, endTs));
-    return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(tenants.size())));
+    return CompletableFuture.supplyAsync(() -> new TkTsValue(date, String.valueOf(tenants.size())));
   }
 
   @Override

@@ -3,10 +3,10 @@ package org.thingsboard.server.dao.yunteng.service;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.dto.HomePageLeftTopDTO;
 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.dto.TkTsValue;
 import org.thingsboard.server.common.data.yunteng.dto.statistics.HomePageAppDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -52,7 +52,7 @@ public interface HomePageService {
      * @param trend    趋势类型
      * @return 左侧底部信息
      */
-    DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
+    DeferredResult<List<TkTsValue>> getHomePageLeftBottomInfo(
             String customerId, long startTs, long endTs, long interval, TrendType trend, boolean isCustomer);
 
     /**

@@ -3,8 +3,8 @@ package org.thingsboard.server.dao.yunteng.service;
 
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkTsValue;
 import org.thingsboard.server.common.data.yunteng.dto.request.TenantReqDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 
@@ -33,7 +33,7 @@ public interface TkTenantService {
 
   List<TenantDTO> getAllTenant();
 
-  CompletableFuture<TsValue> findTenantsByTs(LocalDateTime startTs, LocalDateTime endTs,long ts);
+  CompletableFuture<TkTsValue> findTenantsByTs(LocalDateTime startTs, LocalDateTime endTs, String date);
 
   List<TenantDTO> checkTenantProfileIdUsedByTenants(String tenantProfileId);
 

 package org.thingsboard.server.dao.yunteng.service;
 
 import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.data.yunteng.dto.TkTsValue;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserInfoDTO;
@@ -133,11 +133,11 @@ public interface TkUserService {
    *
    * @param startTs 开始时间
    * @param endTs 结束时间
-   * @param ts 时间
+   * @param date 时间
    * @return 客户信息
    */
-  CompletableFuture<TsValue> findUsersAsyncByTs(
-      LocalDateTime startTs, LocalDateTime endTs, long ts);
+  CompletableFuture<TkTsValue> findUsersAsyncByTs(
+      LocalDateTime startTs, LocalDateTime endTs, String date);
 
   /**
    * 检查账号是否存在