feat: 小程序首页统计信息

@@ -3,6 +3,7 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,11 +15,13 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.query.TsValue;
 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.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+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.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
+import org.thingsboard.server.service.security.model.SecurityUser;
 
 
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -33,66 +36,78 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RestController
 @RestController
 public class HomePageController extends BaseController {
 public class HomePageController extends BaseController {
 
 
-  private final HomePageService homePageService;
+    private final HomePageService homePageService;
 
 
-  @GetMapping("left/top")
-  @ApiOperation(value = "获取左侧顶部信息")
-  public HomePageLeftTopDTO getLeftTopInfo()
-      throws ThingsboardException, ExecutionException, InterruptedException {
-    return homePageService.getHomePageLeftTopInfo(
-        getCurrentUser().isPtSysadmin(),
-        getCurrentUser().isPtAdmin(),
-        getCurrentUser().isPtTenantAdmin(),
-        getCurrentUser().getCurrentTenantId(),
-        getCurrentUser().getCurrentUserId());
-  }
-
-  @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 ResponseEntity.ok(homePageService.getHomePageRightInfo(queryMap));
-  }
+    @GetMapping("left/top")
+    @ApiOperation(value = "获取左侧顶部信息")
+    public HomePageLeftTopDTO getLeftTopInfo()
+            throws ThingsboardException, ExecutionException, InterruptedException {
+        return homePageService.getHomePageLeftTopInfo(
+                getCurrentUser().isPtSysadmin(),
+                getCurrentUser().isPtAdmin(),
+                getCurrentUser().isPtTenantAdmin(),
+                getCurrentUser().getCurrentTenantId(),
+                getCurrentUser().getCurrentUserId());
+    }
 
 
-  @GetMapping("right/top10")
-  @ApiOperation(value = "获取右侧Top10")
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
-  public DeferredResult<List<TenantTransportMessageDTO>> getTop10() {
-    return homePageService.getTop10();
-  }
+    @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 ResponseEntity.ok(homePageService.getHomePageRightInfo(queryMap));
+    }
 
 
-  @GetMapping("left/bottom")
-  @ApiOperation(value = "获取左侧底部信息")
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','CUSTOMER_USER')")
-  public DeferredResult<List<TsValue>> getLeftBottomInfo(
-      @RequestParam(value = "startTs") long startTs,
-      @RequestParam("endTs") long endTs,
-      @RequestParam("interval") long interval,
-      @RequestParam("trend") TrendType trend)
-      throws ThingsboardException {
-    String customerId;
-    if (getCurrentUser().isPtAdmin()) {
-      customerId = getCurrentUser().getCurrentTenantId();
-    } else {
-      customerId = getCurrentUser().getCustomerId().getId().toString();
+    @GetMapping("right/top10")
+    @ApiOperation(value = "获取右侧Top10")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+    public DeferredResult<List<TenantTransportMessageDTO>> getTop10() {
+        return homePageService.getTop10();
     }
     }
-    boolean isCustomer = getCurrentUser().isCustomerUser();
-    if (TrendType.CUSTOMER_MESSAGE_STATISTICAL == trend
-        || TrendType.CUSTOMER_ALARM_STATISTICAL == trend) {
-      if (!isCustomer) {
-        throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-      }
+
+    @GetMapping("left/bottom")
+    @ApiOperation(value = "获取左侧底部信息")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','CUSTOMER_USER')")
+    public DeferredResult<List<TsValue>> getLeftBottomInfo(
+            @RequestParam(value = "startTs") long startTs,
+            @RequestParam("endTs") long endTs,
+            @RequestParam("interval") long interval,
+            @RequestParam("trend") TrendType trend)
+            throws ThingsboardException {
+        String customerId;
+        if (getCurrentUser().isPtAdmin()) {
+            customerId = getCurrentUser().getCurrentTenantId();
+        } else {
+            customerId = getCurrentUser().getCustomerId().getId().toString();
+        }
+        boolean isCustomer = getCurrentUser().isCustomerUser();
+        if (TrendType.CUSTOMER_MESSAGE_STATISTICAL == trend
+                || TrendType.CUSTOMER_ALARM_STATISTICAL == trend) {
+            if (!isCustomer) {
+                throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+            }
+        }
+        if (TrendType.TENANT_TREND == trend || TrendType.CUSTOMER_TREND == trend) {
+            if (isCustomer) {
+                throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+            }
+        }
+        return homePageService.getHomePageLeftBottomInfo(
+                customerId, startTs, endTs, interval, trend, isCustomer);
     }
     }
-    if (TrendType.TENANT_TREND == trend || TrendType.CUSTOMER_TREND == trend) {
-      if (isCustomer) {
-        throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-      }
+
+    @GetMapping("app")
+    @ApiOperation(value = "小程序首页统计信息")
+    public ResponseEntity<HomePageAppDTO> appStatistics()
+            throws ThingsboardException, ExecutionException, InterruptedException {
+        SecurityUser user = getCurrentUser();
+        if(user == null){
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
+        }
+        HomePageAppDTO app = homePageService.app(user.isPtSysadmin(),user.isPtAdmin(),user.isPtTenantAdmin(),user.getTenantId(),user.getCustomerId());
+        return ResponseEntity.ok(app);
     }
     }
-    return homePageService.getHomePageLeftBottomInfo(
-        customerId, startTs, endTs, interval, trend, isCustomer);
-  }
 }
 }

