From 23de5c5ae77912bcbf40977f5db08d60b444ed76 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 18 十二月 2024 14:13:23 +0800
Subject: [PATCH] #拐点惩罚复位
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 147 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 114 insertions(+), 33 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..7b73bf1 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.*;
@@ -25,11 +29,11 @@
private Integer lev;//鍦板浘妤煎眰
- public NavigateMapData() {
- this.lev = 1;
+ public Integer getLev() {
+ return lev;
}
- public NavigateMapData(Integer lev) {
+ public void setLev(Integer lev) {
this.lev = lev;
}
@@ -39,10 +43,40 @@
public int[][] getData(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 +103,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;
}
@@ -84,7 +121,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;
}
@@ -118,10 +155,28 @@
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(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);//杩囨护鍦板浘鏁版嵁
+// return lists;
- 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");
@@ -136,12 +191,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;
}
@@ -149,10 +208,27 @@
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(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);//杩囨护鍦板浘鏁版嵁
+// return lists;
- 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");
@@ -167,12 +243,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;
}
@@ -264,23 +344,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