Browse Source

rename some modle's name

chenhaiyang 4 years ago
parent
commit
9c57b82d58

+ 4 - 4
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 EquipmentControlInResponse, EquipmentControlInRequest
+from app.models.schemas.equipment import EquipmentControlResponse, EquipmentControlRequest
 from app.utils.date import get_time_str
 
 
@@ -19,7 +19,7 @@ class EquipmentName(str, Enum):
 router = APIRouter()
 
 
-@router.get('/control', response_model=EquipmentControlInResponse, tags=['equipment'])
+@router.get('/control', response_model=EquipmentControlResponse, tags=['equipment'])
 async def get_equipment_command(
         projectId: str = Query(..., max_length=50, regex='^Pj'),
         equipId: str = Query(..., max_length=50, regex='^Eq'),
@@ -51,8 +51,8 @@ async def get_equipment_command(
     return response
 
 
-@router.post('/control', response_model=EquipmentControlInResponse, tags=['equipment'])
-async def get_equipment_command_v2(equipment_control_info: EquipmentControlInRequest):
+@router.post('/control', response_model=EquipmentControlResponse, tags=['equipment'])
+async def get_equipment_command_v2(equipment_control_info: EquipmentControlRequest):
     if equipment_control_info.equipType == EquipmentName.FCU:
         fcu = await get_fcu_control_result(equipment_control_info.projectId, equipment_control_info.equipId)
         output = {

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

@@ -2,12 +2,12 @@
 
 from fastapi import APIRouter, Query
 
-from app.models.schemas.space import SpaceControlInResponse
+from app.models.schemas.space import SpaceControlResponse
 
 router = APIRouter()
 
 
-@router.get('/control', response_model=SpaceControlInResponse, tags=['space'])
+@router.get('/control', response_model=SpaceControlResponse, tags=['space'])
 async def get_space_command(
         projectId: str = Query(..., max_length=50, regex='^Pj'),
         roomId: str = Query(..., max_length=50, regex='^Sp'),

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

@@ -4,13 +4,13 @@ from fastapi import APIRouter, HTTPException, Query
 from loguru import logger
 
 from app.controllers.targets import readjust_all_target
-from app.models.schemas.targets import TargetReadjustInResponse
+from app.models.schemas.targets import TargetReadjustResponse
 from app.utils.date import get_time_str
 
 router = APIRouter()
 
 
-@router.get('/adjust', response_model=TargetReadjustInResponse, tags=['targets'])
+@router.get('/adjust', response_model=TargetReadjustResponse, tags=['targets'])
 async def readjust_target(
         projectId: str = Query(..., max_length=50, regex='^Pj'),
         roomId: str = Query(..., max_length=50, regex='^Sp'),

+ 2 - 2
app/models/schemas/equipment.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 
 
-class EquipmentControlInResponse(BaseModel):
+class EquipmentControlResponse(BaseModel):
     result: str = 'success'
     projectId: str
     equipId: str
@@ -11,7 +11,7 @@ class EquipmentControlInResponse(BaseModel):
     output: dict
 
 
-class EquipmentControlInRequest(BaseModel):
+class EquipmentControlRequest(BaseModel):
     equipId: str
     # method: str
     projectId: str

+ 1 - 1
app/models/schemas/space.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 
 
-class SpaceControlInResponse(BaseModel):
+class SpaceControlResponse(BaseModel):
     result: str = 'success'
     projectId: str
     roomId: str

+ 1 - 1
app/models/schemas/targets.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 
 
-class TargetReadjustInResponse(BaseModel):
+class TargetReadjustResponse(BaseModel):
     result: str = 'success'
     projectId: str
     roomId: str