From 429bc159b230ed31092aed3b8c4893c20e52f5c6 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 16 三月 2024 15:47:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/utils/NavigateMapData.java |   63 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 62b43e6..f0065b4 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -9,7 +9,9 @@
 import com.zy.common.model.MapNode;
 import com.zy.common.model.NavigateNode;
 import com.zy.common.model.enums.NavigationMapType;
+import com.zy.core.enums.RedisKeyType;
 import com.zy.core.enums.ShuttleTaskModeType;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
 import java.io.*;
@@ -40,9 +42,15 @@
     public int[][] getData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
         try {
             String mapFilename = "map_" + lev + ".json";
+            ClassPathResource classPathResource = new ClassPathResource(mapFilename);
+            InputStream inputStream = classPathResource.getInputStream();
+            byte[] buffer = new byte[inputStream.available()];
+            inputStream.read(buffer);
+            File file = File.createTempFile("prefix","suffix");
+            try (OutputStream outStream = new FileOutputStream(file)) {
+                outStream.write(buffer);
+            }
 
-            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
-            File file = new File(fileName);
             StringBuffer stringBuffer = new StringBuffer();
             if (file.isFile() && file.exists()) {
                 InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -84,7 +92,7 @@
      */
     public int[][] getDataFromRedis(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
         RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
-        Object o = redisUtil.get("realtimeBasMap_" + lev);
+        Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
         if (o == null) {
             return null;
         }
@@ -119,9 +127,15 @@
     public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
         try {
             String mapFilename = "map_" + lev + ".json";
+            ClassPathResource classPathResource = new ClassPathResource(mapFilename);
+            InputStream inputStream = classPathResource.getInputStream();
+            byte[] buffer = new byte[inputStream.available()];
+            inputStream.read(buffer);
+            File file = File.createTempFile("prefix","suffix");
+            try (OutputStream outStream = new FileOutputStream(file)) {
+                outStream.write(buffer);
+            }
 
-            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
-            File file = new File(fileName);
             StringBuffer stringBuffer = new StringBuffer();
             if (file.isFile() && file.exists()) {
                 InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -150,9 +164,15 @@
     public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
         try {
             String mapFilename = "map_" + lev + ".json";
+            ClassPathResource classPathResource = new ClassPathResource(mapFilename);
+            InputStream inputStream = classPathResource.getInputStream();
+            byte[] buffer = new byte[inputStream.available()];
+            inputStream.read(buffer);
+            File file = File.createTempFile("prefix","suffix");
+            try (OutputStream outStream = new FileOutputStream(file)) {
+                outStream.write(buffer);
+            }
 
-            String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
-            File file = new File(fileName);
             StringBuffer stringBuffer = new StringBuffer();
             if (file.isFile() && file.exists()) {
                 InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -264,23 +284,24 @@
         }
 
         //鍔犺浇鐧藉悕鍗曡妭鐐�
-        List<List<MapNode>> realMap = getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘
-        for (int[] points : whitePoints) {
-            //鑾峰彇鍘熷鑺傜偣鏁版嵁
-            int x = points[0];
-            int y = points[1];
-            List<MapNode> rows = realMap.get(x);
-            MapNode col = rows.get(y);
+        if (whitePoints != null) {
+            List<List<MapNode>> realMap = getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘
+            for (int[] points : whitePoints) {
+                //鑾峰彇鍘熷鑺傜偣鏁版嵁
+                int x = points[0];
+                int y = points[1];
+                List<MapNode> rows = realMap.get(x);
+                MapNode col = rows.get(y);
 
-            List<MapNode> list = lists.get(x);
-            MapNode mapNode = list.get(y);
-            mapNode.setValue(col.getValue());//鎭㈠鍘熷鑺傜偣
+                List<MapNode> list = lists.get(x);
+                MapNode mapNode = list.get(y);
+                mapNode.setValue(col.getValue());//鎭㈠鍘熷鑺傜偣
 
-            //鏇存柊list
-            list.set(y, mapNode);
-            lists.set(x, list);
+                //鏇存柊list
+                list.set(y, mapNode);
+                lists.set(x, list);
+            }
         }
-
 
         return lists;
     }

--
Gitblit v1.9.1