Browse Source

formatted file

chenhaiyang 4 years ago
parent
commit
0b807df087

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

@@ -3,7 +3,6 @@
 from enum import Enum
 from enum import Enum
 
 
 from fastapi import APIRouter, Query
 from fastapi import APIRouter, Query
-from loguru import logger
 
 
 from app.controllers.equipment.fcu import get_fcu_control_result
 from app.controllers.equipment.fcu import get_fcu_control_result
 from app.controllers.equipment.vav import get_vav_control_result
 from app.controllers.equipment.vav import get_vav_control_result

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

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
-from fastapi import APIRouter, HTTPException, Query
-from loguru import logger
+from fastapi import APIRouter, Query
 
 
 from app.models.space import SpaceControlInResponse
 from app.models.space import SpaceControlInResponse
 
 

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
-from fastapi import APIRouter, HTTPException, Query, Depends
+from fastapi import APIRouter, HTTPException, Query
 from loguru import logger
 from loguru import logger
 
 
 from app.controllers.targets import readjust_all_target
 from app.controllers.targets import readjust_all_target

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

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
-from abc import ABC, abstractmethod
+from abc import abstractmethod
+
 from app.controllers.controller import Controller
 from app.controllers.controller import Controller
 
 
 
 
@@ -13,4 +14,3 @@ class EquipmentController(Controller):
     @abstractmethod
     @abstractmethod
     async def run(self):
     async def run(self):
         pass
         pass
-

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

@@ -8,8 +8,8 @@ from app.controllers.equipment.controller import EquipmentController
 from app.models.equipment import AirValveSpeed
 from app.models.equipment import AirValveSpeed
 from app.models.equipment import FCU
 from app.models.equipment import FCU
 from app.models.space import Space
 from app.models.space import Space
-from app.services.transfer import SpaceInfoService, EquipmentInfoService
 from app.services.platform import DataPlatformService
 from app.services.platform import DataPlatformService
+from app.services.transfer import SpaceInfoService, EquipmentInfoService
 
 
 
 
 class FCUController(EquipmentController):
 class FCUController(EquipmentController):

+ 1 - 1
app/controllers/targets.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
-from abc import abstractmethod
 import time
 import time
+from abc import abstractmethod
 from typing import Dict, Tuple, Optional
 from typing import Dict, Tuple, Optional
 
 
 import arrow
 import arrow

+ 3 - 3
app/main.py

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
-from pathlib import Path
-from functools import lru_cache
 import logging
 import logging
+from functools import lru_cache
+from pathlib import Path
 
 
 import uvicorn
 import uvicorn
 from fastapi import FastAPI, Depends
 from fastapi import FastAPI, Depends
 from loguru import logger
 from loguru import logger
 
 
 from app.api.routers import targets, equipment, space
 from app.api.routers import targets, equipment, space
-from app.core.logger import InterceptHandler
 from app.core.config import LoggerSettings
 from app.core.config import LoggerSettings
+from app.core.logger import InterceptHandler
 
 
 logger_settings = LoggerSettings()
 logger_settings = LoggerSettings()
 logging.getLogger().handlers = [InterceptHandler()]
 logging.getLogger().handlers = [InterceptHandler()]

+ 1 - 1
app/services/platform.py

@@ -8,10 +8,10 @@ import numpy as np
 from httpx import AsyncClient, URL
 from httpx import AsyncClient, URL
 from loguru import logger
 from loguru import logger
 
 
+from app.core.config import PlatformSettings
 from app.services.service import Service
 from app.services.service import Service
 from app.utils.date import get_time_str, TIME_FMT
 from app.utils.date import get_time_str, TIME_FMT
 from app.utils.math import round_half_up
 from app.utils.math import round_half_up
-from app.core.config import PlatformSettings
 
 
 platform_settings = PlatformSettings()
 platform_settings = PlatformSettings()
 
 

+ 2 - 3
app/services/transfer.py

@@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
 from enum import Enum
 from enum import Enum
-from typing import Tuple, Dict, List
+from typing import Dict, List
 
 
 import arrow
 import arrow
 import numpy as np
 import numpy as np
 import pandas as pd
 import pandas as pd
 from httpx import AsyncClient, URL
 from httpx import AsyncClient, URL
-from loguru import logger
 
 
+from app.core.config import TransferSettings
 from app.services.service import Service
 from app.services.service import Service
 from app.utils.date import get_time_str, TIME_FMT
 from app.utils.date import get_time_str, TIME_FMT
-from app.core.config import TransferSettings
 
 
 transfer_settings = TransferSettings()
 transfer_settings = TransferSettings()
 
 

+ 1 - 0
app/utils/math.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
 import math
 import math
+
 import numpy as np
 import numpy as np