From db576395617232b8526ff59cbb29014437af7c8c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十二月 2024 16:00:46 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/agv.py | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/agv.py b/zy-acs-manager/src/main/resources/agv.py
index 2634411..245bb6e 100644
--- a/zy-acs-manager/src/main/resources/agv.py
+++ b/zy-acs-manager/src/main/resources/agv.py
@@ -97,9 +97,20 @@
# 灏� dynamicMatrix 杞崲涓� numpy 缁撴瀯鍖栨暟缁�
def convert_to_structured_array(dynamicMatrix):
# 瀹氫箟缁撴瀯鍖栨暟缁勭殑 dtype
- dtype = [('serial', int), ('vehicle', 'U2')]
+ dtype = [('serial', int), ('vehicle', 'U2'), ('time', int)]
+
+ # 纭繚姣忎釜瀛楀吀鍖呭惈鎵�鏈夊瓧娈�
+ structured_list = []
+ for row in dynamicMatrix:
+ for d in row:
+ # 鎻愬彇瀛楁锛岀‘淇� 'time' 瀛樺湪锛屽惁鍒欒缃负榛樿鍊硷紙渚嬪 0.0锛�
+ serial = d.get('serial', 0)
+ vehicle = d.get('vehicle', '0')
+ time_val = d.get('time', 0)
+ structured_list.append((serial, vehicle, time_val))
+
# 灏嗗祵濂楃殑鍒楄〃杞崲涓虹粨鏋勫寲鏁扮粍
- structured_array = np.array([tuple(d.values()) for row in dynamicMatrix for d in row], dtype=dtype)
+ structured_array = np.array(structured_list, dtype=dtype)
# 閲嶅涓哄師濮嬬殑浜岀淮褰㈢姸
return structured_array.reshape(len(dynamicMatrix), -1)
--
Gitblit v1.9.1