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

bug修改

Browse Source
This commit is contained in:
chendaofei
2025-05-19 08:53:12 +08:00
parent 6e7a55cb93
commit 2265bf11b9
5 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,9 +112,9 @@ public class AreaLineServiceImpl implements AreaLineService {
// 获取变电站
areaLineVO.setSubstationDetailVOList(substationDetailVOList);
objectList.add(generalDeviceDTO.getName());
objectList.add(areaLineInfoVOS.size());
objectList.add(areaLineInfoVOS.stream().filter(x->x.getComFlag()==1).count());
objectList.add(areaLineInfoVOS.stream().filter(x->x.getComFlag()==0).count());
objectList.add(areaLineInfoVOS.size());
listObject.add(objectList);
}
areaLineVO.setAreaValue(listObject);
@@ -130,10 +130,10 @@ public class AreaLineServiceImpl implements AreaLineService {
}
EventHeatMapVO eventHeatMapVO = new EventHeatMapVO();
List<List<AreaLineInfoVO>> eventHeatMapDetailList = new ArrayList<>();
deviceInfoParam.setServerName(ServerEnum.EVENT.getName());
List<BaseVO> listObject = new ArrayList<>();
// 获取暂降监测点
deviceInfoParam.setServerName(ServerEnum.EVENT.getName());
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
List<String> lineIndexs;
int i = 0, generalDeviceListSize = generalDeviceDTOList.size();
@@ -148,8 +148,8 @@ public class AreaLineServiceImpl implements AreaLineService {
.select("measurement_point_id as measurementPointId,count(file_flag) as fileFlag")
.in("measurement_point_id", lineIndexs)
.eq("event_type", voltageData.getId())
.ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()),"start_time" ,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
.le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), "start_time", DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
.ge("start_time" ,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
.le("start_time", DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
.groupBy("measurement_point_id")
);