From 24f32865689784a8425e5af830d3fd7421ab96f8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 21 四月 2026 14:39:16 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
index 91a7c34..51c77dc 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
@@ -198,7 +198,7 @@
CheckInMessageVo vo = new CheckInMessageVo();
Map<String, Double> distance = GeodesyUtil.getDistance(xpCheckLocation.getLocationLon() + "," + xpCheckLocation.getLocationLat(), dto.getLongitude() + "," + dto.getLatitude());
if(xpCheckLocation.getLocationRange().compareTo(new BigDecimal(distance.get("WGS84"))) >= 0){
- vo.setMessageType(1);
+ vo.setMessageType(2);
vo.setCheckLocationId(cruiseCheckInRuleLocation.getCheckLocationId());
return vo;
}
@@ -209,7 +209,7 @@
.withSecond(0);
long time = endTime.toEpochSecond(ZoneOffset.of("+8")) - now.toEpochSecond(ZoneOffset.of("+8"));
if((time <= 10 * 60 && time > 10 * 50) || (time <= 3 * 60 && time > 3 * 50)){
- vo.setMessageType(2);
+ vo.setMessageType(1);
vo.setCheckLocationId(cruiseCheckInRuleLocation.getCheckLocationId());
vo.setMessage(time > 10 * 50 ? "距离打卡超时还有10分钟，请尽快前往打卡点" : "距离打卡超时还有3分钟，请尽快前往打卡点");
return vo;
--
Gitblit v1.7.1