From 6efee0aeb0bada6e10af55e13d469ff52572fdfb Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 25 一月 2024 13:51:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/RgvUtils.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/RgvUtils.java b/src/main/java/com/zy/common/utils/RgvUtils.java
index 8284f61..972607b 100644
--- a/src/main/java/com/zy/common/utils/RgvUtils.java
+++ b/src/main/java/com/zy/common/utils/RgvUtils.java
@@ -39,13 +39,13 @@
}
//閿佸畾/瑙ｉ攣璺緞
- public static void lockPath(Integer startPath, Integer endPath, Integer rgvNo, boolean lock) {
+ public static void lockPath(Integer startPath, Integer endPath, Integer rgvNo, Integer wrkNo, boolean lock) {
List<RgvNode> pathList = getPathList(startPath, endPath);//閫氳繃璧风偣鍜岀洰鏍囩偣鑾峰彇琛岃蛋璺緞
- lockPath(pathList, rgvNo, lock);
+ lockPath(pathList, rgvNo, wrkNo, lock);
}
//閿佸畾/瑙ｉ攣璺緞
- public static void lockPath(List<RgvNode> pathList, Integer rgvNo, boolean lock) {
+ public static void lockPath(List<RgvNode> pathList, Integer rgvNo, Integer wrkNo, boolean lock) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
Object data = redisUtil.get("rgv_map");
List<RgvNode> rgvNodes = JSON.parseArray(data.toString(), RgvNode.class);//瀹炴椂鍦板浘
@@ -59,10 +59,12 @@
//璺緞鐩稿悓
if (lock) {
rgvNode.setLock(true);//閿佸畾
- rgvNode.setRgvNo(rgvNo);
+ rgvNode.setRgvNo(rgvNo);//RGV鍙�
+ rgvNode.setWrkNo(wrkNo);//宸ヤ綔鍙�
} else {
rgvNode.setLock(false);//瑙ｉ攣
rgvNode.setRgvNo(0);
+ rgvNode.setRgvNo(0);
}
}
}
--
Gitblit v1.9.1