From a809b91000d6707606dc0d4fe39ec13d208a29e4 Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Fri, 28 Apr 2023 09:02:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?device=E7=9A=84pom=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BApms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index 03e054944..b79815acc 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,17 +19,17 @@ - + - + com.njcn From ff7db51a040931fff24c09b602e4a0ee51cbc78f Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Fri, 28 Apr 2023 09:10:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?device=E6=A8=A1=E5=9D=97=E7=9A=84pom?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BApq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index b79815acc..03e054944 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,17 +19,17 @@ - + - + com.njcn From bdb67d068ebef87aac777d899d8f5db9536fdba7 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 28 Apr 2023 09:43:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?zbj//1.=E6=9A=82=E6=80=81=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=20=E4=B8=AD=E6=96=AD=E6=AC=A1=E6=95=B0=E7=BB=9F=E8=AE=A1=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/majornetwork/ReportMapper.java | 20 +++++++++++++ .../majornetwork/mapping/ReportMapper.xml | 25 +++++++++++++++++ .../majornetwork/Impl/ReportServiceImpl.java | 28 ++++++++++++++++--- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/ReportMapper.java create mode 100644 pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/ReportMapper.xml diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/ReportMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/ReportMapper.java new file mode 100644 index 000000000..05a55920b --- /dev/null +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/ReportMapper.java @@ -0,0 +1,20 @@ +package com.njcn.event.mapper.majornetwork; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.event.pojo.param.WaveTypeParam; +import com.njcn.event.pojo.vo.DetailVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 暂态报告 + * + * @author zbj + * @date 2023/04/28 + */ +@Mapper +public interface ReportMapper { + List getBreakTimes(Page page, @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/mapper/majornetwork/mapping/ReportMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/ReportMapper.xml new file mode 100644 index 000000000..a3848b735 --- /dev/null +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/ReportMapper.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 98db44ae0..5762c8a0f 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -40,6 +40,7 @@ import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.event.enums.EventResponseEnum; +import com.njcn.event.mapper.majornetwork.ReportMapper; import com.njcn.event.pojo.constant.Param; import com.njcn.event.pojo.param.*; import com.njcn.event.pojo.po.EventDetail; @@ -137,6 +138,8 @@ public class ReportServiceImpl implements ReportService { private final FreemarkerUtil freemarkerUtil; + private final ReportMapper reportMapper; + public List getED(DeviceInfoParam.BusinessParam businessParam) { List info = new ArrayList<>(); List deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData(); @@ -627,11 +630,15 @@ public class ReportServiceImpl implements ReportService { if (CollectionUtil.isEmpty(lineIds)) { throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY); } - Page pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper() + + List detailVO = reportMapper.getBreakTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); + + /* Page pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper() .in(RmpEventDetailPO::getMeasurementPointId, lineIds) .ge(StringUtils.isNotBlank(waveTypeParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(waveTypeParam.getSearchBeginTime()))) .le(StringUtils.isNotBlank(waveTypeParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(waveTypeParam.getSearchEndTime()))) ); + List info =BeanUtil.copyToList(pageInfo.getRecords(),EventDetailNew.class); HashMap countMap = new HashMap<>(); for (EventDetailNew eventDetail : info) { @@ -650,10 +657,16 @@ public class ReportServiceImpl implements ReportService { BeanUtils.copyProperties(eventDetail, vo); result.add(vo); idlist.add(eventDetail.getLineId()); + }*/ + + //id集合 + ArrayList idlist = new ArrayList<>(); + for (DetailVO vo : detailVO) { + idlist.add(vo.getLineId()); } HttpResult> AreaInfo = lineFeignClient.getBaseLineAreaInfo(idlist); List data = AreaInfo.getData(); - for (DetailVO detailVO : result) { + /* for (DetailVO detailVO : result) { for (AreaLineInfoVO vo : data) { if (vo.getLineId().equals(detailVO.getLineId())) { BeanUtils.copyProperties(vo, detailVO); @@ -664,9 +677,16 @@ public class ReportServiceImpl implements ReportService { detailVO.setTimes(countMap.get(s)); } } + }*/ + for (DetailVO v : detailVO) { + for (AreaLineInfoVO vo : data) { + if (vo.getLineId().equals(v.getLineId())) { + BeanUtils.copyProperties(vo, v); + } + } } - Page page = BeanUtil.copyProperties(pageInfo,Page.class); - page.setRecords(result); + Page page = BeanUtil.copyProperties(detailVO,Page.class); + page.setRecords(detailVO); return page; From 8b65ad0c8a2431ab63d2c0b9b0576677a014af9c Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Fri, 28 Apr 2023 09:48:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index 03e054944..b79815acc 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,17 +19,17 @@ - + - + com.njcn From bdf202916253a6f074384e7ba9a166ce746ce324 Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Fri, 28 Apr 2023 09:58:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BApq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index b79815acc..03e054944 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,17 +19,17 @@ - + - + com.njcn