From f97c8c0c36f81028de156c861b73d73428a1f415 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 15:14:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/utils/NavigateSolution.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index e2d429f..ef7d708 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -41,21 +41,38 @@
                 JSONObject map = row.get(j);
                 NavigateNode navigateNode = new NavigateNode(i, j);
 
+                String mergeType = map.getString("mergeType");
                 String nodeType = map.getString("type");
+                String nodeValue = map.getString("value");
                 if(nodeType == null) {
                     navigateNode.setValue(MapNodeType.DISABLE.id);
-                }else if(nodeType.equals("devp") || nodeType.equals("merge")){
+                }else if(nodeType.equals("devp") || (nodeType.equals("merge") && mergeType.equals("devp"))) {
                     navigateNode.setValue(MapNodeType.NORMAL_PATH.id);
 
                     JSONObject valueObj = JSON.parseObject(map.getString("value"));
                     List<String> directionList = valueObj.getJSONArray("direction").toJavaList(String.class);
                     navigateNode.setDirectionList(directionList);
-                }else {
+                } else if (nodeType.equals("rgv")) {
+                    navigateNode.setValue(MapNodeType.NORMAL_PATH.id);
+                    JSONObject valueObj = JSON.parseObject(map.getString("value"));
+
+                    JSONObject newNodeValue = new JSONObject();
+                    newNodeValue.put("rgvCalcFlag", 1);
+                    nodeValue = JSON.toJSONString(newNodeValue);
+
+                    //RGV鏆備笉鎺у埗琛岃蛋鏂瑰悜锛岄粯璁や笂涓嬪乏鍙抽兘鍙蛋
+                    List<String> directionList = new ArrayList<>();
+                    directionList.add("top");
+                    directionList.add("bottom");
+                    directionList.add("left");
+                    directionList.add("right");
+                    navigateNode.setDirectionList(directionList);
+                } else {
                     navigateNode.setValue(MapNodeType.DISABLE.id);
                 }
 
                 navigateNode.setNodeType(nodeType);
-                navigateNode.setNodeValue(map.getString("value"));
+                navigateNode.setNodeValue(nodeValue);
                 navigateNodeRow.add(navigateNode);
             }
             navigateNodeList.add(navigateNodeRow);

--
Gitblit v1.9.1