From 9a3dd3c806104ce59abcba635e67355573bd68ac Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 二月 2026 15:54:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 8a199cc..9dfa3f9 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -177,6 +177,8 @@
HashMap<Integer, List<StationObjModel>> inStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> isOutOrderStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> isLiftTransferStationMap = new HashMap<>();
for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
Integer lev = entry.getKey();
@@ -192,17 +194,18 @@
HashMap<String, Object> nodeData = new HashMap<>();
nodeData.put("value", map.get("value"));
- String nodeType = map.get("bgColor").toString();
- if (nodeType.equals("RGB(0,176,80)")) {
+ String bgColor = map.get("bgColor").toString();
+ String nodeType = map.get("nodeType").toString();
+ if (nodeType.equals("shelf")) {
//璐ф灦
nodeData.put("type", "shelf");
- } else if (nodeType.equals("RGB(255,192,0)")) {
+ } else if (nodeType.equals("crn")) {
//鍫嗗灈鏈�
nodeData.put("type", "crn");
- } else if (nodeType.equals("RGB(255,255,0)")) {
+ } else if (nodeType.equals("dualCrn")) {
//鍙屽伐浣嶅爢鍨涙満
nodeData.put("type", "dualCrn");
- } else if (nodeType.equals("RGB(0,112,192)")) {
+ } else if (nodeType.equals("devp")) {
//杈撻�佺嚎
nodeData.put("type", "devp");
@@ -266,7 +269,21 @@
runBlockReassignStationList.add(stationObjModel);
runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
}
- } else if (nodeType.equals("RGB(0,176,240)")) {
+
+ Integer isOutOrder = value.getInteger("isOutOrder");
+ if (isOutOrder != null && isOutOrder == 1) {
+ List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ isOutOrderStationList.add(stationObjModel);
+ isOutOrderStationMap.put(deviceNo, isOutOrderStationList);
+ }
+
+ Integer isLiftTransfer = value.getInteger("isLiftTransfer");
+ if (isLiftTransfer != null && isLiftTransfer == 1) {
+ List<StationObjModel> isLiftTransferStationList = isLiftTransferStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ isLiftTransferStationList.add(stationObjModel);
+ isLiftTransferStationMap.put(deviceNo, isLiftTransferStationList);
+ }
+ } else if (nodeType.equals("rgv")) {
//RGV
nodeData.put("type", "rgv");
} else if (nodeType.equals("none")) {
@@ -275,6 +292,7 @@
} else if (nodeType.equals("merge")) {
//鍚堝苟鍖哄煙
nodeData.put("type", "merge");
+ nodeData.put("mergeType", map.get("mergeType"));
}
nodeData.put("cellWidth", map.get("cellWidth"));
@@ -314,6 +332,8 @@
List<StationObjModel> inStationList = inStationMap.get(deviceNo);
List<StationObjModel> outStationList = outStationMap.get(deviceNo);
List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
+ List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.get(deviceNo);
+ List<StationObjModel> isLiftTransferStationList = isLiftTransferStationMap.get(deviceNo);
if (barcodeStationList != null) {
basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -331,6 +351,14 @@
basDevp.setRunBlockReassignLocStationList(JSON.toJSONString(runBlockReassignStationList, SerializerFeature.DisableCircularReferenceDetect));
}
+ if (isOutOrderStationList != null) {
+ basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
+ if (isLiftTransferStationList != null) {
+ basDevp.setIsLiftTransferList(JSON.toJSONString(isLiftTransferStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
basDevp.setUpdateTime(new Date());
basDevpService.insertOrUpdate(basDevp);
--
Gitblit v1.9.1