修改为分页查询

iot-module/iot-module-data/iot-module-data-api/src/main/java/com/middle/platform/data/api/constant/TopicType.java

@@ -5,7 +5,7 @@ package com.middle.platform.data.api.constant;
  * @date 2023-12-22 16:22:37
  */
 public interface TopicType {
-    Integer PUB = 1;
-    Integer SUB = 2;
-    Integer BOTH = 3;
+    String PUB = "1";
+    String SUB = "2";
+    String BOTH = "3";
 }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/controller/RealTimeMonitoringController.java

@@ -3,7 +3,6 @@ package com.middle.platform.manage.biz.controller;
 import com.middle.platform.common.utils.Result;
 import com.middle.platform.manage.biz.domain.req.TypeStatisticsReq;
 import com.middle.platform.manage.biz.domain.vo.TotalStatisticsVo;
-import com.middle.platform.manage.biz.domain.vo.TypeStatisticsVo;
 import com.middle.platform.manage.biz.service.RealTimeMonitoringService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -12,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @author Aick Spt
  * @date 2023-12-24 16:26
@@ -39,7 +36,7 @@ public class RealTimeMonitoringController {
      * 分类统计
      */
     @PostMapping("/typeStatistics")
-    public Result<List<TypeStatisticsVo>> typeStatistics(@RequestBody @Validated TypeStatisticsReq typeStatisticsReq) {
+    public Result<Object> typeStatistics(@RequestBody @Validated TypeStatisticsReq typeStatisticsReq) {
         return Result.ok(realTimeMonitoringService.typeStatistics(typeStatisticsReq));
     }
 

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/req/TypeStatisticsReq.java

@@ -1,7 +1,6 @@
 package com.middle.platform.manage.biz.domain.req;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import com.middle.platform.common.modle.BasePara;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +11,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class TypeStatisticsReq {
+public class TypeStatisticsReq extends BasePara {
 
     /**
      * 产品ID

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/RealTimeMonitoringService.java

@@ -1,15 +1,17 @@
 package com.middle.platform.manage.biz.service;
 
 import cn.hutool.core.collection.CollUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.middle.platform.manage.biz.domain.req.TypeStatisticsReq;
 import com.middle.platform.manage.biz.domain.vo.TotalStatisticsVo;
 import com.middle.platform.manage.biz.domain.vo.TypeStatisticsVo;
 import com.middle.platform.manage.biz.mapper.IotDeviceMapper;
 import com.middle.platform.manage.biz.mapper.IotProductMapper;
+import com.middle.platform.pagehelper.core.PageRes;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -46,12 +48,14 @@ public class RealTimeMonitoringService {
     /**
      * 分类统计
      */
-    public List<TypeStatisticsVo> typeStatistics(TypeStatisticsReq typeStatisticsReq) {
+    public Object typeStatistics(TypeStatisticsReq typeStatisticsReq) {
+        PageHelper.startPage(typeStatisticsReq.getPage(), typeStatisticsReq.getPageSize());
         List<TypeStatisticsVo> typeStatisticsVos = iotDeviceMapper.queryTypeStatistics(typeStatisticsReq);
+        PageInfo<TypeStatisticsVo> pageInfo = new PageInfo<>(typeStatisticsVos);
         if (CollUtil.isEmpty(typeStatisticsVos)) {
-            return new ArrayList<>();
+            return new PageRes<>();
         }
         typeStatisticsVos.forEach(e -> e.setStatusName(e.getStatus().equals(1) ? "在线" : "离线"));
-        return typeStatisticsVos;
+        return new PageRes<>(pageInfo, typeStatisticsVos);
     }
 }