|
@@ -9,7 +9,6 @@ from sqlalchemy.orm import Session
|
|
|
|
|
|
from app.api.dependencies.db import get_db
|
|
|
from app.controllers.equipment.fcu.basic import get_fcu_control_result
|
|
|
-from app.controllers.equipment.fcu.q_learning import get_fcu_q_learning_control_result
|
|
|
from app.controllers.equipment.vav import get_vav_control_v1, get_vav_control_v2
|
|
|
from app.models.domain.equipment import EquipmentControlResponse, EquipmentControlRequest
|
|
|
from app.utils.date import get_time_str
|
|
@@ -30,10 +29,7 @@ async def get_equipment_command_test(
|
|
|
equip_type: EquipmentName = Query(..., alias='equipType')
|
|
|
):
|
|
|
if equip_type.value == EquipmentName.FCU:
|
|
|
- if project_id in ['Pj1101050030', 'Pj1101080259']:
|
|
|
- output = await get_fcu_control_result(project_id, equip_id)
|
|
|
- else:
|
|
|
- output = await get_fcu_q_learning_control_result(project_id, equip_id)
|
|
|
+ output = await get_fcu_control_result(project_id, equip_id)
|
|
|
elif equip_type.value == EquipmentName.VAV:
|
|
|
vav = await get_vav_control_v1(project_id, equip_id)
|
|
|
output = {
|
|
@@ -56,13 +52,7 @@ async def get_equipment_command_test(
|
|
|
@router.post('/control', response_model=EquipmentControlResponse)
|
|
|
async def get_equipment_command(equipment_control_info: EquipmentControlRequest):
|
|
|
if equipment_control_info.equipType == EquipmentName.FCU:
|
|
|
- if equipment_control_info.projectId in ['Pj1101050030', 'Pj1101080259']:
|
|
|
- output = await get_fcu_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
|
|
|
- else:
|
|
|
- output = await get_fcu_q_learning_control_result(
|
|
|
- equipment_control_info.projectId,
|
|
|
- equipment_control_info.equipId
|
|
|
- )
|
|
|
+ output = await get_fcu_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
|
|
|
elif equipment_control_info.equipType == EquipmentName.VAV:
|
|
|
vav = await get_vav_control_v1(equipment_control_info.projectId, equipment_control_info.equipId)
|
|
|
output = {
|