|
@@ -5,7 +5,7 @@ from enum import Enum
|
|
|
from fastapi import APIRouter, Query
|
|
|
from loguru import logger
|
|
|
|
|
|
-from app.controllers.equipment.fcu import get_fcu_control_result
|
|
|
+from app.controllers.equipment.fcu.basic import get_fcu_control_result
|
|
|
from app.controllers.equipment.vav import get_vav_control_result
|
|
|
from app.models.domain.equipment import EquipmentControlResponse, EquipmentControlRequest
|
|
|
from app.utils.date import get_time_str
|
|
@@ -20,23 +20,22 @@ class EquipmentName(str, Enum):
|
|
|
router = APIRouter()
|
|
|
|
|
|
|
|
|
-@router.get('/control', response_model=EquipmentControlResponse, tags=['equipment'])
|
|
|
+@router.get('/control', response_model=EquipmentControlResponse)
|
|
|
async def get_equipment_command(
|
|
|
- projectId: str = Query(..., max_length=50, regex='^Pj'),
|
|
|
- equipId: str = Query(..., max_length=50, regex='^Eq'),
|
|
|
- equipType: EquipmentName = Query(...),
|
|
|
- method: int = Query(3),
|
|
|
+ project_id: str = Query(..., max_length=50, regex='^Pj', alias='projectId'),
|
|
|
+ equip_id: str = Query(..., max_length=50, regex='^Eq', alias='equipId'),
|
|
|
+ equip_type: EquipmentName = Query(..., alias='equipType'),
|
|
|
):
|
|
|
- if equipType.value == EquipmentName.FCU:
|
|
|
- fcu = await get_fcu_control_result(projectId, equipId)
|
|
|
+ if equip_type.value == EquipmentName.FCU:
|
|
|
+ fcu = await get_fcu_control_result(project_id, equip_id)
|
|
|
output = {
|
|
|
'EquipSwitchSet': 1 if fcu.running_status else 0,
|
|
|
'WorkModeSet': 3,
|
|
|
'FanGearSet': fcu.air_valve_speed.value,
|
|
|
'IndoorAirTempSet': fcu.setting_temperature
|
|
|
}
|
|
|
- elif equipType.value == EquipmentName.VAV:
|
|
|
- vav = await get_vav_control_result(projectId, equipId)
|
|
|
+ elif equip_type.value == EquipmentName.VAV:
|
|
|
+ vav = await get_vav_control_result(project_id, equip_id)
|
|
|
output = {
|
|
|
'SupplyAirFlowSet': vav.supply_air_flow_set
|
|
|
}
|
|
@@ -44,15 +43,15 @@ async def get_equipment_command(
|
|
|
output = {}
|
|
|
|
|
|
response = {
|
|
|
- 'projectId': projectId,
|
|
|
- 'equipId': equipId,
|
|
|
+ 'projectId': project_id,
|
|
|
+ 'equipId': equip_id,
|
|
|
'time': get_time_str(),
|
|
|
'output': output
|
|
|
}
|
|
|
return response
|
|
|
|
|
|
|
|
|
-@router.post('/control', response_model=EquipmentControlResponse, tags=['equipment'])
|
|
|
+@router.post('/control', response_model=EquipmentControlResponse)
|
|
|
async def get_equipment_command_v2(equipment_control_info: EquipmentControlRequest):
|
|
|
if equipment_control_info.equipType == EquipmentName.FCU:
|
|
|
fcu = await get_fcu_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
|