From da9e1c0e9859af399a4d46eb37a3d5e0c187b744 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Mon, 22 May 2023 16:25:26 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E6=9A=82=E6=80=81=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/device/pq/pojo/vo/EventListVO.java | 2 +- .../njcn/event/mapper/majornetwork/LargeScreenMapper.java | 2 +- .../service/majornetwork/Impl/LargeScreenServiceImpl.java | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java index 4be42d7fb..ba691c9ee 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/EventListVO.java @@ -26,5 +26,5 @@ public class EventListVO implements Serializable { * 总次数 */ @ApiModelProperty("总次数") - private Integer size; + private Long size; } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java index d86b722ca..e078d276b 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/LargeScreenMapper.java @@ -32,7 +32,7 @@ public interface LargeScreenMapper { Map getDownCount (@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); - List getMiddleDown (Page page,@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + Page getMiddleDown (Page page,@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); List getMiddleDownChind (@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index 138ff243a..e3742cf6d 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -368,12 +368,10 @@ public class LargeScreenServiceImpl implements LargeScreenService { List generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); //获取所有监测点集合 List lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); - List eventVOS = largeScreenMapper.getMiddleDown(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); - //获取没分页前的总数据 - List chind = largeScreenMapper.getMiddleDownChind(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + Page eventVOS = largeScreenMapper.getMiddleDown(new Page<>(largeScreenParam.getPageNum(), largeScreenParam.getPageSize()), lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); EventListVO listVO = new EventListVO(); - listVO.setList(eventVOS); - listVO.setSize(chind.size()); + listVO.setList(eventVOS.getRecords()); + listVO.setSize(eventVOS.getTotal()); return listVO; }