Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

zbj//1.暂态报告 暂降/暂升/中断 分页代码修改

Browse Source
This commit is contained in:
zhangbaojian
2023-04-28 11:34:21 +08:00
parent 37d4c999ec
commit c8d766e8ad
3 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/ReportMapper.java
View File

@@ -17,9 +17,9 @@ import java.util.List;
@Mapper @Mapper
public interface ReportMapper { public interface ReportMapper {
List<DetailVO> getBreakTimes(Page<DetailVO> page, @Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); Page<DetailVO> getBreakTimes(Page<DetailVO> page, @Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("dictdata") String dictdata);
List<DetailVO> getUpTimes(Page<DetailVO> page, @Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); Page<DetailVO> getUpTimes(Page<DetailVO> page, @Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("dictdata") String dictdata);
List<DetailVO> getSagTimes(Page<DetailVO> page, @Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); Page<DetailVO> getSagTimes(Page<DetailVO> page, @Param("lineIds") List<String> lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("dictdata") String dictdata);
} }

9
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/ReportMapper.xml
View File

@@ -7,7 +7,6 @@
rmed.measurement_point_id lineId, rmed.measurement_point_id lineId,
count(*) times count(*) times
FROM r_mp_event_detail rmed FROM r_mp_event_detail rmed
left join sys_dict_data sdd on sdd.id = rmed.event_type
WHERE WHERE
rmed.measurement_point_id IN rmed.measurement_point_id IN
<foreach collection="lineIds" item="item" open="(" close=")" separator=","> <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
@@ -19,7 +18,7 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(rmed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(rmed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
and sdd.`Code` = 'Short_Interruptions' and rmed.event_type = #{dictdata}
GROUP BY rmed.measurement_point_id GROUP BY rmed.measurement_point_id
</select> </select>
@@ -28,7 +27,6 @@
rmed.measurement_point_id lineId, rmed.measurement_point_id lineId,
count(*) times count(*) times
FROM r_mp_event_detail rmed FROM r_mp_event_detail rmed
left join sys_dict_data sdd on sdd.id = rmed.event_type
WHERE WHERE
rmed.measurement_point_id IN rmed.measurement_point_id IN
<foreach collection="lineIds" item="item" open="(" close=")" separator=","> <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
@@ -40,7 +38,7 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(rmed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(rmed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
and sdd.`Code` = 'Voltage_Rise' and rmed.event_type = #{dictdata}
GROUP BY rmed.measurement_point_id GROUP BY rmed.measurement_point_id
</select> </select>
@@ -49,7 +47,6 @@
rmed.measurement_point_id lineId, rmed.measurement_point_id lineId,
count(*) times count(*) times
FROM r_mp_event_detail rmed FROM r_mp_event_detail rmed
left join sys_dict_data sdd on sdd.id = rmed.event_type
WHERE WHERE
rmed.measurement_point_id IN rmed.measurement_point_id IN
<foreach collection="lineIds" item="item" open="(" close=")" separator=","> <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
@@ -61,7 +58,7 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(rmed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(rmed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
and sdd.`Code` = 'Voltage_Dip' and rmed.event_type = #{dictdata}
GROUP BY rmed.measurement_point_id GROUP BY rmed.measurement_point_id
</select> </select>

32
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -495,7 +495,7 @@ public class ReportServiceImpl implements ReportService {
public Page<DetailVO> getSagTimes(WaveTypeParam waveTypeParam) { public Page<DetailVO> getSagTimes(WaveTypeParam waveTypeParam) {
//List<DetailVO> result = new ArrayList<>(); //List<DetailVO> result = new ArrayList<>();
//获取暂降字典信息 //获取暂降字典信息
//DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(waveTypeParam).getData(); List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(waveTypeParam).getData();
List<String> lineIds = deviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList()); List<String> 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); throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY);
} }
List<DetailVO> detailVO = reportMapper.getSagTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); Page<DetailVO> detail = reportMapper.getSagTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime(),dictdata.getId());
List<DetailVO> detailVO = detail.getRecords();
/*Page<RmpEventDetailPO> pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper<RmpEventDetailPO>() /*Page<RmpEventDetailPO> pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIds) .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
.ge(StringUtils.isNotBlank(waveTypeParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(waveTypeParam.getSearchBeginTime()))) .ge(StringUtils.isNotBlank(waveTypeParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(waveTypeParam.getSearchBeginTime())))
@@ -554,11 +554,8 @@ public class ReportServiceImpl implements ReportService {
} }
} }
} }
Page<DetailVO> page = BeanUtil.copyProperties(detailVO,Page.class); Page<DetailVO> page = BeanUtil.copyProperties(detail,Page.class);
page.setRecords(detailVO); page.setRecords(detailVO);
int size = detailVO.size();
Long aLong = Long.valueOf(String.valueOf(size));
page.setTotal(aLong);
return page; return page;
@@ -574,7 +571,7 @@ public class ReportServiceImpl implements ReportService {
public Page<DetailVO> getUpTimes(WaveTypeParam waveTypeParam) { public Page<DetailVO> getUpTimes(WaveTypeParam waveTypeParam) {
//List<DetailVO> result = new ArrayList<>(); //List<DetailVO> result = new ArrayList<>();
//获取暂升字典信息 //获取暂升字典信息
//DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData(); DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData();
List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(waveTypeParam).getData(); List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(waveTypeParam).getData();
List<String> lineIds = deviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList()); List<String> 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); throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY);
} }
List<DetailVO> detailVO = reportMapper.getUpTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); Page<DetailVO> detail = reportMapper.getUpTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime(),dictdata.getId());
List<DetailVO> detailVO = detail.getRecords();
/*Page<RmpEventDetailPO> pageInfo = eventDetailService.page( /*Page<RmpEventDetailPO> pageInfo = eventDetailService.page(
new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),
new LambdaQueryWrapper<RmpEventDetailPO>() new LambdaQueryWrapper<RmpEventDetailPO>()
@@ -638,11 +635,8 @@ public class ReportServiceImpl implements ReportService {
} }
} }
} }
Page<DetailVO> page = BeanUtil.copyProperties(detailVO,Page.class); Page<DetailVO> page = BeanUtil.copyProperties(detail,Page.class);
page.setRecords(detailVO); page.setRecords(detailVO);
int size = detailVO.size();
Long aLong = Long.valueOf(String.valueOf(size));
page.setTotal(aLong);
return page; return page;
@@ -659,7 +653,7 @@ public class ReportServiceImpl implements ReportService {
//List<DetailVO> result = new ArrayList<>(); //List<DetailVO> result = new ArrayList<>();
//获取中断字典信息 //获取中断字典信息
//DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData(); DictData dictdata = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(waveTypeParam).getData(); List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(waveTypeParam).getData();
List<String> lineIds = deviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList()); List<String> 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); throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY);
} }
List<DetailVO> detailVO = reportMapper.getBreakTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime()); Page<DetailVO> detail = reportMapper.getBreakTimes(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()),lineIds,waveTypeParam.getSearchBeginTime(),waveTypeParam.getSearchEndTime(),dictdata.getId());
List<DetailVO> detailVO = detail.getRecords();
/* Page<RmpEventDetailPO> pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper<RmpEventDetailPO>() /* Page<RmpEventDetailPO> pageInfo = eventDetailService.page(new Page<>(waveTypeParam.getPageNum(), waveTypeParam.getPageSize()), new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIds) .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
@@ -721,11 +716,8 @@ public class ReportServiceImpl implements ReportService {
} }
} }
} }
Page<DetailVO> page = BeanUtil.copyProperties(detailVO,Page.class); Page<DetailVO> page = BeanUtil.copyProperties(detail,Page.class);
page.setRecords(detailVO); page.setRecords(detailVO);
int size = detailVO.size();
Long aLong = Long.valueOf(String.valueOf(size));
page.setTotal(aLong);
return page; return page;