Skip to content

T
traffic-signal-platform
Commit d44136f3 authored by duanruiming's avatar duanruiming
Browse files
Options

[update] 态势监测-转向数据优化数据结构

parent 80e7f51d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java
View file @ d44136f3
...@@ -1750,9 +1750,10 @@ public class TrendServiceImpl implements TrendService { ...@@ -1750,9 +1750,10 @@ public class TrendServiceImpl implements TrendService {
.between(CrossTurnDataHistPO::getBatchTime, dateTime - 3600, dateTime); .between(CrossTurnDataHistPO::getBatchTime, dateTime - 3600, dateTime);
List<CrossTurnDataHistPO> turnDataHistPOList = crossTurnDataHistMapper.selectList(turnQuery); List<CrossTurnDataHistPO> turnDataHistPOList = crossTurnDataHistMapper.selectList(turnQuery);
if (!CollectionUtils.isEmpty(turnDataHistPOList)) { if (!CollectionUtils.isEmpty(turnDataHistPOList)) {
Map<Date, List<CrossTurnDataHistPO>> collect = turnDataHistPOList.stream().collect(Collectors.groupingBy(CrossTurnDataHistPO::getStartTime)); Map<Integer, List<CrossTurnDataHistPO>> collect = turnDataHistPOList.stream().collect(Collectors.groupingBy(CrossTurnDataHistPO::getBatchTime));
for (Map.Entry<Date, List<CrossTurnDataHistPO>> entry : collect.entrySet()) { for (Map.Entry<Integer, List<CrossTurnDataHistPO>> entry : collect.entrySet()) {
Date key = entry.getKey(); HotspotCrossTurnVO hotspotCrossTurnVO = new HotspotCrossTurnVO();
Integer timeStamp = entry.getKey();
List<CrossTurnDataHistPO> value = entry.getValue(); List<CrossTurnDataHistPO> value = entry.getValue();
if (!CollectionUtils.isEmpty(value)) { if (!CollectionUtils.isEmpty(value)) {
Map<Integer, List<CrossTurnDataHistPO>> dirMap = value.stream().collect(Collectors.groupingBy(CrossTurnDataHistPO::getInDir)); Map<Integer, List<CrossTurnDataHistPO>> dirMap = value.stream().collect(Collectors.groupingBy(CrossTurnDataHistPO::getInDir));
...@@ -1767,10 +1768,9 @@ public class TrendServiceImpl implements TrendService { ...@@ -1767,10 +1768,9 @@ public class TrendServiceImpl implements TrendService {
turnDetail.setFlow(crossTurnDataHistPO.getFlow()); turnDetail.setFlow(crossTurnDataHistPO.getFlow());
turnDetails.add(turnDetail); turnDetails.add(turnDetail);
} }
HotspotCrossTurnVO hotspotCrossTurnVO = new HotspotCrossTurnVO();
hotspotCrossTurnVO.setCrossId(crossId); hotspotCrossTurnVO.setCrossId(crossId);
hotspotCrossTurnVO.setDir(dir); hotspotCrossTurnVO.setDir(dir);
hotspotCrossTurnVO.setTimeStamp(key); hotspotCrossTurnVO.setTimeStamp(new Date(timeStamp));
hotspotCrossTurnVO.setTurnList(turnDetails); hotspotCrossTurnVO.setTurnList(turnDetails);
results.add(hotspotCrossTurnVO); results.add(hotspotCrossTurnVO);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment