From 7f9435bb4a074b4964f290c4d6905e0e233a19ec Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 十一月 2025 12:56:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/utils/NavigateUtils.java |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index e324def..4528427 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -14,9 +14,9 @@
 @Component
 public class NavigateUtils {
 
-    public synchronized List<NavigateNode> calcByStationId(Integer startStationId, Integer endStationId) {
+    public synchronized List<NavigateNode> calcByStationId(int lev, Integer startStationId, Integer endStationId) {
         NavigateSolution navigateSolution = new NavigateSolution();
-        List<List<NavigateNode>> stationMap = navigateSolution.getStationMap();
+        List<List<NavigateNode>> stationMap = navigateSolution.getStationMap(lev);
 
         NavigateNode startNode = navigateSolution.findStationNavigateNode(stationMap, startStationId);
         if (startNode == null){
@@ -66,9 +66,9 @@
         return fitlerList;
     }
 
-    public synchronized List<NavigateNode> calcByTrackSiteNo(Integer startTrackSiteNo, Integer endTrackSiteNo) {
+    public synchronized List<NavigateNode> calcByTrackSiteNo(int lev, Integer startTrackSiteNo, Integer endTrackSiteNo) {
         NavigateSolution navigateSolution = new NavigateSolution();
-        List<List<NavigateNode>> rgvTrackMap = navigateSolution.getRgvTrackMap();
+        List<List<NavigateNode>> rgvTrackMap = navigateSolution.getRgvTrackMap(lev);
 
         NavigateNode startNode = navigateSolution.findTrackSiteNoNavigateNode(rgvTrackMap, startTrackSiteNo);
         if (startNode == null){
@@ -118,4 +118,30 @@
         return fitlerList;
     }
 
+    public synchronized List<NavigateNode> findLiftStationList(int lev) {
+        NavigateSolution navigateSolution = new NavigateSolution();
+        List<List<NavigateNode>> stationMap = navigateSolution.getStationMap(lev);
+
+        List<NavigateNode> liftStationList = new ArrayList<>();
+        for (List<NavigateNode> navigateNodes : stationMap) {
+            for (NavigateNode navigateNode : navigateNodes) {
+                String nodeType = navigateNode.getNodeType();
+                if(nodeType == null){
+                    continue;
+                }
+                if(!nodeType.equals("devp")){
+                    continue;
+                }
+                JSONObject valuObject = JSON.parseObject(navigateNode.getNodeValue());
+                if(valuObject == null){
+                    continue;
+                }
+                if (valuObject.containsKey("liftNo")) {
+                    liftStationList.add(navigateNode);
+                }
+            }
+        }
+
+        return liftStationList;
+    }
 }

--
Gitblit v1.9.1