fix: homepage add statistics for device type and Off-line rate

@@ -17,6 +17,15 @@ public class HomeDeviceInfoDTO {
   @ApiModelProperty("未激活设备数量")
   private Integer inActive;
 
+  @ApiModelProperty("未激活设备数量")
+  private Integer gateWay;
+
+  @ApiModelProperty("未激活设备数量")
+  private Integer directConnection;
+
+  @ApiModelProperty("未激活设备数量")
+  private Integer sensor;
+
   @ApiModelProperty("今日新增设备数量")
   private Integer todayAdd;
 
@@ -26,6 +35,8 @@ public class HomeDeviceInfoDTO {
     this.offLine = defaultValue;
     this.inActive = defaultValue;
     this.todayAdd = defaultValue;
+    this.gateWay = defaultValue;
+    this.directConnection = defaultValue;
+    this.sensor = defaultValue;
   }
-
 }

@@ -42,6 +42,7 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Service
@@ -145,7 +146,7 @@ public class TkHomePageServiceImpl implements HomePageService {
         }
 
         if (isPtSysAdmin || isPtAdmin) {
-            List<TenantDTO> tenants = getTenantInfo();
+            List<TenantDTO> tenants = tenantService.getAllTenant();
             AtomicInteger totalExpired = new AtomicInteger();
             AtomicInteger totalNormal = new AtomicInteger();
             int todayAdd = (int) tenants.stream().filter(tenant -> {
@@ -240,24 +241,12 @@ public class TkHomePageServiceImpl implements HomePageService {
 
         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<>();
@@ -285,26 +274,21 @@ public class TkHomePageServiceImpl implements HomePageService {
     /**
      * 获取当前用户权限下的客户信息
      *
-     * @return
      */
     private List<UserDetailsDTO> getCustomerInfo(Map<String, Object> filter) {
-        List<UserDetailsDTO> userList = userMapper.findCustomers(filter);
-        return userList;
+        return userMapper.findCustomers(filter);
     }
     /**
      * 查询实体ID的设备
      * @param filter 数据过滤参数
-     * @return
      */
     private List<DeviceDTO> getDeviceInfo(Map<String, Object> filter) {
-        List<DeviceDTO> deviceDTOS = deviceMapper.findDevices(filter);;
-        return deviceDTOS;
+        return deviceMapper.findDevices(filter);
     }
 
     /**
      * 统计实体的告警信息
      * @param filter 数据过滤参数
-     * @return
      */
     private AlarmStatisticsDTO getAlarmInfo(Map<String, Object> filter) {
         List<AggregationDTO> alarms = ytJpaAarmDao.countAlarms(filter);
@@ -338,7 +322,6 @@ public class TkHomePageServiceImpl implements HomePageService {
     /**
      * 获取实体的流量统计信息
      * @param filter 数据过滤参数
-     * @return
      */
     private FlowStatisticsDTO getFlowStatistics(Map<String, Object> filter) {
         FlowStatisticsDTO flow = new FlowStatisticsDTO(0);
@@ -457,14 +440,18 @@ public class TkHomePageServiceImpl implements HomePageService {
      */
     private void setDeviceInfoData(List<DeviceDTO> deviceList, HomeDeviceInfoDTO homeDeviceInfoDTO) {
         homeDeviceInfoDTO.setSumCount(deviceList.size());
-        deviceList.forEach(ytDevice -> {
+        int defaultValue = FastIotConstants.MagicNumber.ZERO;
+        AtomicReference<Integer> gateWay= new AtomicReference<>(defaultValue);
+        AtomicReference<Integer> directConnection= new AtomicReference<>(defaultValue);
+        AtomicReference<Integer> sensor= new AtomicReference<>(defaultValue);
+        deviceList.forEach(device -> {
             int basicNum = FastIotConstants.MagicNumber.ONE;
             ZoneOffset zoneOffset = ZoneOffset.of("+8");
             LocalDateTime todayZeroTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
-            if (ytDevice.getCreateTime().atZone(zoneOffset).toInstant().toEpochMilli() >= todayZeroTime.toInstant(zoneOffset).toEpochMilli()) {
+            if (device.getCreateTime().atZone(zoneOffset).toInstant().toEpochMilli() >= todayZeroTime.toInstant(zoneOffset).toEpochMilli()) {
                 homeDeviceInfoDTO.setTodayAdd(homeDeviceInfoDTO.getTodayAdd() + basicNum);
             }
-            switch (ytDevice.getDeviceState()) {
+            switch (device.getDeviceState()) {
                 case OFFLINE:
                     homeDeviceInfoDTO.setOffLine(homeDeviceInfoDTO.getOffLine() + basicNum);
                     break;
@@ -477,7 +464,23 @@ public class TkHomePageServiceImpl implements HomePageService {
                 default:
                     break;
             }
+            switch (device.getDeviceType()){
+                case GATEWAY:
+                    gateWay.getAndSet(gateWay.get() + 1);
+                    break;
+                case DIRECT_CONNECTION:
+                    directConnection.getAndSet(directConnection.get()+1);
+                    break;
+                case SENSOR:
+                    sensor.getAndSet(sensor.get()+1);
+                    break;
+                default:
+                    break;
+            }
         });
+        homeDeviceInfoDTO.setGateWay(gateWay.get());
+        homeDeviceInfoDTO.setDirectConnection(directConnection.get());
+        homeDeviceInfoDTO.setSensor(sensor.get());
     }
 
 

@@ -181,6 +181,7 @@
         ifd.tenant_id,
         ifd.organization_id,
         ifd.create_time,
+        ifd.device_type,
         ifdp.NAME AS profile_name,
         io.NAME AS organization_name,
         A.bool_v status,