@@ -3,21 +3,22 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+
 @Data
 @Data
-@ApiModel("首页左边顶部信息")
-public class HomePageLeftTopDTO{
-  @ApiModelProperty("顶部设备统计")
-  private HomeDeviceInfoDTO deviceInfo;
+@ApiModel("首页统计信息")
+public class HomePageLeftTopDTO {
+    @ApiModelProperty("设备统计")
+    private HomeDeviceInfoDTO deviceInfo;
 
 
-  @ApiModelProperty("顶部告警统计")
-  private BaseHomePageTop alarmInfo;
+    @ApiModelProperty("告警统计")
+    private BaseHomePageTop alarmInfo;
 
 
-  @ApiModelProperty("顶部租户统计")
-  private BaseHomePageTop tenantInfo;
+    @ApiModelProperty("租户统计")
+    private BaseHomePageTop tenantInfo;
 
 
-  @ApiModelProperty("顶部客户统计")
-  private BaseHomePageTop customerInfo;
+    @ApiModelProperty("客户统计")
+    private BaseHomePageTop customerInfo;
 
 
-  @ApiModelProperty("顶部消息统计")
-  private HomePageTopMessage messageInfo;
+    @ApiModelProperty("消息统计")
+    private HomePageTopMessage messageInfo;
 }
 }

@@ -8,7 +8,7 @@ import java.util.Set;
 
 
 /** for authentication */
 /** for authentication */
 @Data
 @Data
