fix: 获取统计信息

1、登录时只取告警数据
2、首页获取全部数据

@@ -2,14 +2,12 @@ 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 io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.query.TsValue;
@@ -18,6 +16,7 @@ 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.dto.statistics.HomePageAppDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 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;
@@ -103,13 +102,13 @@ public class HomePageController extends BaseController {
 
 
     @GetMapping("app")
     @GetMapping("app")
     @ApiOperation(value = "小程序首页统计信息")
     @ApiOperation(value = "小程序首页统计信息")
-    public ResponseEntity<HomePageAppDTO> appStatistics()
+    public ResponseEntity<HomePageAppDTO> appStatistics(@ApiParam(value = "只取告警数据") @RequestParam("login") Boolean login)
             throws ThingsboardException, ExecutionException, InterruptedException {
             throws ThingsboardException, ExecutionException, InterruptedException {
         SecurityUser user = getCurrentUser();
         SecurityUser user = getCurrentUser();
         if(user == null){
         if(user == null){
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
         }
         }
-        HomePageAppDTO app = homePageService.app(user.isPtSysadmin(),user.isPtAdmin(),user.isPtTenantAdmin(),user.getTenantId(),user.getCustomerId());
+        HomePageAppDTO app = homePageService.app(login,user.isPtSysadmin(),user.isPtAdmin(),user.isPtTenantAdmin(),user.getTenantId(),user.getCustomerId());
         return ResponseEntity.ok(app);
         return ResponseEntity.ok(app);
     }
     }
 }
 }

@@ -115,7 +115,7 @@ public class HomePageServiceImpl implements HomePageService {
     }
     }
 
 
     @Override
     @Override
-    public HomePageAppDTO app(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId) {
+    public HomePageAppDTO app(Boolean login,boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId) {
         /**
         /**
          * 如果当前用户是超级管理员或平台管理员，查询所有的租户数量、客户、设备
          * 如果当前用户是超级管理员或平台管理员，查询所有的租户数量、客户、设备
          * 如果当前用户是租户管理员，查询租户下的所有              客户、设备、告警、消息量
          * 如果当前用户是租户管理员，查询租户下的所有              客户、设备、告警、消息量
@@ -135,6 +135,15 @@ public class HomePageServiceImpl implements HomePageService {
         Map<String, Object> todayFilter = buildCountFilter(entityId,startTime,endTime);
         Map<String, Object> todayFilter = buildCountFilter(entityId,startTime,endTime);
 
 
         HomePageAppDTO app = new HomePageAppDTO();
         HomePageAppDTO app = new HomePageAppDTO();
+
+        if (!isPtSysAdmin && !isPtAdmin ) {
+            app.setTotalAlarm(getAlarmInfo(totalFilter));
+            app.setTodayAlarm(getAlarmInfo(todayFilter));
+        }
+        if(login){
+            return app;
+        }
+
         if (isPtSysAdmin || isPtAdmin) {
         if (isPtSysAdmin || isPtAdmin) {
             List<TenantDTO> tenants = getTenantInfo();
             List<TenantDTO> tenants = getTenantInfo();
             AtomicInteger totalExpired = new AtomicInteger();
             AtomicInteger totalExpired = new AtomicInteger();
@@ -192,10 +201,7 @@ public class HomePageServiceImpl implements HomePageService {
             app.setTodayCustomer(today);
             app.setTodayCustomer(today);
         }
         }
 
 
-        if (!isPtSysAdmin && !isPtAdmin ) {
-            app.setTotalAlarm(getAlarmInfo(totalFilter));
-            app.setTodayAlarm(getAlarmInfo(todayFilter));
-        }
+
 
 
         if (!isPtSysAdmin && !isPtAdmin ) {
         if (!isPtSysAdmin && !isPtAdmin ) {
             app.setTotalMsg(getFlowStatistics(totalFilter));
             app.setTotalMsg(getFlowStatistics(totalFilter));

@@ -81,7 +81,7 @@ public interface HomePageService {
      * @param customerId
      * @param customerId
      * @return
      * @return
      */
      */
-    HomePageAppDTO app(boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId);
+    HomePageAppDTO app(Boolean login,boolean isPtSysAdmin, boolean isPtAdmin, boolean isTenantAdmin, EntityId tenantId, EntityId customerId);
 }
 }