Browse Source

use water in temperature

highing666 4 years ago
parent
commit
76362a0f72
3 changed files with 7 additions and 5 deletions
  1. 5 5
      app/controllers/equipment/fcu/basic.py
  2. 1 0
      app/schemas/equipment.py
  3. 1 0
      app/services/platform.py

+ 5 - 5
app/controllers/equipment/fcu/basic.py

@@ -97,8 +97,8 @@ class FCUControllerV2(EquipmentController):
         self.season = season
 
     def get_mode(self) -> int:
-        if not np.isnan(self.equipment.water_out_temperature):
-            if self.equipment.water_out_temperature > self.equipment.space.temperature_target:
+        if not np.isnan(self.equipment.water_in_temperature):
+            if self.equipment.water_in_temperature > self.equipment.space.temperature_target:
                 mode = 2
             else:
                 mode = 1
@@ -175,10 +175,10 @@ async def get_fcu_control_result(project_id: str, equipment_id: str) -> Dict:
         spaces = await duo_duo.get_space_by_equipment(equipment_id)
         if project_id == 'Pj1101150003':
             supply_air_temperature = await platform.get_realtime_data(InfoCode.supply_temperature, equipment_id)
-            water_out_temperature = await platform.get_realtime_data(InfoCode.water_out_temperature, equipment_id)
+            water_in_temperature = await platform.get_realtime_data(InfoCode.water_in_temperature, equipment_id)
         else:
             supply_air_temperature = np.NAN
-            water_out_temperature = np.NAN
+            water_in_temperature = np.NAN
         for sp in spaces:
             transfer = SpaceInfoService(client, project_id, sp.get('id'))
             current_target = await transfer.get_current_temperature_target()
@@ -196,7 +196,7 @@ async def get_fcu_control_result(project_id: str, equipment_id: str) -> Dict:
             'id': equipment_id,
             'space': space,
             'supply_air_temperature': supply_air_temperature,
-            'water_out_temperature': water_out_temperature
+            'water_in_temperature': water_in_temperature
         }
         fcu = FCU(**fcu_temp_params)
 

+ 1 - 0
app/schemas/equipment.py

@@ -31,6 +31,7 @@ class FCU(BaseEquipment):
     setting_temperature: Optional[float] = 0.0
     supply_air_temperature: Optional[float] = 0.0
     water_out_temperature: Optional[float] = 0.0
+    water_in_temperature: Optional[float] = 0.0
 
 
 class VAVBox(BaseEquipment):

+ 1 - 0
app/services/platform.py

@@ -40,6 +40,7 @@ class InfoCode(str, Enum):
     work_mode_set = 'WorkModeSet'
     supply_temperature = 'SupplyTemp'
     water_out_temperature = 'WaterOutTemp'
+    water_in_temperature = 'WaterInTemp'
 
 
 class DataPlatformService(Service):