-public class UserDetailsDTO implements Serializable {
+public class UserDetailsDTO extends BaseDTO  implements Serializable {
 
 
   private static final long serialVersionUID = -515966143236266646L;
   private static final long serialVersionUID = -515966143236266646L;
   private String id;
   private String id;

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import lombok.Data;
+
+/**
+ * @Description : 数据聚合统计对象
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Dependency: 依赖包
+ * @Author: junlianglee
+ * @Date Created in 2022/4/14$
+ * @Copyright 2016-2018  - Powered By 李唐源研发中心
+ */
+@Data
+public class AggregationDTO {
+    private String key;
+    private Integer value;
+}

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 告警基础统计信息
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@ApiModel("告警基础统计信息")
+@Data
+public class AlarmStatisticsDTO {
+    @ApiModelProperty("告警总数")
+    private Integer total;
+
+    @ApiModelProperty("未处理告警数量")
+    private Integer activedAlarm;
+
+    @ApiModelProperty("已处理告警数量")
+    private Integer clearedAck;
+
+    @ApiModelProperty("误报告警数量")
+    private Integer clearedUnack;
+
+
+    public AlarmStatisticsDTO(Integer defaultValue) {
+        this.total = defaultValue;
+        this.activedAlarm = defaultValue;
+        this.clearedAck = defaultValue;
+        this.clearedUnack = defaultValue;
+    }
+
+}

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 租户的客户基础统计信息
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@ApiModel("客户基础统计信息")
+@Data
+public class CustomerStatisticsDTO {
+    @ApiModelProperty("客户总数")
+    private Integer total;
+
+    @ApiModelProperty("活跃用户数")
+    private Integer loginUse;
+
+    @ApiModelProperty("禁用或过期客户数量")
+    private Integer cancellation;
+
+    @ApiModelProperty("正常用户")
+    private Integer normal;
+
+
+    public CustomerStatisticsDTO(Integer defaultValue) {
+        this.total = defaultValue;
+        this.loginUse = defaultValue;
+        this.normal = defaultValue;
+        this.cancellation = defaultValue;
+    }
+
+}

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 设备基础统计信息
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@ApiModel("设备基础统计信息")
+@Data
+public class DeviceStatisticsDTO {
+    @ApiModelProperty("设备总数")
+    private Integer total;
+
+    @ApiModelProperty("在线设备数量")
+    private Integer onLine;
+
+    @ApiModelProperty("离线设备数量")
+    private Integer offLine;
+
+    @ApiModelProperty("未激活设备数量")
+    private Integer inActive;
+
+
+    public DeviceStatisticsDTO(Integer defaultValue) {
+        this.total = defaultValue;
+        this.onLine = defaultValue;
+        this.offLine = defaultValue;
+        this.inActive = defaultValue;
+    }
+
+}

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 系统流量基础统计信息
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@ApiModel("流量基础统计信息")
+@Data
+public class FlowStatisticsDTO {
+
+    @ApiModelProperty("收发消息数量")
+    private Integer message;
+
+    @ApiModelProperty("数据点数量")
+    private Integer dataPoints;
+
+
+    public FlowStatisticsDTO(Integer defaultValue) {
+        this.message = defaultValue;
+        this.dataPoints = defaultValue;
+    }
+
+}

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
+import org.thingsboard.server.common.data.yunteng.dto.HomeDeviceInfoDTO;
+import org.thingsboard.server.common.data.yunteng.dto.HomePageTopMessage;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
+
+@Data
+@ApiModel("首页统计信息")
+public class HomePageAppDTO {
+    @ApiModelProperty("租户统计")
+    private TenantStatisticsDTO totalTenant;
+    private TenantStatisticsDTO todayTenant;
+
+    @ApiModelProperty("客户统计")
+    private CustomerStatisticsDTO totalCustomer;
+    private CustomerStatisticsDTO todayCustomer;
+
+    @ApiModelProperty("设备统计")
+    private DeviceStatisticsDTO totalDevice;
+    private DeviceStatisticsDTO todayDevice;
+
+    @ApiModelProperty("告警统计")
+    private AlarmStatisticsDTO totalAlarm;
+    private AlarmStatisticsDTO todayAlarm;
+
+
+    @ApiModelProperty("消息统计")
+    private FlowStatisticsDTO totalMsg;
+    private FlowStatisticsDTO todayMsg;
+}

+package org.thingsboard.server.common.data.yunteng.dto.statistics;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 租户基础统计信息
+ * @Author cxy
+ * @Date 2021/11/24 17:32
+ */
+@ApiModel("租户基础统计信息")
+@Data
+public class TenantStatisticsDTO {
+    @ApiModelProperty("租户总数")
+    private Integer total;
+
+    @ApiModelProperty("过期租户数量")
+    private Integer expired;
+
+    @ApiModelProperty("正常租户数量")
+    private Integer normal;
+
+
+    public TenantStatisticsDTO(Integer defaultValue) {
+        this.total = defaultValue;
+        this.expired = defaultValue;
+        this.normal = defaultValue;
+    }
+
+}

@@ -8,6 +8,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -19,6 +20,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.*;
 import org.thingsboard.server.common.data.query.*;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.statistics.*;
 import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
@@ -27,6 +29,7 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
+import org.thingsboard.server.dao.yunteng.mapper.YtAlarmMapper;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
 import org.thingsboard.server.dao.yunteng.service.HomePageService;
 import org.thingsboard.server.dao.yunteng.service.YtTenantService;
 import org.thingsboard.server.dao.yunteng.service.YtTenantService;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
@@ -38,6 +41,7 @@ import java.time.ZoneOffset;
 import java.util.*;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -58,6 +62,8 @@ public class HomePageServiceImpl implements HomePageService {
 
 
     private final YtUserService ytUserService;
     private final YtUserService ytUserService;
 
 
+    private final YtAlarmMapper ytJpaAarmDao;
+
     @Override
     @Override
     public HomePageLeftTopDTO getHomePageLeftTopInfo(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, String tenantId, String currentUserId) throws ExecutionException, InterruptedException {
     public HomePageLeftTopDTO getHomePageLeftTopInfo(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, String tenantId, String currentUserId) throws ExecutionException, InterruptedException {
         // 如果当前用户是超级管理员或平台管理员，查询所有的设备数量、租户数量、客户数量
         // 如果当前用户是超级管理员或平台管理员，查询所有的设备数量、租户数量、客户数量
@@ -109,6 +115,234 @@ public class HomePageServiceImpl implements HomePageService {
     }
     }
 
 
     @Override
     @Override
+    public HomePageAppDTO app(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId) {
+        /**
+         * 如果当前用户是超级管理员或平台管理员，查询所有的租户数量、客户、设备
+         * 如果当前用户是租户管理员，查询租户下的所有              客户、设备、告警、消息量
+         * 如果当前用户是客户，查询客户可以查看的                       设备、告警、消息量
+         */
+        LocalDateTime nowTime = LocalDateTime.now();
+        LocalDateTime startTime = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MIN);
+        LocalDateTime endTime = LocalDateTime.of(nowTime.toLocalDate(), LocalTime.MAX);
+        EntityId entityId = customerId;
+        if(isPtSysAdmin || isPtAdmin){
+            entityId = null;
+        }else if(isTenantAdmin){
+            entityId = tenantId;
+        }
+
+        Map<String, Object> totalFilter = buildCountFilter(entityId,null,null);
+        Map<String, Object> todayFilter = buildCountFilter(entityId,startTime,endTime);
+
+        HomePageAppDTO app = new HomePageAppDTO();
+        if (isPtSysAdmin || isPtAdmin) {
+            List<TenantDTO> tenants = getTenantInfo();
+            AtomicInteger totalExpired = new AtomicInteger();
+            AtomicInteger totalNormal = new AtomicInteger();
+            int todayAdd = (int) tenants.stream().filter(tenant -> {
+                if(tenant.getTenantExpireTime()==null || tenant.getTenantExpireTime().isAfter(nowTime)){
+                    totalNormal.getAndIncrement();
+                }else{
+                    totalExpired.getAndIncrement();
+                }
+                return tenant.getCreateTime().isAfter(startTime) && tenant.getCreateTime().isBefore(endTime);
+            }).count();
+
+            TenantStatisticsDTO today = new TenantStatisticsDTO(0);
+            today.setTotal(todayAdd);
+            app.setTodayTenant(today);
+
+            TenantStatisticsDTO total = new TenantStatisticsDTO(0);
+            total.setTotal(tenants.size());
+            total.setExpired(totalExpired.get());
+            total.setNormal(totalNormal.get());
+            app.setTotalTenant(total);
+        }
+
+        if (isPtSysAdmin || isPtAdmin || isTenantAdmin) {
+            List<UserDetailsDTO> customers = getCustomerInfo(totalFilter);
+            AtomicInteger totalExpired = new AtomicInteger();
+            AtomicInteger totalNormal = new AtomicInteger();
+            AtomicInteger totalActivity = new AtomicInteger();
+            int todayAdd = (int) customers.stream().filter(customer -> {
+                if(customer.isEnabled()
+                        && (customer.getAccountExpireTime() == null|| customer.getAccountExpireTime().isAfter(nowTime))
+                        && customer.getTenant().isEnabled()
+                        && (customer.getTenant().getTenantExpireTime() == null|| customer.getTenant().getTenantExpireTime().isAfter(nowTime))
+                ){
+                    totalNormal.getAndIncrement();
+                }else{
+                    totalExpired.getAndIncrement();
+                }
+                if(endTime.isAfter(customer.getUpdateTime()) && startTime.isBefore(customer.getUpdateTime())){
+                    totalActivity.incrementAndGet();
+                }
+
+                return customer.getCreateTime().isAfter(startTime) && customer.getCreateTime().isBefore(endTime);
+            }).count();
+
+            CustomerStatisticsDTO today = new CustomerStatisticsDTO(0);
+            today.setTotal(todayAdd);
+            CustomerStatisticsDTO total = new CustomerStatisticsDTO(0);
+            total.setTotal(customers.size());
+            total.setLoginUse(totalActivity.get());
+            total.setNormal(totalNormal.get());
+            total.setCancellation(totalExpired.get());
+            app.setTotalCustomer(total);
+            app.setTodayCustomer(today);
+        }
+
+        if (!isPtSysAdmin && !isPtAdmin ) {
+            app.setTotalAlarm(getAlarmInfo(totalFilter));
+            app.setTodayAlarm(getAlarmInfo(todayFilter));
+        }
+
+        if (!isPtSysAdmin && !isPtAdmin ) {
+            app.setTotalMsg(getFlowStatistics(totalFilter));
+            app.setTodayMsg(getFlowStatistics(todayFilter));
+        }
+
+        List<DeviceDTO> devices = getDeviceInfo(todayFilter);
+        AtomicInteger totalOnline = new AtomicInteger();
+        AtomicInteger totalOffline = new AtomicInteger();
+        AtomicInteger totalinactive = new AtomicInteger();
+        int todayAdd = (int) devices.stream().filter(device -> {
+            switch (device.getDeviceState()){
+                case ONLINE:
+                    totalOnline.incrementAndGet();
+                    break;
+                case OFFLINE:
+                    totalOffline.incrementAndGet();
+                    break;
+                case INACTIVE:
+                    totalinactive.incrementAndGet();
+                    break;
+            }
+
+            return device.getCreateTime().isAfter(startTime) && device.getCreateTime().isBefore(endTime);
+        }).count();
+        DeviceStatisticsDTO today = new DeviceStatisticsDTO(0);
+        today.setTotal(todayAdd);
+        DeviceStatisticsDTO total = new DeviceStatisticsDTO(0);
+        total.setTotal(devices.size());
+        total.setInActive(totalinactive.get());
+        total.setOffLine(totalOffline.get());
+        total.setOnLine(totalOnline.get());
+        app.setTotalDevice(total);
+        app.setTodayDevice(today);
+
+
+        return app;
+    }
+    /**
+     * 获取当前用户权限下的租户信息
+     *
+     * @return
+     */
+    private List<TenantDTO> getTenantInfo() {
+        List<TenantDTO> tenants = tenantService.getAllTenant();
+        return tenants;
+    }
+
+
+
+    /**
+     * 统计数据的过滤参数
+     * @param entityId  实体ID，例如：租户ID、客户ID
+     * @param startTime 数据开始时间
+     * @param endTime   数据结束时间
+     * @return
+     */
+    private Map<String, Object> buildCountFilter(EntityId entityId,LocalDateTime startTime,LocalDateTime endTime){
+        Map<String, Object> filter = new HashMap<>();
+        if(entityId != null){
+            String idStr = entityId.getId().toString();
+            switch (entityId.getEntityType()){
+                case TENANT:
+                    filter.put("tenantId", idStr);
+                    break;
+                case CUSTOMER:
+                    filter.put("customerId", idStr);
+                    break;
+                default:
+            }
+        }
+        if(startTime !=null){
+            filter.put("startTime", startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+        }
+        if(endTime !=null){
+            filter.put("startTime", endTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+        }
+
+        return filter;
+    }
+    /**
+     * 获取当前用户权限下的客户信息
+     *
+     * @return
+     */
+    private List<UserDetailsDTO> getCustomerInfo(Map<String, Object> filter) {
+        List<UserDetailsDTO> userList = userMapper.findCustomers(filter);
+        return userList;
+    }
+    /**
+     * 查询实体ID的设备
+     * @param filter 数据过滤参数
+     * @return
+     */
+    private List<DeviceDTO> getDeviceInfo(Map<String, Object> filter) {
+        List<DeviceDTO> deviceDTOS = deviceMapper.findDevices(filter);;
+        return deviceDTOS;
+    }
+
+    /**
+     * 统计实体的告警信息
+     * @param filter 数据过滤参数
+     * @return
+     */
+    private AlarmStatisticsDTO getAlarmInfo(Map<String, Object> filter) {
+        List<AggregationDTO> alarms = ytJpaAarmDao.countAlarms(filter);
+        AlarmStatisticsDTO statistics = new AlarmStatisticsDTO(0);
+        statistics.setTotal(alarms.size());
+        AtomicInteger totalActived = new AtomicInteger();
+        for(AggregationDTO item:alarms){
+            AlarmStatus status = AlarmStatus.valueOf(item.getKey());
+            switch (status){
+                case CLEARED_UNACK:
+                    statistics.setClearedUnack(item.getValue());
+                    break;
+                case CLEARED_ACK:
+                    statistics.setClearedAck(item.getValue());
+                    break;
+                case ACTIVE_ACK:
+                    totalActived.addAndGet(item.getValue());
+                    break;
+                case ACTIVE_UNACK:
+                    totalActived.addAndGet(item.getValue());
+                    break;
+
+            }
+        }
+        statistics.setActivedAlarm(totalActived.get());
+        return statistics;
+    }
+
+    /**
+     * 获取实体的流量统计信息
+     * @param filter 数据过滤参数
+     * @return
+     */
+    private FlowStatisticsDTO getFlowStatistics(Map<String, Object> filter) {
+        FlowStatisticsDTO flow = new FlowStatisticsDTO(0);
+        flow.setMessage(deviceMapper.countMsgs(filter));
+        flow.setDataPoints(deviceMapper.countDataPoints(filter));
+        return flow;
+    }
+
+
+
+
+    @Override
     public YtPageData<TenantDTO> getHomePageRightInfo(Map<String, Object> queryMap) {
     public YtPageData<TenantDTO> getHomePageRightInfo(Map<String, Object> queryMap) {
         return tenantService.getCurrentMonthExpireTenantPage(queryMap);
         return tenantService.getCurrentMonthExpireTenantPage(queryMap);
     }
     }
@@ -238,40 +472,7 @@ public class HomePageServiceImpl implements HomePageService {
         });
         });
     }
     }
 
 
