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

pqbug解决

Browse Source
This commit is contained in:
wr
2023-05-22 15:59:51 +08:00
parent ded7f0f447
commit 682b40c849
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,7 @@ public class ReportServiceImpl implements ReportService {
private final ReportMapper reportMapper;
public List<EventDetail> getED(DeviceInfoParam.BusinessParam businessParam) {
public List<EventDetail> getED(DeviceInfoParam.BusinessParam businessParam,String id) {
List<EventDetail> info = new ArrayList<>();
List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData();
List<String> lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
@@ -146,6 +146,7 @@ public class ReportServiceImpl implements ReportService {
//数据暂降查询
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIds)
.eq(RmpEventDetailPO::getEventType, id)
.ge(StrUtil.isNotBlank(businessParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(businessParam.getSearchBeginTime())))
.le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime())))
);
@@ -384,9 +385,11 @@ public class ReportServiceImpl implements ReportService {
public List<ReasonsVO> getReason(DeviceInfoParam.BusinessParam businessParam) {
//获取暂降字典信息
DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
if(ObjectUtil.isNull(dictData)){
throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
}
List<ReasonsVO> result = new ArrayList<>();
List<EventDetail> info = getED(businessParam);
List<EventDetail> info = getED(businessParam, dictData.getId());
//获取字典表
HttpResult<List<DictData>> reason = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName());
List<DictData> data = reason.getData();