From aefa3f8f1d461cb713d689f1c28f612e0cd56241 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 07 四月 2026 16:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
index 78e8ca3..37e98d7 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
@@ -112,10 +112,18 @@
}
// 是否运营时间内
if(xpElectronicFence.getFailureType() == 2){
- Boolean inOperationTime = isInOperationTime(operationStrategy);
- if(!inOperationTime){
+ JSONArray jsonArray = JSONArray.parseArray(operationStrategy);
+ if(!jsonArray.isEmpty()){
+ Boolean inOperationTime = isInOperationTime(operationStrategy);
+ if(!inOperationTime){
+ continue;
+ }
+ }
+
+ if(LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime())){
continue;
}
+
}else{
//永不失效，需要判断开始时间是否到达
if(LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime())){
--
Gitblit v1.7.1