From 913e7463e1adfd454e7069d7dad5f0dc69861853 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 04 三月 2026 20:06:04 +0800
Subject: [PATCH] 修改bug

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java |   12 ++++--------
 1 files changed, 4 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 79164c5..0f0cbe7 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
@@ -117,9 +117,8 @@
                 //永不失效,但是还未到开始时间
                 if(1 == failureType && LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime())){
                     continue;
-                }
-                //定时失效,但是当前时间不在时间范围内
-                if(LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime()) || LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime())){
+                }else if(2 == failureType && (LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime()) || LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime()))){
+                    //定时失效,但是当前时间不在时间范围内
                     continue;
                 }
             }else{
@@ -293,12 +292,9 @@
                 Integer failureType = xpElectronicFence.getFailureType();
                 //永不失效,但是还未到开始时间
                 if(1 == failureType && LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime())){
-                    // 不在运营段
                     xpPointsListVo.setState(0);
-                }
-                //定时失效,但是当前时间不在时间范围内
-                if(LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime()) || LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime())){
-                    // 不在运营段
+                }else if(2 == failureType && (LocalDateTime.now().isBefore(xpElectronicFence.getEffectTime()) || LocalDateTime.now().isAfter(xpElectronicFence.getFailureTime()))){
+                    //定时失效,但是当前时间不在时间范围内
                     xpPointsListVo.setState(0);
                 }
             }else{

--
Gitblit v1.7.1