-    /**
-     * 获取当前用户权限下的租户信息
-     *
-     * @return
-     */
-    private List<TenantDTO> getTenantInfo() {
-        List<TenantDTO> tenants = tenantService.getAllTenant();
-        return tenants;
-    }
 
 
-    /**
-     * 获取当前用户权限下的客户信息
-     *
-     * @return
-     */
-    private List<UserDTO> getCustomerInfo() {
-        List<UserDTO> userList = userMapper.getUserCountByRoleType(RoleEnum.CUSTOMER_USER);
-        return userList;
-    }
-
-    private List<TenantDTO> getApiUsageInfo() {
-        List<TenantDTO> tenants = tenantService.getAllTenant();
-        return tenants;
-    }
-
-    private List<TenantDTO> getDeviceInfo() {
-        List<TenantDTO> tenants = tenantService.getAllTenant();
-        return tenants;
-    }
-
-    private List<TenantDTO> getAlarmInfo() {
-        List<TenantDTO> tenants = tenantService.getAllTenant();
-        return tenants;
-    }
 
 
     /**
     /**
      * 设置租户返回信息
      * 设置租户返回信息
@@ -522,4 +723,5 @@ public class HomePageServiceImpl implements HomePageService {
         }
         }
         return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(value)));
         return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(value)));
     }
     }
+
 }
 }

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 
 
 import java.util.List;
 import java.util.List;
@@ -78,4 +79,9 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
       @Param("customerId") String customerId,
       @Param("customerId") String customerId,
       @Param("startTime") Long startTime,
       @Param("startTime") Long startTime,
       @Param("endTime") Long endTime);
       @Param("endTime") Long endTime);
+
+
+  Integer countMsgs(@Param("queryMap") Map<String, Object> queryMap);
+
+  Integer countDataPoints(@Param("queryMap") Map<String, Object> queryMap);
 }
 }

@@ -44,4 +44,6 @@ public interface UserMapper extends BaseMapper<User> {
   List<UserDTO> findUsersAsyncByTs(@Param("startTs") String startTs, @Param("endTs") String endTs);
   List<UserDTO> findUsersAsyncByTs(@Param("startTs") String startTs, @Param("endTs") String endTs);
 
 
   String findCustomerIdByUserId(@Param("id") String id);
   String findCustomerIdByUserId(@Param("id") String id);
+
+  List<UserDetailsDTO> findCustomers(@Param("queryMap") Map<String, Object> queryMap);
 }
 }

@@ -8,17 +8,16 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.Menu;
 import org.thingsboard.server.dao.yunteng.entities.Menu;
 import org.thingsboard.server.dao.yunteng.entities.SysDict;
 import org.thingsboard.server.dao.yunteng.entities.SysDict;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtAlarmEntity;
 
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 
 @Mapper
 @Mapper
 public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
 public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
@@ -37,4 +36,5 @@ public interface YtAlarmMapper extends BaseMapper<YtAlarmEntity> {
           );
           );
 
 
     List<SysDict> alarmType(@Param("tenantId") UUID tenantId);
     List<SysDict> alarmType(@Param("tenantId") UUID tenantId);
+    List<AggregationDTO> countAlarms(@Param("queryMap") Map<String, Object> queryMap);
 }
 }

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
 import org.springframework.web.context.request.async.DeferredResult;
 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.id.TenantId;
 import org.thingsboard.server.common.data.query.TsValue;
 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.HomePageLeftTopDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 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.TenantTransportMessageDTO;
+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.enums.TrendType;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
 
@@ -15,58 +17,71 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutionException;
 
 
 public interface HomePageService {
 public interface HomePageService {
-  /**
-   * 通过租户ID获取首页左边顶部信息
-   *
-   * @param isPtSysAdmin 是否超级管理员
-   * @param isPtAdmin 是否平台管理员
-   * @param isTenantAdmin 是否租户管理员
-   * @param tenantId 租户ID
-   * @param currentUserId 当前用户ID
-   * @return 首页左边顶部信息
-   */
-  HomePageLeftTopDTO getHomePageLeftTopInfo(
-      boolean isPtSysAdmin,
-      boolean isPtAdmin,
-      boolean isTenantAdmin,
-      String tenantId,
-      String currentUserId)
-      throws ExecutionException, InterruptedException;
+    /**
+     * 通过租户ID获取首页左边顶部信息
+     *
+     * @param isPtSysAdmin  是否超级管理员
+     * @param isPtAdmin     是否平台管理员
+     * @param isTenantAdmin 是否租户管理员
+     * @param tenantId      租户ID
+     * @param currentUserId 当前用户ID
+     * @return 首页左边顶部信息
+     */
+    HomePageLeftTopDTO getHomePageLeftTopInfo(
+            boolean isPtSysAdmin,
+            boolean isPtAdmin,
+            boolean isTenantAdmin,
+            String tenantId,
+            String currentUserId)
+            throws ExecutionException, InterruptedException;
 
 
-  /**
-   * 获取首页右侧信息
-   *
-   * @param queryMap 查询条件
-   * @return 右侧信息
-   */
-  YtPageData<TenantDTO> getHomePageRightInfo(Map<String, Object> queryMap);
+    /**
+     * 获取首页右侧信息
+     *
+     * @param queryMap 查询条件
+     * @return 右侧信息
+     */
+    YtPageData<TenantDTO> getHomePageRightInfo(Map<String, Object> queryMap);
 
 
-  /**
-   * 获取首页左侧底部信息
-   *
-   * @param startTs 开始时间
-   * @param endTs 结束时间
-   * @param interval 时间间隔
-   * @param trend 趋势类型
-   * @return 左侧底部信息
-   */
-  DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
-      String customerId, long startTs, long endTs, long interval, TrendType trend,boolean isCustomer);
+    /**
+     * 获取首页左侧底部信息
+     *
+     * @param startTs  开始时间
+     * @param endTs    结束时间
+     * @param interval 时间间隔
+     * @param trend    趋势类型
+     * @return 左侧底部信息
+     */
+    DeferredResult<List<TsValue>> getHomePageLeftBottomInfo(
+            String customerId, long startTs, long endTs, long interval, TrendType trend, boolean isCustomer);
 
 
-  /**
-   * 获取首页TOP10
-   *
-   * @return top10
-   */
-  DeferredResult<List<TenantTransportMessageDTO>> getTop10();
+    /**
+     * 获取首页TOP10
+     *
+     * @return top10
+     */
+    DeferredResult<List<TenantTransportMessageDTO>> getTop10();
 
 
-  /**
-   * 获取租户的传输信息
-   *
-   * @param tenantId 租户ID
-   * @param tenantName 租户姓名
-   * @return 传输信息
-   */
-  CompletableFuture<TenantTransportMessageDTO> getTransportMessageByTenantId(
-      TenantId tenantId, String tenantName);
+    /**
+     * 获取租户的传输信息
+     *
+     * @param tenantId   租户ID
+     * @param tenantName 租户姓名
+     * @return 传输信息
+     */
+    CompletableFuture<TenantTransportMessageDTO> getTransportMessageByTenantId(
+            TenantId tenantId, String tenantName);
+
+    /**
+     * app首页统计信息
+     * @param isPtSysAdmin
+     * @param isPtAdmin
+     * @param isTenantAdmin
+     * @param tenantId
+     * @param customerId
+     * @return
+     */
+    HomePageAppDTO app(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId);
 }
 }
