From 0f1afa9e4e9d72659fd16c3c1bdb9e7a827602d7 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期六, 17 一月 2026 19:34:10 +0800
Subject: [PATCH] agv可入优化
---
src/main/java/com/zy/asrs/task/handler/AgvHandler.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
index bffa244..7d8fa87 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -480,12 +480,31 @@
return errorMsg;
}
- // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐�
- List<Integer> canInSites = basDevpMapper.getCanInSites(sites);
+ // 鍏堟鏌ョ珯鐐归厤缃紙canining="Y"鍙叆锛夛紝鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
+ List<BasDevp> devListWithConfig = basDevpMapper.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", sites)
+ .eq("in_enable", "Y")
+ .eq("canining", "Y")
+ .ne("dev_no", 0) // 鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
+ ).stream()
+ .filter(dev -> dev.getDevNo() != null && dev.getDevNo() != 0) // 鍐嶆杩囨护锛岀‘淇濅笉涓簄ull鎴�0
+ .collect(Collectors.toList());
+
+ if (devListWithConfig.isEmpty()) {
+ // 绔欑偣閰嶇疆涓嶅厑璁稿叆搴擄紙canining != "Y"锛夛紝鏆備笉鍒嗛厤锛岀瓑寰呴厤缃紑閫氾紙鍙湪瀹氭椂浠诲姟涓褰曟棩蹇楋級
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛堢珯鐐规湭寮�閫氬彲鍏ュ厑璁革細canining='Y'锛夛紝鏆備笉鍒嗛厤绔欑偣锛岀瓑寰呴厤缃紑閫�", task.getId());
+ return null; // 杩斿洖null锛岃〃绀烘殏涓嶅垎閰嶏紝绛夊緟閰嶇疆寮�閫�
+ }
+
+ // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐癸紙浠庡凡閰嶇疆鍙叆鐨勭珯鐐逛腑绛涢�夛級
+ List<Integer> configuredSites = devListWithConfig.stream()
+ .map(BasDevp::getDevNo)
+ .collect(Collectors.toList());
+ List<Integer> canInSites = basDevpMapper.getCanInSites(configuredSites);
if (canInSites.isEmpty()) {
- String errorMsg = "璇风瓑寰呭嚭搴撳畬鎴�";
- log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛坽}锛�", task.getId(), errorMsg);
- return errorMsg;
+ // 鎵�鏈夊凡閰嶇疆鍙叆鐨勭珯鐐归兘鏈夊嚭搴撲换鍔★紝鏆備笉鍒嗛厤锛岀瓑寰呬笅娆″畾鏃朵换鍔″啀灏濊瘯锛堝彧鍦ㄥ畾鏃朵换鍔′腑璁板綍鏃ュ織锛�
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛堣绛夊緟鍑哄簱瀹屾垚锛夛紝鏆備笉鍒嗛厤绔欑偣锛岀瓑寰呬笅娆″畾鏃朵换鍔″啀灏濊瘯", task.getId());
+ return null; // 杩斿洖null锛岃〃绀烘殏涓嶅垎閰嶏紝绛夊緟涓嬫瀹氭椂浠诲姟鍐嶅皾璇�
}
// 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛夛紝鎺掗櫎dev_no=0鐨勬棤鏁堢珯鐐�
@@ -499,6 +518,7 @@
.collect(Collectors.toList());
if (devList.isEmpty()) {
+ // 鐞嗚涓婁笉搴旇鍒拌繖閲岋紝鍥犱负鍓嶉潰宸茬粡妫�鏌ヨ繃浜嗭紝浣嗕负浜嗗畨鍏ㄨ捣瑙佽繕鏄繚鐣�
String errorMsg = "娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛�";
log.warn("浠诲姟ID锛歿}", errorMsg, task.getId());
return errorMsg;
--
Gitblit v1.9.1