From 5edd84c3d79263a32afdd9564ad0373fc253389f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:03:22 +0800
Subject: [PATCH] 日志打印
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java
index a557929..8e9b338 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineServiceImpl.java
@@ -5,11 +5,13 @@
import com.stylefeng.guns.modular.crossCity.model.Line;
import com.stylefeng.guns.modular.crossCity.server.ILineService;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
@@ -30,6 +32,20 @@
public List<Map<String, Object>> queryLines(Integer startId, Integer endId, Integer driverId) throws Exception {
List<Map<String, Object>> list1 = lineMapper.queryLines(startId, 1);
List<Map<String, Object>> list2 = lineMapper.queryLines(endId, 2);
+ // 结束站点为经停站的
+ List<Map<String, Object>> list4 = lineMapper.queryLines(endId, 3);
+ if(!CollectionUtils.isEmpty(list4)){
+ List<Integer> stopoverIds = new ArrayList<>();
+ for (Map<String, Object> stopoverStation : list4) {
+ Integer stopoverId = Integer.valueOf(stopoverStation.get("id").toString());
+ stopoverIds.add(stopoverId);
+ }
+ stopoverIds = stopoverIds.stream().distinct().collect(Collectors.toList());
+ // 查询经停站的终点
+ List<Map<String, Object>> endList = lineMapper.queryLinesByStopoverIds(stopoverIds,2);
+ list2.addAll(endList);
+ }
+ list2 = list2.stream().distinct().collect(Collectors.toList());
List<Map<String, Object>> list = new ArrayList<>();
for(Map<String, Object> map1 : list1){
Integer id1 = Integer.valueOf(map1.get("id").toString());
--
Gitblit v1.7.1