Browse Source

classify models to domain and schemas

chenhaiyang 4 years ago
parent
commit
127d2f7f1a

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

@@ -6,7 +6,7 @@ from fastapi import APIRouter, Query
 
 from app.controllers.equipment.fcu import get_fcu_control_result
 from app.controllers.equipment.vav import get_vav_control_result
-from app.models.equipment import EquipmentControlInResponse, EquipmentControlInRequest
+from app.models.schemas.equipment import EquipmentControlInResponse, EquipmentControlInRequest
 from app.utils.date import get_time_str
 
 

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

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter, Query
 
-from app.models.space import SpaceControlInResponse
+from app.models.schemas.space import SpaceControlInResponse
 
 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.targets import TargetReadjustInResponse
+from app.models.schemas.targets import TargetReadjustInResponse
 from app.utils.date import get_time_str
 
 router = APIRouter()

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

@@ -5,9 +5,9 @@ from httpx import AsyncClient
 from loguru import logger
 
 from app.controllers.equipment.controller import EquipmentController
-from app.models.equipment import AirValveSpeed
-from app.models.equipment import FCU
-from app.models.space import Space
+from app.models.domain.equipment import AirValveSpeed
+from app.models.domain.equipment import FCU
+from app.models.domain.equipment import 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.equipment import VAVBox, FCU
-from app.models.space import Space
+from app.models.domain.equipment import VAVBox, FCU
+from app.models.domain.space import Space
 from app.services.platform import DataPlatformService
 from app.services.transfer import EquipmentInfoService, SpaceInfoService
 

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


+ 1 - 16
app/models/equipment.py

@@ -5,7 +5,7 @@ from typing import List, Optional
 
 from pydantic import BaseModel
 
-from app.models.space import Space
+from app.models.domain.space import Space
 
 
 class AirValveSpeed(float, Enum):
@@ -32,18 +32,3 @@ class VAVBox(BaseEquipment):
     supply_air_temperature: Optional[float]
     supply_air_flow: Optional[float]
     supply_air_flow_set: Optional[float]
-
-
-class EquipmentControlInResponse(BaseModel):
-    result: str = 'success'
-    projectId: str
-    equipId: str
-    time: str
-    output: dict
-
-
-class EquipmentControlInRequest(BaseModel):
-    equipId: str
-    # method: str
-    projectId: str
-    equipType: str

+ 0 - 9
app/models/space.py

@@ -10,12 +10,3 @@ class Space(BaseModel):
     realtime_temperature: float
     equipment: Optional[List]
     temperature_target: float
-
-
-class SpaceControlInResponse(BaseModel):
-    result: str = 'success'
-    projectId: str
-    roomId: str
-    flag: int
-    time: str
-    method: int

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


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

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

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

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

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