+
+

@@ -280,4 +280,42 @@
          < #{endTime}
          < #{endTime}
           AND originator_type = 5;
           AND originator_type = 5;
     </select>
     </select>
+
+    <select id="countMsgs" resultType="int">
+        SELECT COUNT(1) FROM ts_kv v LEFT JOIN device d ON d.id = v.entity_id
+        <where>
+            1=1
+            <if test="queryMap.tenantId !=null">
+                AND d.tenant_id= #{queryMap.tenantId}::uuid
+            </if>
+            <if test="queryMap.customerId !=null">
+                AND d.customer_id= #{queryMap.customerId}::uuid
+            </if>
+            <if test="queryMap.startTime !=null">
+                AND v.ts >= #{queryMap.startTime}
+            </if>
+            <if test="queryMap.endTime !=null">
+                AND v.ts &lt; #{queryMap.endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="countDataPoints" resultType="int">
+        SELECT COUNT(DISTINCT v.key) FROM ts_kv v LEFT JOIN device d ON d.id = v.entity_id
+        <where>
+            1=1
+            <if test="queryMap.tenantId !=null">
+                AND tenant_id= #{queryMap.tenantId}::uuid
+            </if>
+            <if test="queryMap.customerId !=null">
+                AND customer_id= #{queryMap.customerId}::uuid
+            </if>
+            <if test="queryMap.startTime !=null">
+                AND ts >= #{queryMap.startTime}
+            </if>
+            <if test="queryMap.endTime !=null">
+                AND ts &lt; #{queryMap.endTime}
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>

