From c8d766e8addc8cbac8753147959e6b74a019457c Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Fri, 28 Apr 2023 11:34:21 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E6=9A=82=E6=80=81=E6=8A=A5=E5=91=8A=20?= =?UTF-8?q?=E6=9A=82=E9=99=8D/=E6=9A=82=E5=8D=87/=E4=B8=AD=E6=96=AD=20?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/majornetwork/ReportMapper.java | 6 ++-- .../majornetwork/mapping/ReportMapper.xml | 9 ++---- .../majornetwork/Impl/ReportServiceImpl.java | 32 +++++++------------ 3 files changed, 18 insertions(+), 29 deletions(-) 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 index a54f75031..8919764cc 100644 --- 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 @@ -17,9 +17,9 @@ import java.util.List; @Mapper public interface ReportMapper { - List getBreakTimes(Page page, @Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + Page getBreakTimes(Page page, @Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("dictdata") String dictdata); - List getUpTimes(Page page, @Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + Page getUpTimes(Page page, @Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("dictdata") String dictdata); - List getSagTimes(Page page, @Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + Page getSagTimes(Page page, @Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("dictdata") String dictdata); } 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 index d7762b42f..4a7a318f7 100644 --- 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 @@ -7,7 +7,6 @@ rmed.measurement_point_id lineId, count(*) times FROM r_mp_event_detail rmed - left join sys_dict_data sdd on sdd.id = rmed.event_type WHERE rmed.measurement_point_id IN @@ -19,7 +18,7 @@ and date_format(rmed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') - and sdd.`Code` = 'Short_Interruptions' + and rmed.event_type = #{dictdata} GROUP BY rmed.measurement_point_id @@ -28,7 +27,6 @@ rmed.measurement_point_id lineId, count(*) times FROM r_mp_event_detail rmed - left join sys_dict_data sdd on sdd.id = rmed.event_type WHERE rmed.measurement_point_id IN @@ -40,7 +38,7 @@ and date_format(rmed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') - and sdd.`Code` = 'Voltage_Rise' + and rmed.event_type = #{dictdata} GROUP BY rmed.measurement_point_id @@ -49,7 +47,6 @@ rmed.measurement_point_id lineId, count(*) times FROM r_mp_event_detail rmed - left join sys_dict_data sdd on sdd.id = rmed.event_type WHERE rmed.measurement_point_id IN @@ -61,7 +58,7 @@ and date_format(rmed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') - and sdd.`Code` = 'Voltage_Dip' + and rmed.event_type = #{dictdata} GROUP BY rmed.measurement_point_id 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 52d7e2186..a0594a08a 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 @@ -495,7 +495,7 @@ public class ReportServiceImpl implements ReportService { public Page getSagTimes(WaveTypeParam waveTypeParam) { //List result = new ArrayList<>(); //获取暂降字典信息 - //DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); + DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); List deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(waveTypeParam).getData(); List lineIds = deviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList()); @@ -503,8 +503,8 @@ public class ReportServiceImpl implements ReportService { throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY); } - List detailVO = reportMapper.getSagTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); - + Page detail = reportMapper.getSagTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime(),dictdata.getId()); + List detailVO = detail.getRecords(); /*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()))) @@ -554,11 +554,8 @@ public class ReportServiceImpl implements ReportService { } } } - Page page = BeanUtil.copyProperties(detailVO,Page.class); + Page page = BeanUtil.copyProperties(detail,Page.class); page.setRecords(detailVO); - int size = detailVO.size(); - Long aLong = Long.valueOf(String.valueOf(size)); - page.setTotal(aLong); return page; @@ -574,7 +571,7 @@ public class ReportServiceImpl implements ReportService { public Page getUpTimes(WaveTypeParam waveTypeParam) { //List result = new ArrayList<>(); //获取暂升字典信息 - //DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData(); + DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData(); List deviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(waveTypeParam).getData(); List lineIds = deviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList()); @@ -582,8 +579,8 @@ public class ReportServiceImpl implements ReportService { throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY); } - List detailVO = reportMapper.getUpTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); - + Page detail = reportMapper.getUpTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime(),dictdata.getId()); + List detailVO = detail.getRecords(); /*Page pageInfo = eventDetailService.page( new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper() @@ -638,11 +635,8 @@ public class ReportServiceImpl implements ReportService { } } } - Page page = BeanUtil.copyProperties(detailVO,Page.class); + Page page = BeanUtil.copyProperties(detail,Page.class); page.setRecords(detailVO); - int size = detailVO.size(); - Long aLong = Long.valueOf(String.valueOf(size)); - page.setTotal(aLong); return page; @@ -659,7 +653,7 @@ public class ReportServiceImpl implements ReportService { //List result = new ArrayList<>(); //获取中断字典信息 - //DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData(); + DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData(); List deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(waveTypeParam).getData(); List lineIds = deviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList()); @@ -667,7 +661,8 @@ public class ReportServiceImpl implements ReportService { throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY); } - List detailVO = reportMapper.getBreakTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); + Page detail = reportMapper.getBreakTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime(),dictdata.getId()); + List detailVO = detail.getRecords(); /* Page pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper() .in(RmpEventDetailPO::getMeasurementPointId, lineIds) @@ -721,11 +716,8 @@ public class ReportServiceImpl implements ReportService { } } } - Page page = BeanUtil.copyProperties(detailVO,Page.class); + Page page = BeanUtil.copyProperties(detail,Page.class); page.setRecords(detailVO); - int size = detailVO.size(); - Long aLong = Long.valueOf(String.valueOf(size)); - page.setTotal(aLong); return page;