瀏覽代碼

modify ATVI request params

highing666 2 年之前
父節點
當前提交
f0a3b9a5b1
共有 3 個文件被更改,包括 11 次插入10 次删除
  1. 1 5
      app/controllers/equipment/vrf/basic.py
  2. 9 4
      app/models/domain/devices.py
  3. 1 1
      docker-compose.yml

+ 1 - 5
app/controllers/equipment/vrf/basic.py

@@ -89,7 +89,6 @@ class VRFController(EquipmentController):
                         or self.feedback == FeedbackValue.so_cold
                 ):
                     if self.feedback == FeedbackValue.so_cold:
-                        logger.debug("so_cold")
                         if self.device.speed == "LL":
                             new_temperature_set = self.device.current_temperature_set + 2.0
                         else:
@@ -273,7 +272,6 @@ class VRFController(EquipmentController):
 
     async def run(self):
         try:
-            logger.debug(self.device.current_temperature_set - 1)
             self.get_switch_set()
             self.get_speed_set()
             self.get_temperature_set()
@@ -332,14 +330,12 @@ def transform_mode(mode_value: float) -> VRFMode:
 @logger.catch
 @missing_iot_data_handler
 async def build_acatvi_instructions(params: ACATVIInstructionsRequest) -> Dict:
-    work_mode = transform_mode(params.work_mode)
-
     vrf = VRF(
         return_air_temp=params.return_air_temperature,
         current_temperature_set=params.current_temperature_set,
         speed=params.current_speed,
         running_status=params.running_status,
-        work_mode=work_mode,
+        work_mode=params.work_mode,
     )
 
     controller = VRFController(vrf, params.space_temperature_target, params.space_realtime_temperature, params.feedback,

+ 9 - 4
app/models/domain/devices.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel, Field
 from app.controllers.equipment.switch import SwitchSet
 from app.models.domain.feedback import FeedbackValue
 from app.schemas.season import Season
+from app.schemas.equipment import VRFMode
 
 
 class ThermalMode(str, Enum):
@@ -38,7 +39,7 @@ class ACATVIInstructionsRequest(BaseModel):
     device_id: str
     return_air_temperature: Optional[float]
     running_status: Optional[bool]
-    work_mode: Optional[float]
+    work_mode: VRFMode
     current_speed: Optional[str]
     current_temperature_set: Optional[float]
     space_temperature_target: Optional[float]
@@ -124,21 +125,21 @@ class Space(BaseModel):
 
 
 class ACATVASpace(Space):
-    space_temperature_target: Optional[float]
+    temperature_target: Optional[float]
     vav_default_weight: Optional[float]
     vav_temporary_weight: Optional[float]
     vav_temporary_update_time: Optional[str]
 
 
 class ACATAHSpace(Space):
-    space_temperature_target: Optional[float]
+    temperature_target: Optional[float]
     ahu_default_weight: Optional[float]
     ahu_temporary_weight: Optional[float]
     ahu_temporary_update_time: Optional[str]
 
 
 class ACATFUSpace(Space):
-    space_realtime_co2: Optional[float]
+    realtime_co2: Optional[float]
 
 
 class ACATVAInstructionsRequestBase(BaseModel):
@@ -235,6 +236,10 @@ class ACATFUSwitchSetRequest(SwitchSetRequestBase):
     break_end_time: Optional[str]
 
 
+class ACATFUCO2SwitchSetRequest(ACATFUSwitchSetRequest):
+    co2_list: List[float]
+
+
 class ACATFUSwitchSetResponse(SwitchSetResponseBase):
     pass
 

+ 1 - 1
docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   app:
-      image: registry.persagy.com/sagacloud/saga_algo_api:0.4.4
+      image: registry.persagy.com/sagacloud/saga_algo_api:0.4.5
       container_name: saga_algo_api
       ports:
         - "8002:8002"