Browse Source

adjust models related files's path

chenhaiyang 4 years ago
parent
commit
592255eae1

+ 1 - 1
app/api/routers/equipment.py

@@ -7,7 +7,7 @@ from loguru import logger
 
 from app.controllers.equipment.fcu import get_fcu_control_result
 from app.controllers.equipment.vav import get_vav_control_result
-from app.models.schemas.equipment import EquipmentControlResponse, EquipmentControlRequest
+from app.models.domain.equipment import EquipmentControlResponse, EquipmentControlRequest
 from app.utils.date import get_time_str
 from app.utils.math import round_half_up
 

+ 1 - 1
app/api/routers/space.py

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter, Query
 
-from app.models.schemas.space import SpaceControlResponse
+from app.models.domain.space import SpaceControlResponse
 
 router = APIRouter()
 

+ 1 - 1
app/api/routers/targets.py

@@ -4,7 +4,7 @@ from fastapi import APIRouter, HTTPException, Query
 from loguru import logger
 
 from app.controllers.targets import readjust_all_target
-from app.models.schemas.targets import TargetReadjustResponse
+from app.models.domain.targets import TargetReadjustResponse
 from app.utils.date import get_time_str
 
 router = APIRouter()

+ 1 - 3
app/controllers/equipment/fcu.py

@@ -5,9 +5,7 @@ from httpx import AsyncClient
 from loguru import logger
 
 from app.controllers.equipment.controller import EquipmentController
-from app.models.domain.equipment import AirValveSpeed
-from app.models.domain.equipment import FCU
-from app.models.domain.equipment import Space
+from app.schemas.equipment import AirValveSpeed, FCU, Space
 from app.services.platform import DataPlatformService
 from app.services.transfer import SpaceInfoService, EquipmentInfoService
 

+ 2 - 2
app/controllers/equipment/vav.py

@@ -7,8 +7,8 @@ from httpx import AsyncClient
 from loguru import logger
 
 from app.controllers.equipment.controller import EquipmentController
-from app.models.domain.equipment import VAVBox, FCU
-from app.models.domain.space import Space
+from app.schemas.equipment import VAVBox, FCU
+from app.schemas.space import Space
 from app.services.platform import DataPlatformService
 from app.services.transfer import EquipmentInfoService, SpaceInfoService
 

+ 11 - 29
app/models/domain/equipment.py

@@ -1,36 +1,18 @@
 # -*- coding: utf-8 -*-
 
-from enum import Enum
-from typing import List, Optional
-
 from pydantic import BaseModel
 
-from app.models.domain.space import Space
-
-
-class AirValveSpeed(float, Enum):
-    off = 0.0
-    low = 1.0
-    medium = 2.0
-    high = 3.0
-    auto = 4.0
-
-
-class BaseEquipment(BaseModel):
-    id: str
-    running_status: Optional[bool] = False
-    setting_temperature: Optional[float] = 0.0
-
 
-class FCU(BaseEquipment):
-    air_valve_speed: Optional[AirValveSpeed] = AirValveSpeed.off
-    space: Optional[Space]
+class EquipmentControlResponse(BaseModel):
+    result: str = 'success'
+    projectId: str
+    equipId: str
+    time: str
+    output: dict
 
 
-class VAVBox(BaseEquipment):
-    spaces: Optional[List[Space]]
-    supply_air_temperature: Optional[float]
-    supply_air_flow: Optional[float]
-    supply_air_flow_set: Optional[float]
-    supply_air_flow_lower_limit: Optional[float]
-    supply_air_flow_upper_limit: Optional[float]
+class EquipmentControlRequest(BaseModel):
+    equipId: str
+    # method: str
+    projectId: str
+    equipType: str

+ 7 - 7
app/models/domain/space.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from typing import List, Optional
-
 from pydantic import BaseModel
 
 
-class Space(BaseModel):
-    id: str
-    realtime_temperature: float
-    equipment: Optional[List]
-    temperature_target: float
+class SpaceControlResponse(BaseModel):
+    result: str = 'success'
+    projectId: str
+    roomId: str
+    flag: int
+    time: str
+    method: int

app/models/schemas/targets.py → app/models/domain/targets.py


+ 0 - 0
app/models/schemas/__init__.py


+ 0 - 18
app/models/schemas/equipment.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from pydantic import BaseModel
-
-
-class EquipmentControlResponse(BaseModel):
-    result: str = 'success'
-    projectId: str
-    equipId: str
-    time: str
-    output: dict
-
-
-class EquipmentControlRequest(BaseModel):
-    equipId: str
-    # method: str
-    projectId: str
-    equipType: str

+ 0 - 12
app/models/schemas/space.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from pydantic import BaseModel
-
-
-class SpaceControlResponse(BaseModel):
-    result: str = 'success'
-    projectId: str
-    roomId: str
-    flag: int
-    time: str
-    method: int

+ 36 - 0
app/schemas/equipment.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+from enum import Enum
+from typing import List, Optional
+
+from pydantic import BaseModel
+
+from app.schemas.space import Space
+
+
+class AirValveSpeed(float, Enum):
+    off = 0.0
+    low = 1.0
+    medium = 2.0
+    high = 3.0
+    auto = 4.0
+
+
+class BaseEquipment(BaseModel):
+    id: str
+    running_status: Optional[bool] = False
+    setting_temperature: Optional[float] = 0.0
+
+
+class FCU(BaseEquipment):
+    air_valve_speed: Optional[AirValveSpeed] = AirValveSpeed.off
+    space: Optional[Space]
+
+
+class VAVBox(BaseEquipment):
+    spaces: Optional[List[Space]]
+    supply_air_temperature: Optional[float]
+    supply_air_flow: Optional[float]
+    supply_air_flow_set: Optional[float]
+    supply_air_flow_lower_limit: Optional[float]
+    supply_air_flow_upper_limit: Optional[float]

+ 12 - 0
app/schemas/space.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+from typing import List, Optional
+
+from pydantic import BaseModel
+
+
+class Space(BaseModel):
+    id: str
+    realtime_temperature: float
+    equipment: Optional[List]
+    temperature_target: float