From 18d258c246cb9e4812964968769eb32fa990065a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 11 七月 2024 16:44:00 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java
index bc5372f..d27a157 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java
@@ -9,6 +9,7 @@
import com.zy.asrs.wcs.core.domain.dto.RedisMapDto;
import com.zy.asrs.wcs.core.entity.Loc;
import com.zy.asrs.wcs.core.model.MapNode;
+import com.zy.asrs.wcs.core.model.enums.MapNodeType;
import com.zy.asrs.wcs.core.model.enums.NavigationMapType;
import com.zy.asrs.wcs.core.service.LocService;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
@@ -157,7 +158,7 @@
//瀛樺湪绌虹己鑺傜偣锛岃嚜鍔ㄨˉ瓒�
for (int i = defaultBay; i < node.getBay(); i++) {
MapNode mapNode = new MapNode();
- mapNode.setValue(-1);
+ mapNode.setValue(MapNodeType.DISABLE.id);
mapNode.setTop(1000);
mapNode.setBottom(1000);
mapNode.setLeft(1000);
@@ -184,7 +185,7 @@
ArrayList<ArrayList<MapNode>> lists = entry.getValue();//鑾峰彇鍦板浘
MapNode mapNode = new MapNode();
- mapNode.setValue(-1);
+ mapNode.setValue(MapNodeType.DISABLE.id);
mapNode.setTop(1000);
mapNode.setBottom(1000);
mapNode.setLeft(1000);
@@ -312,12 +313,12 @@
|| loc.getLocSts$().equals("D")
|| loc.getLocSts$().equals("X")
) {
- mapNode.setValue(-1);//绂佺敤鑺傜偣
+ mapNode.setValue(MapNodeType.DISABLE.id);//绂佺敤鑺傜偣
}
} else if (mapType == NavigationMapType.NORMAL.id) {
//杩囨护搴撲綅鐘舵�乆
if (loc.getLocSts$().equals("X")) {
- mapNode.setValue(-1);//绂佺敤鑺傜偣
+ mapNode.setValue(MapNodeType.DISABLE.id);//绂佺敤鑺傜偣
}
}
@@ -334,7 +335,7 @@
int y = points[1];
List<MapNode> list = lists.get(x);
MapNode mapNode = list.get(y);
- mapNode.setValue(66);//璁剧疆涓鸿溅杈嗕唬鐮�66
+ mapNode.setValue(MapNodeType.CAR.id);//璁剧疆涓鸿溅杈嗕唬鐮�66
//鏇存柊list
list.set(y, mapNode);
lists.set(x, list);
--
Gitblit v1.9.1