From 3896cbb9ed6fa03d90a4032238dad7b2f39c607c Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 24 三月 2026 20:23:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPointServiceImpl.java | 64 --------------------------------
1 files changed, 0 insertions(+), 64 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPointServiceImpl.java
index e834d21..023ceeb 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPointServiceImpl.java
@@ -375,70 +375,6 @@
return resultList;
}
- @Override
- public XpPointsSearchVo queryPointByName(PointByNameQuery query) {
- XpPointsSearchVo searchVo = new XpTestPointsSearchVo();
- List<XpPointsListVo> list = this.baseMapper.queryPointByName(query);
- if (list.isEmpty()) {
- return searchVo;
- }
-
- LocalTime now = LocalTime.now();
- List<Long> areaIds = list.stream().map(XpPointsListVo::getElectronicAreaId).collect(Collectors.toList());
- List<XpElectronicFenceArea> xpElectronicFenceAreas = xpElectronicFenceAreaService.listByIds(areaIds);
- List<Long> fenceIds = xpElectronicFenceAreas.stream().map(XpElectronicFenceArea::getElectronicId).collect(Collectors.toList());
-
- List<XpElectronicFence> xpElectronicFences = new ArrayList<>();
- if (CollUtil.isNotEmpty(fenceIds)) {
- xpElectronicFences = xpElectronicFenceService.listByIds(fenceIds);
- }
- for (XpPointsListVo xpPointsListVo : list) {
- Integer operationType = xpPointsListVo.getOperationType();
- if(1 == operationType){
- //与运营区同步
- XpElectronicFenceArea xpElectronicFenceArea = xpElectronicFenceAreas.stream().filter(s -> s.getId().equals(xpPointsListVo.getElectronicAreaId())).findFirst().orElse(null);
- if(null == xpElectronicFenceArea){
- // 不在运营段
- xpPointsListVo.setState(0);
- }
- XpElectronicFence xpElectronicFence = xpElectronicFences.stream().filter(s -> s.getId().equals(xpElectronicFenceArea.getElectronicId())).findFirst().orElse(null);
- if(null == xpElectronicFence){
- // 不在运营段
- xpPointsListVo.setState(0);
- }
- //失效类型 1=永不失效 2=定时失效
- Integer failureType = xpElectronicFence.getFailureType();
- //永不失效，但是还未到开始时间
- if(1 == failureType && LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime())){
- xpPointsListVo.setState(0);
- }else if(2 == failureType && (LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime()) || LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime()))){
- //定时失效，但是当前时间不在时间范围内
- xpPointsListVo.setState(0);
- }
- }else{
- //自定义时间段
- // 判断是否在时间段内
- boolean intime = getInTime(now, xpPointsListVo.getEffectivePeriod(), xpPointsListVo.getEffectiveTimePeriod());
- if (!intime) {
- // 不在运营段
- xpPointsListVo.setState(0);
- }
- }
- }
- // 组装数据 并排序 剔除不在运营段的 数据
- List<XpPointsListVo> resultList = list.stream()
- .peek(vo -> vo.setDistance(BigDecimal.valueOf(FastDistanceCalculator.distanceFast(query.getLat(), query.getLon(), vo.getLatitude(), vo.getLongitude())).setScale(2, RoundingMode.HALF_UP).doubleValue()))
- .filter(vo -> vo.getState() == 1).collect(Collectors.toList());
-
- // 可用点位
- List<XpPointsListVo> availablePoints = resultList.stream().filter(e -> query.getElectronicAreaId() != null && e.getElectronicAreaId().equals(query.getElectronicAreaId())).sorted(Comparator.comparing(XpPointsListVo::getDistance)).collect(Collectors.toList());//
-
- // 不可用点位
- List<XpPointsListVo> unavailablePoints = resultList.stream().filter(e -> query.getElectronicAreaId() == null || !e.getElectronicAreaId().equals(query.getElectronicAreaId())).sorted(Comparator.comparing(XpPointsListVo::getDistance)).collect(Collectors.toList());
- searchVo.setAvailablePoints(availablePoints);
- searchVo.setUnavailablePoints(unavailablePoints);
- return searchVo;
- }
@Override
public OrderDistanceVo getOrderDistance() {
--
Gitblit v1.7.1