Forráskód Böngészése

add get_db Depends

chenhaiyang 4 éve
szülő
commit
83f853550e
1 módosított fájl, 10 hozzáadás és 5 törlés
  1. 10 5
      app/api/routers/equipment.py

+ 10 - 5
app/api/routers/equipment.py

@@ -2,9 +2,11 @@
 
 from enum import Enum
 
-from fastapi import APIRouter, Query
+from fastapi import APIRouter, Depends, Query
 from loguru import logger
+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_result
@@ -25,6 +27,7 @@ async def get_equipment_command_test(
         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'),
+        db: Session = Depends(get_db)
 ):
     if equip_type.value == EquipmentName.FCU:
         if project_id == 'Pj1101050030':
@@ -32,7 +35,7 @@ async def get_equipment_command_test(
         else:
             output = await get_fcu_q_learning_control_result(project_id, equip_id)
     elif equip_type.value == EquipmentName.VAV:
-        vav = await get_vav_control_result(project_id, equip_id)
+        vav = await get_vav_control_result(db, project_id, equip_id)
         output = {
             'SupplyAirFlowSet': vav.supply_air_flow_set
         }
@@ -49,7 +52,7 @@ async def get_equipment_command_test(
 
 
 @router.post('/control', response_model=EquipmentControlResponse)
-async def get_equipment_command(equipment_control_info: EquipmentControlRequest):
+async def get_equipment_command(equipment_control_info: EquipmentControlRequest, db: Session = Depends(get_db)):
     if equipment_control_info.equipType == EquipmentName.FCU:
         if equipment_control_info.projectId == 'Pj1101050030':
             output = await get_fcu_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
@@ -59,9 +62,11 @@ async def get_equipment_command(equipment_control_info: EquipmentControlRequest)
                 equipment_control_info.equipId
             )
     elif equipment_control_info.equipType == EquipmentName.VAV:
-        vav = await get_vav_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
+        vav = await get_vav_control_result(db, equipment_control_info.projectId, equipment_control_info.equipId)
         output = {
-            'SupplyAirFlowSet': vav.supply_air_flow_set
+            'SupplyAirFlowSet': vav.supply_air_flow_set,
+            'VirtualRealtimeTemperature': vav.virtual_realtime_temperature,
+            'TargetTemperatureSet': vav.virtual_target_temperature
         }
     else:
         output = {}