From b13b6baf03a0860d0aa7fe7536bf2313588bf8ae Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 02 三月 2025 16:54:53 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/MapController.java | 64 +++++++++++---------------------
1 files changed, 22 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index a4d9ec8..653bd64 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -50,22 +50,9 @@
@GetMapping("/map/getData/{lev}/auth")
@ManagerAuth
public String getMapData(@PathVariable("lev") Integer lev) {
- try {
- String mapFilename = "map.json";
- 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");
- BufferedReader br = new BufferedReader(isr);
- String lineTxt = null;
- while ((lineTxt = br.readLine()) != null) {
- stringBuffer.append(lineTxt);
- }
- br.close();
-
- //瑙ｆ瀽json鍦板浘鏁版嵁
- List<ArrayList> arrayLists = JSON.parseArray(stringBuffer.toString(), ArrayList.class);
+ BasMap basMap = basMapService.selectLatestMap(lev);
+ //瑙ｆ瀽json鍦板浘鏁版嵁
+ List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
// ArrayList<HashMap<String, Integer>> lineRows = new ArrayList<>();
// int dataRow = 0;
// int dataRowCount = 0;
@@ -95,11 +82,11 @@
// }
// }
- //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
- List<LocMast> locMasts = locMastService.selectLocByLev(lev);
- for (LocMast locMast : locMasts) {
- Integer row = locMast.getRow1();
- Integer bay = locMast.getBay1();
+ //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
+ List<LocMast> locMasts = locMastService.selectLocByLev(lev);
+ for (LocMast locMast : locMasts) {
+ Integer row = locMast.getRow1();
+ Integer bay = locMast.getBay1();
// for (HashMap<String, Integer> lineRow : lineRows) {
// if (row > lineRow.get("start") && row <= lineRow.get("end")) {
// row += lineRow.get("count");
@@ -107,28 +94,21 @@
// }
// }
- ArrayList rowData = arrayLists.get(row);
- Object o = rowData.get(bay);
- JSONObject jsonObject = JSON.parseObject(o.toString());
- if (DISABLE_LOC_NO.contains(locMast.getLocNo())) {
- //绂佹搴撲綅
- jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
- }
- jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
- jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
- //鏇存柊list
- rowData.set(bay, jsonObject);
- arrayLists.set(row, rowData);
- }
-
- return JSONObject.toJSONString(arrayLists);
- } else {
- System.out.println("鏂囦欢涓嶅瓨鍦�!");
+ ArrayList rowData = arrayLists.get(row);
+ Object o = rowData.get(bay);
+ JSONObject jsonObject = JSON.parseObject(o.toString());
+ if (DISABLE_LOC_NO.contains(locMast.getLocNo())) {
+ //绂佹搴撲綅
+ jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
}
- } catch (IOException ioException) {
- ioException.printStackTrace();
+ jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+ jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
+ //鏇存柊list
+ rowData.set(bay, jsonObject);
+ arrayLists.set(row, rowData);
}
- return null;
+
+ return JSONObject.toJSONString(arrayLists);
}
@RequestMapping("/map/searchData/auth")
@@ -228,7 +208,7 @@
public R resetMap(@PathVariable("lev") Integer lev) {
Object o = redisUtil.get("realtimeBasMap_" + lev);
if (o == null) {
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
redisUtil.del("realtimeBasMap_" + lev);
basMapService.deleteByLev(lev);
--
Gitblit v1.9.1