diff --git a/unilabos/app/main.py b/unilabos/app/main.py index dcf9dcb4..2f7f825e 100644 --- a/unilabos/app/main.py +++ b/unilabos/app/main.py @@ -335,11 +335,12 @@ def main(): resource_edge_info.pop(edge_info - ind - 1) continue - tree_set = ResourceTreeSet.from_raw_list(request_startup_json["nodes"]) - for root_node in tree_set.root_nodes: 希望和本地的resources_config进行同步,根节点device - id能对上的且是resource的,则自动添加进来,根节点上不是device的,也包含进来 - device_id = root_node. - # tree_set.all_nodes + # 如果从远端获取了物料信息,则与本地物料进行同步 + if request_startup_json and "nodes" in request_startup_json: + print_status("开始同步远端物料到本地...", "info") + remote_tree_set = ResourceTreeSet.from_raw_list(request_startup_json["nodes"]) + resource_tree_set.merge_remote_resources(remote_tree_set) + print_status("远端物料同步完成", "info") # 使用 ResourceTreeSet 代替 list args_dict["resources_config"] = resource_tree_set