@@ -8,6 +8,8 @@
         <result property="password" column="password"/>
         <result property="password" column="password"/>
         <result property="enabled" column="enabled"/>
         <result property="enabled" column="enabled"/>
         <result property="accountExpireTime" column="account_expire_time"/>
         <result property="accountExpireTime" column="account_expire_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
         <association property="tenant" javaType="org.thingsboard.server.common.data.yunteng.dto.TenantDTO">
         <association property="tenant" javaType="org.thingsboard.server.common.data.yunteng.dto.TenantDTO">
             <result column="tenant_name" property="name"/>
             <result column="tenant_name" property="name"/>
             <result column="tenant_id" property="tenantId"/>
             <result column="tenant_id" property="tenantId"/>
@@ -207,4 +209,27 @@
     <select id="findCustomerIdByUserId" resultType="java.lang.String">
     <select id="findCustomerIdByUserId" resultType="java.lang.String">
         SELECT tu.customer_id FROM sys_user su LEFT JOIN tb_user tu ON su.tb_user = tu.id::TEXT WHERE su.id = #{id}
         SELECT tu.customer_id FROM sys_user su LEFT JOIN tb_user tu ON su.tb_user = tu.id::TEXT WHERE su.id = #{id}
     </select>
     </select>
+
+
+    <select id="findCustomers" resultMap="userDetailsMap">
+        SELECT u.enabled,u.account_expire_time,u.create_time
+             ,t.enabled as tenant_enabled,t.tenant_expire_time  as tenant_expire_time
+             ,al.update_time FROM sys_user u
+        LEFT JOIN sys_tenant t ON u.tenant_id = t.tenant_id
+        LEFT JOIN sys_user_role r ON u.id = r.user_id
+        LEFT JOIN  sys_role ro ON ro.id = r.role_id
+        LEFT JOIN  (SELECT MAX(to_timestamp(created_time/1000)::TIMESTAMP)update_time, entity_id FROM audit_log  GROUP BY entity_id)al  ON al.entity_id = u.tb_user::uuid
+        <where>
+            ro.role_type = 'CUSTOMER_USER'
+            <if test="queryMap.tenantId !=null">
+                AND u.tenant_id= #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.startTime !=null">
+                AND u.create_time >= #{queryMap.startTime}
+            </if>
+            <if test="queryMap.endTime !=null">
+                AND u.create_time &lt; #{queryMap.endTime}
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>

