From fd5d26ae0d1dbf71f90b99ef84d09a34e2d10d83 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 10:45:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 130 ++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 7b73bf1..66a14d2 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -1,24 +1,18 @@
package com.zy.common.utils;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
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.*;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -27,21 +21,7 @@
@Component
public class NavigateMapData {
- private Integer lev;//鍦板浘妤煎眰
-
- public Integer getLev() {
- return lev;
- }
-
- public void setLev(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 {
// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
@@ -72,7 +52,7 @@
InputStream inputStream = classPathResource.getInputStream();
byte[] buffer = new byte[inputStream.available()];
inputStream.read(buffer);
- File file = File.createTempFile("prefix","suffix");
+ File file = File.createTempFile("prefix", "suffix");
try (OutputStream outStream = new FileOutputStream(file)) {
outStream.write(buffer);
}
@@ -119,7 +99,7 @@
/**
* 灏濊瘯浠巖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(RedisKeyType.MAP.key + lev);
if (o == null) {
@@ -127,13 +107,13 @@
}
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()][];
@@ -152,58 +132,58 @@
return map;
}
- //鑾峰彇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鏍煎紡鏁版嵁
+// 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);
// }
//
-// //瑙ｆ瀽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;
- }
+// 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;
+// }
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
--
Gitblit v1.9.1