From b999b8342849cccecd444957defd6367cb46b663 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 07 五月 2026 16:10:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/BootCommonService.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/BootCommonService.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/BootCommonService.java
index f6f1c2a..d9a2184 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/BootCommonService.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/BootCommonService.java
@@ -215,13 +215,15 @@
*/
public boolean getPointOperation(LocalTime localTime, XpPoint xpPoint){
if(xpPoint.getOperationStatus() == 2 && xpPoint.getVerificationStatus() == 5){
- if(xpPoint.getOperationType()==2){//运营类型 1=与运营区同步 2=自定义时间段
- return getPointOperation(localTime,xpPoint.getEffectivePeriod(),xpPoint.getEffectiveTimePeriod());
- }else {
- if (xpPoint.getStationId() == null) {//调用围栏运营策略
- return getFenceOperation(localTime, xpPoint.getFenceOperationStrategy());
- } else {
- return this.getStationOperation(localTime, xpPoint.getStationOperationType(), xpPoint.getStationEffectivePeriod(), xpPoint.getStationEffectiveTimePeriod(), xpPoint.getFenceOperationStrategy());
+ if(xpPoint.getOperationType() != null){
+ if(xpPoint.getOperationType()==2){//运营类型 1=与运营区同步 2=自定义时间段
+ return getPointOperation(localTime,xpPoint.getEffectivePeriod(),xpPoint.getEffectiveTimePeriod());
+ }else {
+ if (xpPoint.getStationId() == null) {//调用围栏运营策略
+ return getFenceOperation(localTime, xpPoint.getFenceOperationStrategy());
+ } else {
+ return this.getStationOperation(localTime, xpPoint.getStationOperationType(), xpPoint.getStationEffectivePeriod(), xpPoint.getStationEffectiveTimePeriod(), xpPoint.getFenceOperationStrategy());
+ }
}
}
}
--
Gitblit v1.7.1