From d9248408fbaf28f25dfcf8e5ec3a5372e7a7c5a3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 七月 2023 10:48:55 +0800
Subject: [PATCH] RGV路径解锁
---
src/main/java/com/zy/common/utils/RgvUtils.java | 14 ++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 5be7d4a..05d2f26 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1794,6 +1794,9 @@
wrkMast1.setWrkSts(27L);//27.RGV鏀捐揣瀹屾垚
}
+ //瑙ｉ攣璺緞
+ RgvUtils.unLockPath(wrkMast1.getRgvNo());
+
wrkMast1.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast1) == 0) {
log.error("宸ヤ綅1淇敼宸ヤ綔妗ｇ姸鎬佸け璐ワ紒锛侊紝宸ヤ綔鍙�={}", wrkMast1.getWrkNo());
diff --git a/src/main/java/com/zy/common/utils/RgvUtils.java b/src/main/java/com/zy/common/utils/RgvUtils.java
index 37766e6..8284f61 100644
--- a/src/main/java/com/zy/common/utils/RgvUtils.java
+++ b/src/main/java/com/zy/common/utils/RgvUtils.java
@@ -68,6 +68,20 @@
}
}
+ //瑙ｉ攣璺緞锛岄�氳繃RGV鍙疯繘琛岃В閿併�傛敞鎰忥細璋冪敤姝ゆ柟娉曚細瑙ｉ攣RGV鍙峰搴旇溅杈嗗叏閮ㄨ矾寰�
+ public static void unLockPath(Integer rgvNo) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ Object data = redisUtil.get("rgv_map");
+ List<RgvNode> rgvNodes = JSON.parseArray(data.toString(), RgvNode.class);//瀹炴椂鍦板浘
+ for (RgvNode rgvNode : rgvNodes) {//閬嶅巻瀹炴椂鍦板浘
+ if (rgvNode.getRgvNo().equals(rgvNo)) {
+ //RGV鍙风浉鍚�
+ rgvNode.setLock(false);//瑙ｉ攣
+ rgvNode.setRgvNo(0);
+ }
+ }
+ }
+
//閫氳繃璧风偣鍜岀洰鏍囩偣鑾峰彇琛岃蛋璺緞
public static List<RgvNode> getPathList(Integer startPath, Integer endPath) {
int result = startPath - endPath;
--
Gitblit v1.9.1