Commit 12ee6d2e authored by zhoushiguang's avatar zhoushiguang

bug修改

parent e13aa51d
...@@ -547,7 +547,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH ...@@ -547,7 +547,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
List<CrossLaneDataHistPoExtend> list = greenwaveHistoryMapper.findCrossObjectIndex(params); List<CrossLaneDataHistPoExtend> list = greenwaveHistoryMapper.findCrossObjectIndex(params);
list = list.stream().sorted(Comparator.comparing(o -> o.getStartTime())).collect(Collectors.toList()); list = list.stream().sorted(Comparator.comparing(o -> o.getStartTime())).collect(Collectors.toList());
//按时间分组分组 //路口方向分钟
Map<String, List<CrossLaneDataHistPoExtend>> groupByDir = list.stream().collect(Collectors.groupingBy(o -> o.getCrossId() + "_" + o.getDirType(), TreeMap::new, Collectors.toList())); Map<String, List<CrossLaneDataHistPoExtend>> groupByDir = list.stream().collect(Collectors.groupingBy(o -> o.getCrossId() + "_" + o.getDirType(), TreeMap::new, Collectors.toList()));
Set<String> hasDataScopeList = new HashSet<>(); Set<String> hasDataScopeList = new HashSet<>();
...@@ -599,7 +599,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH ...@@ -599,7 +599,7 @@ public class GreenwaveHistProviderImpl extends BaseDubboInterfaceImpl<GreenwaveH
hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName()); hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName());
} else if (Objects.equals(3, objectType)) { } else if (Objects.equals(3, objectType)) {
o.setTurnTypeName(TurnConvertEnum.getDescByKey(o.getTurnType()) + o.getLaneNo() + "车道"); o.setTurnTypeName(TurnConvertEnum.getDescByKey(o.getTurnType()) + o.getLaneNo() + "车道");
hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName() + o.getLaneNo() + "车道"); hasDataScopeList.add(dirTurnDesc + o.getTurnTypeName());
} else { } else {
hasDataScopeList.add(dirTurnDesc); hasDataScopeList.add(dirTurnDesc);
} }
......
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