From 2c0a9a5194596d05b00aa773133582fa16deb6ea Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期日, 17 五月 2026 17:00:21 +0800
Subject: [PATCH] 不提交
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpStationServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpStationServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpStationServiceImpl.java
index 18c4497..a7b649d 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpStationServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpStationServiceImpl.java
@@ -96,21 +96,21 @@
}
@Override
public List<XpStation> findList(PageInfo<XpStation> pageInfo, XpStationQuery query) {
+ Integer bj = 0;
if(StringUtils.isNotEmpty(query.getStationPointNum())){
if(query.getStationPointNum().contains(",")){
throw new ServiceException("点位数量只能单选");
}
if(query.getStationPointNum().contains("gt")){
- query.setStationPointNum(query.getStationPointNum().replace("gt", " > "));
- }else{
- query.setStationPointNum(" = " + query.getStationPointNum());
+ query.setStationPointNum(query.getStationPointNum().replace("gt", ""));
+ bj = 1;
}
}
List<XpStation> list = null;
if(pageInfo ==null){
- list = this.baseMapper.pageList(query);
+ list = this.baseMapper.pageList(query, bj);
}else{
- list = this.baseMapper.pageList(pageInfo, query);
+ list = this.baseMapper.pageList(pageInfo, query, bj);
}
if(CollUtil.isNotEmpty(list)){
LocalTime localTime = LocalTime.now();
@@ -137,6 +137,14 @@
int operatingPointCount = 0; // 运营中点位数
for (XpPoint xpPoint : stationPoints) {
+ if(null != xpPoint.getStationId()){
+ XpStation xpStation1 = this.getById(xpPoint.getStationId());
+ xpPoint.setStationOperationType(xpStation1.getOperationType());
+ xpPoint.setStationEffectivePeriod(xpStation1.getEffectivePeriod());
+ xpPoint.setStationEffectivePeriod(xpStation1.getEffectivePeriod());
+ xpPoint.setStationEffectiveTimePeriod(xpStation1.getEffectiveTimePeriod());
+ xpPoint.setFenceOperationStrategy(xpStation1.getFenceOperationStrategy());
+ }
boolean pointOperation = bootCommonService.getPointOperation(localTime, xpPoint);
if (pointOperation) {
operatingPointCount++;
--
Gitblit v1.7.1