From cdeb9e9559783cae56cbc6581b2e7aef893429b7 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 27 三月 2023 17:02:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/xzjlwcs' into xzjlwcs
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 7ffae0e..d463714 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.zy.core.enums.ShuttleTaskModeType;
import java.io.*;
import java.util.ArrayList;
@@ -12,15 +13,17 @@
public class NavigateMapData {
public int[][] getData() {
- return getData("in");
+ return getData(ShuttleTaskModeType.PAK_IN.id);
}
- public int[][] getData(String mapType) {
+ public int[][] getData(Integer mapType) {
try {
String mapFilename = "";
- if (mapType.equals("in")) {
+ if (mapType == ShuttleTaskModeType.PAK_IN.id) {
+ //鍏ュ簱鍦板浘
mapFilename = "mapIn.json";
}else {
+ //鍑哄簱鍦板浘
mapFilename = "mapOut.json";
}
--
Gitblit v1.9.1