Commit 769f5f4e authored by hanbing's avatar hanbing

[update] 子区范围,双向路段返回两条RID

parent 9211740d
......@@ -180,14 +180,6 @@ public class CrossManageServiceImpl implements CrossManageService {
.filter(rid -> validRid(rid, crossIdList))
.collect(Collectors.toList());
// 双向路段只保留一条RID
Iterator<RidInfoEntity> iterator = firstFilterRids.iterator();
while (iterator.hasNext()) {
RidInfoEntity next = iterator.next();
if (hasDuplicate(next, firstFilterRids)) {
iterator.remove();
}
}
// 验证路口数量
Set<String> ridCrossIds = new HashSet<>();
for (RidInfoEntity firstFilterRid : firstFilterRids) {
......@@ -207,20 +199,6 @@ public class CrossManageServiceImpl implements CrossManageService {
return res;
}
private boolean hasDuplicate(RidInfoEntity rid, List<RidInfoEntity> firstFilterRids) {
String startCrossId = rid.getStartCrossId();
String endCrossId = rid.getEndCrossId();
for (RidInfoEntity firstFilterRid : firstFilterRids) {
String startCrossId2 = firstFilterRid.getStartCrossId();
String endCrossId2 = firstFilterRid.getEndCrossId();
// 如果开始路口和结束路口对应另一个rid的结束路口和开始路口,则剔除
if (Objects.equals(startCrossId, endCrossId2) && Objects.equals(endCrossId, startCrossId2)) {
return true;
}
}
return false;
}
private boolean validRid(RidInfoEntity rid, List<String> crossIdList) {
String startCrossId = rid.getStartCrossId();
String endCrossId = rid.getEndCrossId();
......
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