From 42f3380a98fff04674cf4ef95ea5e99f5c54f1fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 十二月 2024 12:07:36 +0800
Subject: [PATCH] #地图文件bug尝试修复
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 236 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 156 insertions(+), 80 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 7e2f6b6..a81489e 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -5,11 +5,15 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
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.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Component;
import java.io.*;
@@ -23,26 +27,52 @@
@Component
public class NavigateMapData {
- private Integer lev;//鍦板浘妤煎眰
+// private Integer lev;//鍦板浘妤煎眰
+//
+// public Integer getLev() {
+// return lev;
+// }
+//
+// public void setLev(Integer lev) {
+// this.lev = lev;
+// }
- public NavigateMapData() {
- this.lev = 1;
- }
-
- public NavigateMapData(Integer lev) {
- this.lev = lev;
- }
-
- public int[][] getData() {
- return getData(NavigationMapType.NONE.id, null, null);//榛樿璇诲彇鏃犺繃婊ょ殑鍏ㄩ儴鍦板浘鏁版嵁
- }
-
- public int[][] getData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ public int[][] getData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
- String mapFilename = "map_" + lev + ".json";
+// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
+// if (object == null) {
+// return null;
+// }
+//
+// //瑙ｆ瀽json鍦板浘鏁版嵁
+// ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
+// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
+// int[][] map = new int[lists.size()][];
+// int j = 0;
+// for (List<MapNode> list : lists) {
+// int[] tmp = new int[list.size()];
+// int i = 0;
+// for (MapNode mapNode : list) {
+// //灏嗘暟鎹坊鍔犺繘浜岀淮鏁扮粍
+// tmp[i++] = mapNode.getValue();
+// }
+// //鏁版嵁娣诲姞杩涗竴缁存暟缁�
+// map[j++] = tmp;
+// }
+//
+// return map;
- String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
- File file = new File(fileName);
+ 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);
+ }
+
StringBuffer stringBuffer = new StringBuffer();
if (file.isFile() && file.exists()) {
InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -69,12 +99,15 @@
map[j++] = tmp;
}
+ if (!file.delete()) {
+ System.out.println("涓存椂鏂囦欢鍒犻櫎澶辫触");
+ }
return map;
} else {
System.out.println("鏂囦欢涓嶅瓨鍦�!");
}
- } catch (IOException ioException) {
- ioException.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
return null;
}
@@ -82,21 +115,21 @@
/**
* 灏濊瘯浠巖edis鑾峰彇鏁版嵁
*/
- public int[][] getDataFromRedis(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ public int[][] getDataFromRedis(Integer lev, 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;
}
BasMap basMap = JSON.parseObject(o.toString(), BasMap.class);
- return this.getDataFormString(basMap.getData(), mapType, whitePoints, shuttlePoints);
+ return this.getDataFormString(lev, basMap.getData(), mapType, whitePoints, shuttlePoints);
}
/**
* 浠嶭ist鏁版嵁涓幏鍙栧湴鍥�
*/
- public int[][] getDataFormString(String data, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ public int[][] getDataFormString(Integer lev, String data, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
ArrayList arrayList = JSON.parseObject(data, ArrayList.class);
List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
int[][] map = new int[lists.size()][];
@@ -115,13 +148,83 @@
return map;
}
- //鑾峰彇JSON鏍煎紡鏁版嵁
- public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
- try {
- String mapFilename = "map_" + lev + ".json";
+// //鑾峰彇JSON鏍煎紡鏁版嵁
+// public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+// try {
+//// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+//// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
+//// if (object == null) {
+//// return null;
+//// }
+////
+//// //瑙ｆ瀽json鍦板浘鏁版嵁
+//// ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
+//// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
+//// return lists;
+//
+//
+// 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);
+// }
+//
+// StringBuffer stringBuffer = new StringBuffer();
+// if (file.isFile() && file.exists()) {
+// InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
+// BufferedReader br = new BufferedReader(isr);
+// String lineTxt = null;
+// while ((lineTxt = br.readLine()) != null) {
+// stringBuffer.append(lineTxt);
+// }
+// br.close();
+//
+// //瑙ｆ瀽json鍦板浘鏁版嵁
+// ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
+// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
+//
+// if (!file.delete()) {
+// System.out.println("涓存椂鏂囦欢鍒犻櫎澶辫触");
+// }
+//
+// return lists;
+// } else {
+// System.out.println("鏂囦欢涓嶅瓨鍦�!");
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return null;
+// }
- String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
- File file = new File(fileName);
+ //鑾峰彇JSON鏍煎紡鏁版嵁
+ public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ try {
+// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
+// if (object == null) {
+// return null;
+// }
+//
+// //瑙ｆ瀽json鍦板浘鏁版嵁
+// ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
+// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
+// return lists;
+
+ 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);
+ }
+
StringBuffer stringBuffer = new StringBuffer();
if (file.isFile() && file.exists()) {
InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
@@ -136,12 +239,16 @@
ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
+ if (!file.delete()) {
+ System.out.println("涓存椂鏂囦欢鍒犻櫎澶辫触");
+ }
+
return lists;
} else {
System.out.println("鏂囦欢涓嶅瓨鍦�!");
}
- } catch (IOException ioException) {
- ioException.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
return null;
}
@@ -232,58 +339,27 @@
}
}
- return lists;
- }
+ //鍔犺浇鐧藉悕鍗曡妭鐐�
+ 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);
- /**
- * 鍐欏叆璺緞鑺傜偣鏁版嵁鍒皉edis鍦板浘涓�
- * lock涓簍rue 绂佺敤搴撲綅锛宭ock涓篺alse鎭㈠搴撲綅
- */
- public boolean writeNavigateNodeToRedisMap(List<NavigateNode> nodes, boolean lock) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- try {
- if (!redisUtil.tryLock("realtimeBasMap_" + lev)) {
- return false;//鍔犻攣澶辫触
+ List<MapNode> list = lists.get(x);
+ MapNode mapNode = list.get(y);
+ mapNode.setValue(col.getValue());//鎭㈠鍘熷鑺傜偣
+
+ //鏇存柊list
+ list.set(y, mapNode);
+ lists.set(x, list);
}
-
- Object o = redisUtil.get("realtimeBasMap_" + lev);
- if (o == null) {
- return false;
- }
-
- BasMap basMap = JSON.parseObject(o.toString(), BasMap.class);
- ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
- List<List<MapNode>> lists = filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
-
- NavigateMapData mapData = new NavigateMapData(nodes.get(0).getZ());
- List<List<MapNode>> realMap = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
- for (NavigateNode node : nodes) {
- if (node.getZ() != lev) {
- continue;
- }
-
- List<MapNode> listX = lists.get(node.getX());
- MapNode mapNode = listX.get(node.getY());
- if (lock) {
- mapNode.setValue(-999);//绂佺敤搴撲綅
- } else {
- //鑾峰彇鍘熷鑺傜偣鏁版嵁
- List<MapNode> rows = realMap.get(node.getX());
- MapNode col = rows.get(node.getY());
- mapNode.setValue(col.getValue());//鎭㈠搴撲綅
- }
-
- listX.set(node.getY(), mapNode);
- lists.set(node.getX(), listX);
- }
- basMap.setData(JSON.toJSONString(lists));
- basMap.setUpdateTime(new Date());
- //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set("realtimeBasMap_" + lev, JSON.toJSONString(basMap));
- } catch (Exception e) {
- e.printStackTrace();
}
- return true;
+
+ return lists;
}
}
--
Gitblit v1.9.1