From 24968156b7900891e9c29ec615d04050f16ae9c3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 04 三月 2026 17:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
index ca11e93..128e085 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -6,9 +6,7 @@
import com.xiaopeng.api.dto.operation.PointMapQuery;
import com.xiaopeng.api.dto.order.HistoryEndPointsDto;
import com.xiaopeng.api.dto.order.HistoryStartPointsDto;
-import com.xiaopeng.api.model.operation.XpBanner;
-import com.xiaopeng.api.model.operation.XpPoint;
-import com.xiaopeng.api.model.operation.XpSystemSetting;
+import com.xiaopeng.api.model.operation.*;
import com.xiaopeng.api.query.operation.PointListQuery;
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
@@ -22,6 +20,8 @@
import com.xiaopeng.operation.mapper.XpPointMapper;
import com.xiaopeng.operation.mapper.XpSystemSettingMapper;
import com.xiaopeng.operation.query.PointByNameQuery;
+import com.xiaopeng.operation.service.IXpElectronicFenceAreaService;
+import com.xiaopeng.operation.service.IXpElectronicFenceService;
import com.xiaopeng.operation.service.XpPointService;
import com.xiaopeng.operation.utils.TimeRangeChecker;
import com.xiaopeng.operation.utils.holiday.HolidayUtil;
@@ -33,6 +33,7 @@
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.Arrays;
@@ -61,6 +62,12 @@
@Resource
private HolidayUtil holidayUtil;
+ @Resource
+ private IXpElectronicFenceAreaService xpElectronicFenceAreaService;
+
+ @Resource
+ private IXpElectronicFenceService xpElectronicFenceService;
+
@Override
public NearestVo nearest(NearestDto dto) {
@@ -81,14 +88,43 @@
NearestVo nearestVo = new NearestVo();
List<NearestNextVo> nearestNextVos = new ArrayList<>();
LocalTime now = LocalTime.now();
+ List<Long> areaIds = list.stream().map(XpPoint::getElectronicAreaId).collect(Collectors.toList());
+ List<XpElectronicFenceArea> xpElectronicFenceAreas = xpElectronicFenceAreaService.listByIds(areaIds);
+ List<Long> fenceIds = xpElectronicFenceAreas.stream().map(XpElectronicFenceArea::getElectronicId).collect(Collectors.toList());
+ List<XpElectronicFence> xpElectronicFences = xpElectronicFenceService.listByIds(fenceIds);
-
+ //判断当前点位是否在运营时间范围内
for (XpPoint xpPoint : list) {
- // 判断是否在时间段内
- boolean intime = getInTime(now, xpPoint.getEffectivePeriod(), xpPoint.getEffectiveTimePeriod());
- if (!intime) {
- continue;
+ Integer operationType = xpPoint.getOperationType();
+ if(1 == operationType){
+ //与运营区同步
+ XpElectronicFenceArea xpElectronicFenceArea = xpElectronicFenceAreas.stream().filter(s -> s.getId().equals(xpPoint.getElectronicAreaId())).findFirst().orElse(null);
+ if(null == xpElectronicFenceArea){
+ continue;
+ }
+ XpElectronicFence xpElectronicFence = xpElectronicFences.stream().filter(s -> s.getId().equals(xpElectronicFenceArea.getElectronicId())).findFirst().orElse(null);
+ if(null == xpElectronicFence){
+ continue;
+ }
+ //失效类型 1=永不失效 2=定时失效
+ Integer failureType = xpElectronicFence.getFailureType();
+ //永不失效，但是还未到开始时间
+ if(1 == failureType && LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime())){
+ continue;
+ }
+ //定时失效，但是当前时间不在时间范围内
+ if(LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime()) || LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime())){
+ continue;
+ }
+ }else{
+ //自定义时间段
+ // 判断是否在时间段内
+ boolean intime = getInTime(now, xpPoint.getEffectivePeriod(), xpPoint.getEffectiveTimePeriod());
+ if (!intime) {
+ continue;
+ }
}
+
// 计算距离 小于的站点
double v = FastDistanceCalculator.distanceFast(dto.getLatitude(), dto.getLongitude(), xpPoint.getPointLat(), xpPoint.getPointLon());
if (v < orderDistance) {
--
Gitblit v1.7.1