From 8ef2bb5e46d84594e6ed632c07ea0b47a1bf6c4d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 11 十二月 2024 16:15:17 +0800
Subject: [PATCH] #path similarity
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapUtils.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 93 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapUtils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapUtils.java
index 26179cc..2b872d7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapUtils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapUtils.java
@@ -1,10 +1,14 @@
package com.zy.asrs.wcs.core.utils;
import com.alibaba.fastjson.JSON;
-import com.zy.asrs.framework.common.SpringUtils;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.wcs.core.domain.dto.RedisMapDto;
import com.zy.asrs.wcs.core.model.MapNode;
import com.zy.asrs.wcs.core.model.NavigateNode;
+import com.zy.asrs.wcs.core.model.enums.MapNodeType;
import com.zy.asrs.wcs.core.model.enums.NavigationMapType;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,13 +23,16 @@
@Autowired
private NavigateMapData navigateMapData;
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private ObjectMapper objectMapper;
/**
* 鍐欏叆璺緞鑺傜偣鏁版嵁鍒皉edis鍦板浘涓�
* lock涓簍rue 绂佺敤搴撲綅锛宭ock涓篺alse鎭㈠搴撲綅
*/
public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, Integer shuttleNo, List<NavigateNode> nodes, boolean lock) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
try {
if (nodes.isEmpty()) {
return true;
@@ -46,15 +53,28 @@
List<List<MapNode>> listsHasShuttle = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, shuttlePoints);//鑾峰彇甯﹀皬杞﹀湴鍥炬暟鎹�
List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ //妫�娴嬭妭鐐规槸鍚︿负褰撳墠璁惧
+ for (NavigateNode node : nodes) {
+ List<MapNode> listX = listsHasShuttle.get(node.getX());
+ MapNode mapNode = listX.get(node.getY());
+ if (mapNode.getLockDeviceNo() == null) {
+ continue;
+ }
+
+ if (!mapNode.getLockDeviceNo().equals(shuttleNo)) {
+ return false;//璺緞鎵�灞炴潈涓嶆槸褰撳墠璁惧
+ }
+ }
+
//妫�娴嬭矾寰勬槸鍚﹁閿佸畾
if (lock) {
for (NavigateNode node : nodes) {
List<MapNode> listX = listsHasShuttle.get(node.getX());
MapNode mapNode = listX.get(node.getY());
- if (mapNode.getValue() == -999) {
+ if (mapNode.getValue().equals(MapNodeType.LOCK.id)) {
return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
}
- if (mapNode.getValue() == 66) {
+ if (mapNode.getValue().equals(MapNodeType.CAR.id)) {
return false;//璺緞瀛樺湪灏忚溅锛岀姝㈤攣瀹�
}
}
@@ -71,12 +91,14 @@
List<MapNode> listX = lists.get(node.getX());
MapNode mapNode = listX.get(node.getY());
if (lock) {
- mapNode.setValue(-999);//绂佺敤搴撲綅
+ mapNode.setValue(MapNodeType.LOCK.id);//绂佺敤搴撲綅
+ mapNode.setLockDeviceNo(shuttleNo);
} else {
//鑾峰彇鍘熷鑺傜偣鏁版嵁
List<MapNode> rows = realMap.get(node.getX());
MapNode col = rows.get(node.getY());
mapNode.setValue(col.getValue());//鎭㈠搴撲綅
+ mapNode.setLockDeviceNo(null);
}
listX.set(node.getY(), mapNode);
@@ -85,7 +107,10 @@
redisMap.setData(JSON.toJSONString(lists));
redisMap.setUpdateTime(new Date());
//灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set(DeviceRedisConstant.MAP + lev, JSON.toJSONString(redisMap));
+ redisUtil.set(DeviceRedisConstant.MAP + lev, JSON.toJSONString(redisMap, SerializerFeature.DisableCircularReferenceDetect));
+
+ //淇濆瓨璺緞閿佽妭鐐�
+ saveLockPath(lev, nodes, lock);
return true;
} catch (Exception e) {
e.printStackTrace();
@@ -93,4 +118,66 @@
return false;
}
+ //淇濆瓨璺緞閿佽妭鐐�
+ public void saveLockPath(Integer lev, List<NavigateNode> nodes, boolean lock) {
+ Object o = redisUtil.get(DeviceRedisConstant.LOCK_PATH + lev);
+ List<NavigateNode> navigateNodes = new ArrayList<>();
+ if (o != null) {
+ try {
+ navigateNodes = objectMapper.readValue(o.toString(), new TypeReference<List<NavigateNode>>() {});
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ String nodeStr = null;
+ if (lock) {
+ navigateNodes.addAll(nodes);
+ try {
+ nodeStr = objectMapper.writeValueAsString(navigateNodes);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ redisUtil.set(DeviceRedisConstant.LOCK_PATH + lev, nodeStr);
+ }else {
+ List<NavigateNode> tmp = new ArrayList<>();
+ for (NavigateNode navigateNode : navigateNodes) {
+ boolean flag = true;
+ for (NavigateNode node : nodes) {
+ if (navigateNode.getX() == node.getX()
+ && navigateNode.getY() == node.getY()
+ && navigateNode.getZ() == node.getZ()) {
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag) {
+ tmp.add(navigateNode);
+ }
+ }
+
+ try {
+ nodeStr = objectMapper.writeValueAsString(tmp);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ redisUtil.set(DeviceRedisConstant.LOCK_PATH + lev, nodeStr);
+ }
+ }
+
+ //鑾峰彇璺緞閿佽妭鐐�
+ public List<NavigateNode> getLockPath(Integer lev) {
+ Object obj = redisUtil.get(DeviceRedisConstant.LOCK_PATH + lev);
+ List<NavigateNode> navigateNodes = new ArrayList<>();
+ if (obj != null) {
+ try {
+ navigateNodes = objectMapper.readValue(obj.toString(), new TypeReference<List<NavigateNode>>() {});
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return navigateNodes;
+ }
+
}
--
Gitblit v1.9.1