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-27 19:06:27 +08:00
parent 41a8930aa9
commit ea2e7d02b2
5 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ public class AreaLineServiceImpl implements AreaLineService {
List<String> lineIds = eventdetailList.stream().map(EventHeatDeatilVO::getLineId).collect(Collectors.toList());
List<AreaLineInfoVO> areaAnalysisVOList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
for (EventHeatDeatilVO eventHeat : eventdetailList) {
/* for (EventHeatDeatilVO eventHeat : eventdetailList) {
for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) {
if (eventHeat.getLineId().equals(areaLineInfoVO.getLineId())) {
List<AreaLineInfoVO> ev = new ArrayList<>();
@@ -201,6 +201,16 @@ public class AreaLineServiceImpl implements AreaLineService {
break;
}
}
}*/
for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) {
List<AreaLineInfoVO> ev = new ArrayList<>();
long count = eventdetailList.stream()
.filter(obj -> obj.getLineId().equals( areaLineInfoVO.getLineId()))
.count();
int c = (int) count;
areaLineInfoVO.setTail(c);
ev.add(areaLineInfoVO);
eventHeatMapDetailList.add(ev);
}
//获取综合评估
List<PQSComAssesPO> comAccessData = largeScreenService.getComAccessData(lineIndexs, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime());
@@ -211,6 +221,8 @@ public class AreaLineServiceImpl implements AreaLineService {
baseVO.setName(generalDeviceDTO.getName());
baseVO.setValue(BigDecimal.valueOf(lineIndexs.size()));
baseVO.setData(String.valueOf(allComAss));
baseVO.setCount(eventdetailList.size());
baseVO.setSize(lineIndexs.size());
listObject.add(baseVO);
}
} else {
@@ -218,6 +230,8 @@ public class AreaLineServiceImpl implements AreaLineService {
baseVO.setName(generalDeviceDTO.getName());
baseVO.setValue(BigDecimal.valueOf(3.141592));
baseVO.setData("-1");
baseVO.setCount(0);
baseVO.setSize(0);
listObject.add(baseVO);
}
i++;

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

@@ -76,6 +76,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
param.setName(generalDeviceDTO.getName());
param.setIndex(generalDeviceDTO.getIndex());
param.setCount(0);
param.setSize(0);
list.add(param);
} else {
Map<String, Object> map = largeScreenMapper.selectDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
@@ -85,6 +86,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
String s = map.get("count").toString();
int count = Integer.parseInt(s);
param.setCount(count);
param.setSize(generalDeviceDTO.getLineIndexes().size());
list.add(param);
}
}