|
|
|
|
@ -10,7 +10,7 @@ from src.auth.service import CurrentUser
|
|
|
|
|
from src.config import AEROS_BASE_URL, DEFAULT_PROJECT_NAME
|
|
|
|
|
from src.database.core import DbSession
|
|
|
|
|
from src.database.service import search_filter_sort_paginate
|
|
|
|
|
from .model import AerosEquipment, AerosEquipmentDetail, MasterEquipment
|
|
|
|
|
from .model import AerosEquipment, AerosEquipmentDetail, MasterEquipment, AerosEquipmentGroup
|
|
|
|
|
from .schema import EquipmentConfiguration
|
|
|
|
|
from src.aeros_project.model import AerosProject
|
|
|
|
|
from src.aeros_simulation.model import AerosNode
|
|
|
|
|
@ -288,11 +288,17 @@ async def update_equipment_for_simulation(*, db_session: DbSession, project_name
|
|
|
|
|
AerosNode.node_type == "RegularNode"
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
rbd_group = Select(AerosEquipmentGroup)
|
|
|
|
|
|
|
|
|
|
print("Getting equipment nodes")
|
|
|
|
|
|
|
|
|
|
equipment_nodes = await db_session.execute(equipments)
|
|
|
|
|
rbd_group_nodes = await db_session.execute(rbd_group)
|
|
|
|
|
|
|
|
|
|
group_nodes = [group.group_name for group in rbd_group_nodes.scalars().all()]
|
|
|
|
|
reg_nodes = [node.location_tag for node in equipment_nodes.scalars().all()]
|
|
|
|
|
|
|
|
|
|
reg_nodes.extend(group_nodes)
|
|
|
|
|
|
|
|
|
|
nodes_data = await get_aeros_equipment_by_location_tag(
|
|
|
|
|
location_tag=reg_nodes, project_name=project_name
|
|
|
|
|
|