修改bug

server-module/src/main/java/com/makeit/module/controller/dataScreen/DataScreenController.java

 package com.makeit.module.controller.dataScreen;
 package com.makeit.module.controller.dataScreen;
 
 
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
 import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
+import com.makeit.dto.platform.space.PlatBedQueryDTO;
 import com.makeit.module.system.entity.ChinaArea;
 import com.makeit.module.system.entity.ChinaArea;
 import com.makeit.service.platform.dataScreen.DataScreenService;
 import com.makeit.service.platform.dataScreen.DataScreenService;
 import com.makeit.utils.area.ChinaAreaVO;
 import com.makeit.utils.area.ChinaAreaVO;
 import com.makeit.vo.platform.dataScreen.*;
 import com.makeit.vo.platform.dataScreen.*;
+import com.makeit.vo.platform.space.PlatBedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +59,12 @@ public class DataScreenController {
         return ApiResponseUtils.success(dataScreenService.alarmStatistics(dto));
         return ApiResponseUtils.success(dataScreenService.alarmStatistics(dto));
     }
     }
 
 
+    @ApiOperation("实时告警分页列表")
+    @PostMapping("alarmPage")
+    public ApiResponseEntity<PageVO<PlatAlarmStatisticsListVo>> alarmPage(@RequestBody PageReqDTO<PlatDataScreenQueryDTO> page) {
+        return ApiResponseUtils.success(dataScreenService.alarmPage(page));
+    }
+
     @ApiOperation("机构养老-基础数据统计")
     @ApiOperation("机构养老-基础数据统计")
     @PostMapping("baseInfoStatistics")
     @PostMapping("baseInfoStatistics")
     public ApiResponseEntity<PlatBaseInfoStatisticsVO> baseInfoStatistics(@RequestBody PlatDataScreenQueryDTO dto) {
     public ApiResponseEntity<PlatBaseInfoStatisticsVO> baseInfoStatistics(@RequestBody PlatDataScreenQueryDTO dto) {

server-service/src/main/java/com/makeit/service/platform/dataScreen/DataScreenService.java

 package com.makeit.service.platform.dataScreen;
 package com.makeit.service.platform.dataScreen;
 
 
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
 import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
 import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
 import com.makeit.utils.area.ChinaAreaVO;
 import com.makeit.utils.area.ChinaAreaVO;
 import com.makeit.vo.platform.dataScreen.*;
 import com.makeit.vo.platform.dataScreen.*;
@@ -26,4 +28,6 @@ public interface DataScreenService {
     List<PlatMapStatisticsVO> mapStatistics(PlatDataScreenQueryDTO dto);
     List<PlatMapStatisticsVO> mapStatistics(PlatDataScreenQueryDTO dto);
 
 
     List<ChinaAreaVO> mapList(PlatDataScreenQueryDTO dto);
     List<ChinaAreaVO> mapList(PlatDataScreenQueryDTO dto);
+
+    PageVO<PlatAlarmStatisticsListVo> alarmPage(PageReqDTO<PlatDataScreenQueryDTO> page);
 }
 }

server-service/src/main/java/com/makeit/vo/platform/dataScreen/PlatAlarmStatisticsVO.java

@@ -23,6 +23,6 @@ public class PlatAlarmStatisticsVO {
     @ApiModelProperty(value = "待处理数")
     @ApiModelProperty(value = "待处理数")
     private Long unhandledNumber;
     private Long unhandledNumber;
 
 
-    private List<PlatAlarmStatisticsListVo> list;
+//    private List<PlatAlarmStatisticsListVo> list;
 
 
 }
 }