将 native/api/ 改名为 native/wndb/,避免与 Web API 层命名冲突
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import numpy as np
|
||||
from app.services.tjnetwork import *
|
||||
from app.native.api.s36_wda_cal import *
|
||||
from app.native.wndb.s36_wda_cal import *
|
||||
# from get_real_status import *
|
||||
from datetime import datetime,timedelta
|
||||
from math import modf
|
||||
|
||||
@@ -2,7 +2,7 @@ import psycopg
|
||||
|
||||
import app.algorithms.api_ex.kmeans_sensor as kmeans_sensor
|
||||
import app.algorithms.api_ex.sensitivity as sensitivity
|
||||
from app.native.api.postgresql_info import get_pgconn_string
|
||||
from app.native.wndb.postgresql_info import get_pgconn_string
|
||||
from app.services.tjnetwork import dump_inp
|
||||
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ from app.algorithms.api_ex.run_simulation import (
|
||||
run_simulation_ex,
|
||||
from_clock_to_seconds_2,
|
||||
)
|
||||
from app.native.api.project import copy_project
|
||||
from app.native.wndb.project import copy_project
|
||||
from app.services.epanet.epanet import Output
|
||||
from app.services.scheme_management import store_scheme_info
|
||||
from app.services.tjnetwork import *
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from typing import List, Any
|
||||
from fastapi import APIRouter, Request, HTTPException
|
||||
from app.native.api import ChangeSet
|
||||
from app.native.wndb import ChangeSet
|
||||
from app.services.tjnetwork import (
|
||||
get_all_extension_data_keys,
|
||||
get_all_extension_data,
|
||||
|
||||
@@ -3,7 +3,7 @@ from fastapi import APIRouter, Request, HTTPException
|
||||
from fastapi.responses import PlainTextResponse
|
||||
from typing import Any, Dict
|
||||
import app.services.project_info as project_info
|
||||
from app.native.api import ChangeSet
|
||||
from app.native.wndb import ChangeSet
|
||||
from app.infra.db.postgresql.database import get_database_instance as get_pg_db
|
||||
from app.infra.db.timescaledb.database import get_database_instance as get_ts_db
|
||||
from app.services.tjnetwork import (
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from typing import Any
|
||||
from fastapi import APIRouter, Request
|
||||
from app.native.api import ChangeSet
|
||||
from app.native.wndb import ChangeSet
|
||||
from app.services.tjnetwork import (
|
||||
get_scada_info,
|
||||
get_all_scada_info,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from fastapi import APIRouter, Request
|
||||
from app.native.api import ChangeSet
|
||||
from app.native.wndb import ChangeSet
|
||||
from app.services.tjnetwork import (
|
||||
get_current_operation,
|
||||
execute_undo,
|
||||
|
||||
@@ -29,7 +29,7 @@ import pytz
|
||||
import app.infra.db.influxdb.info as influxdb_info
|
||||
import app.services.project_info as project_info
|
||||
import app.services.time_api as time_api
|
||||
from app.native.api.postgresql_info import get_pgconn_string
|
||||
from app.native.wndb.postgresql_info import get_pgconn_string
|
||||
|
||||
# influxdb数据库连接信息
|
||||
url = influxdb_info.url
|
||||
|
||||
@@ -3,7 +3,7 @@ from contextlib import asynccontextmanager
|
||||
from typing import AsyncGenerator, Dict, Optional
|
||||
import psycopg_pool
|
||||
from psycopg.rows import dict_row
|
||||
import app.native.api.postgresql_info as postgresql_info
|
||||
import app.native.wndb.postgresql_info as postgresql_info
|
||||
|
||||
# Configure logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -2,7 +2,7 @@ import time
|
||||
from typing import List, Optional
|
||||
|
||||
from fastapi.logger import logger
|
||||
import app.native.api.postgresql_info as postgresql_info
|
||||
import app.native.wndb.postgresql_info as postgresql_info
|
||||
import psycopg
|
||||
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@ import logging
|
||||
from typing import Any
|
||||
|
||||
sys.path.append("..")
|
||||
from app.native.api import project
|
||||
from app.native.api import inp_out
|
||||
from app.native.wndb import project
|
||||
from app.native.wndb import inp_out
|
||||
|
||||
|
||||
def _verify_platform():
|
||||
|
||||
@@ -6,7 +6,7 @@ import psycopg
|
||||
from psycopg import sql
|
||||
|
||||
import app.services.project_info as project_info
|
||||
from app.native.api.postgresql_info import get_pgconn_string
|
||||
from app.native.wndb.postgresql_info import get_pgconn_string
|
||||
from app.services.tjnetwork import read_inp
|
||||
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import pandas as pd
|
||||
import psycopg
|
||||
from sqlalchemy import create_engine
|
||||
|
||||
from app.native.api.postgresql_info import get_pgconn_string
|
||||
from app.native.wndb.postgresql_info import get_pgconn_string
|
||||
|
||||
|
||||
# 2025/03/23
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import numpy as np
|
||||
from app.services.tjnetwork import *
|
||||
from app.native.api.s36_wda_cal import *
|
||||
from app.native.wndb.s36_wda_cal import *
|
||||
|
||||
# from get_real_status import *
|
||||
from datetime import datetime, timedelta
|
||||
@@ -20,7 +20,7 @@ import logging
|
||||
import app.services.globals as globals
|
||||
import uuid
|
||||
import app.services.project_info as project_info
|
||||
from app.native.api.postgresql_info import get_pgconn_string
|
||||
from app.native.wndb.postgresql_info import get_pgconn_string
|
||||
from app.infra.db.timescaledb.internal_queries import (
|
||||
InternalQueries as TimescaleInternalQueries,
|
||||
)
|
||||
|
||||
@@ -5,7 +5,7 @@ from math import pi
|
||||
import pytz
|
||||
|
||||
from app.algorithms.api_ex.run_simulation import run_simulation_ex
|
||||
from app.native.api.project import copy_project
|
||||
from app.native.wndb.project import copy_project
|
||||
from app.services.epanet.epanet import Output
|
||||
from app.services.tjnetwork import *
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from typing import Any
|
||||
import app.native.api as api
|
||||
import app.native.wndb as api
|
||||
import app.services.epanet as epanet
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user