From 626003bd81b6f95ef94c9e9912768b3481311f93 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 14 二月 2026 15:58:04 +0800
Subject: [PATCH] 点位修改
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 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 1fa4ccf..dcb3feb 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
@@ -75,39 +75,10 @@
}
for (XpPoint xpPoint : list) {
-
- // 2非工作日 0工作日 1节假日 3调休日
- Integer holidayToday = holidayUtil.isHolidayToday();
- Integer operationType = xpPoint.getEffectivePeriod();
- if(operationType==1){
- boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
- if (!inTime) {
- continue;
- }
- }else if(operationType==2){
- if(holidayToday!=0){
- continue;
- }
- boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
- if (!inTime) {
- continue;
- }
- }else if(operationType==3){
- if(holidayToday!=2){
- continue;
- }
- boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
- if (!inTime) {
- continue;
- }
- }else if(operationType==4){
- if(holidayToday!=1){
- continue;
- }
- boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
- if (!inTime) {
- continue;
- }
+ // 判断是否在时间段内
+ boolean intime = getInTime(now, xpPoint);
+ if (!intime) {
+ continue;
}
// 计算距离 小于的站点
double v = FastDistanceCalculator.distanceFast(dto.getLatitude(), dto.getLongitude(), xpPoint.getPointLat(), xpPoint.getPointLon());
@@ -136,6 +107,44 @@
}
+
+ private boolean getInTime(LocalTime now,XpPoint xpPoint){
+ // 2非工作日 0工作日 1节假日 3调休日
+ Integer holidayToday = holidayUtil.isHolidayToday();
+ Integer operationType = xpPoint.getEffectivePeriod();
+ if(operationType==1){
+ boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
+ if (!inTime) {
+ return false;
+ }
+ }else if(operationType==2){
+ if(holidayToday!=0){
+ return false;
+ }
+ boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
+ if (!inTime) {
+ return false;
+ }
+ }else if(operationType==3){
+ if(holidayToday!=2){
+ return false;
+ }
+ boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
+ if (!inTime) {
+ return false;
+ }
+ }else if(operationType==4){
+ if(holidayToday!=1){
+ return false;
+ }
+ boolean inTime = TimeRangeChecker.isCurrentTimeInRanges(now, xpPoint.getEffectiveTimePeriod());
+ if (!inTime) {
+ return false;
+ }
+ }
+ return true;
+ }
+
@Override
public List<XpPoint> pointMap(PointMapQuery query) {
List<XpPoint> list = this.baseMapper.pointMap(query);
--
Gitblit v1.7.1