@@ -27,6 +27,11 @@
         <result property="dictCode" column="dict_code"/>
         <result property="dictCode" column="dict_code"/>
     </resultMap>
     </resultMap>
 
 
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO" id="aggregationMap">
+        <result property="key" column="status"/>
+        <result property="value" column="value"/>
+    </resultMap>
+
 
 
     <select id="alarmPage" resultMap="alarmInfo">
     <select id="alarmPage" resultMap="alarmInfo">
         SELECT d.name AS device_name,d.id device_id,m.*
         SELECT d.name AS device_name,d.id device_id,m.*
@@ -73,4 +78,23 @@
         </where>
         </where>
     </select>
     </select>
 
 
+    <select id="countAlarms" resultMap="aggregationMap">
+        SELECT status ,COUNT(id) AS value FROM alarm
+        <where>
+            1=1
+            <if test="queryMap.tenantId !=null">
+                AND tenant_id= #{queryMap.tenantId}::uuid
+            </if>
+            <if test="queryMap.customerId !=null">
+                AND customer_id= #{queryMap.customerId}::uuid
+            </if>
+            <if test="queryMap.startTime !=null">
+                AND created_time >= #{queryMap.startTime}
+            </if>
+            <if test="queryMap.endTime !=null">
+                AND created_time &lt;  #{queryMap.endTime}
+            </if>
+        </where>
+        GROUP BY status;
+    </select>
 </mapper>
 </mapper>