Prechádzať zdrojové kódy

don't set fan gear set if it needs off

chenhaiyang 4 rokov pred
rodič
commit
30b4db68d8
2 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 4 3
      app/api/routers/equipment.py
  2. 0 1
      app/schemas/equipment.py

+ 4 - 3
app/api/routers/equipment.py

@@ -30,7 +30,7 @@ async def get_equipment_command(
     if equipType.value == EquipmentName.FCU:
         fcu = await get_fcu_control_result(projectId, equipId)
         output = {
-            'RunStatus': 1 if fcu.running_status else 0,
+            'EquipSwitchSet': 1 if fcu.running_status else 0,
             'WorkModeSet': 3,
             'FanGearSet': fcu.air_valve_speed.value,
             'IndoorAirTempSet': fcu.setting_temperature
@@ -57,11 +57,12 @@ async def get_equipment_command_v2(equipment_control_info: EquipmentControlReque
     if equipment_control_info.equipType == EquipmentName.FCU:
         fcu = await get_fcu_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
         output = {
-            'RunStatus': 1 if fcu.running_status else 0,
+            'EquipSwitchSet': 1 if fcu.running_status else 0,
             'WorkModeSet': 3,
-            'FanGearSet': fcu.air_valve_speed.value,
             'IndoorAirTempSet': int(round_half_up(fcu.setting_temperature, 1) * 10)
         }
+        if fcu.air_valve_speed.value != 0.0:
+            output.update({'FanGearSet': fcu.air_valve_speed.value})
     elif equipment_control_info.equipType == EquipmentName.VAV:
         vav = await get_vav_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
         output = {

+ 0 - 1
app/schemas/equipment.py

@@ -13,7 +13,6 @@ class AirValveSpeed(float, Enum):
     low = 1.0
     medium = 2.0
     high = 3.0
-    auto = 4.0
 
 
 class BaseEquipment(BaseModel):