统一 pg 数据库的连接

online_Analysis.py

@@ -22,6 +22,7 @@ import project_info
 import api_ex.kmeans_sensor
 import api_ex.Fdataclean
 import api_ex.Pdataclean
+from postgresql_info import get_pgconn_string
 
 ############################################################
 # burst analysis 01
@@ -765,7 +766,7 @@ def submit_scada_info(name: str, coord_id: str) -> None:
             print(f"检测到的文件编码：{file_encoding}")
         try:
             # 动态替换数据库名称
-            conn_string = f"dbname={name} host=127.0.0.1"
+            conn_string = get_pgconn_string(db_name=name)
 
             # 连接到 PostgreSQL 数据库（这里是数据库 "bb"）
             with psycopg.connect(conn_string) as conn:
@@ -841,7 +842,7 @@ def create_user(name: str, username: str, password: str):
     """
     try:
         # 动态替换数据库名称
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         # 连接到 PostgreSQL 数据库（这里是数据库 "bb"）
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
@@ -866,7 +867,7 @@ def delete_user(name: str, username: str):
     """
     try:
         # 动态替换数据库名称
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         # 连接到 PostgreSQL 数据库（这里是数据库 "bb"）
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
@@ -886,7 +887,7 @@ def scheme_name_exists(name: str, scheme_name: str) -> bool:
     :return: 如果存在返回 True，否则返回 False
     """
     try:
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
                 cur.execute("SELECT COUNT(*) FROM scheme_list WHERE scheme_name = %s", (scheme_name,))
@@ -913,7 +914,7 @@ def store_scheme_info(name: str, scheme_name: str, scheme_type: str, username: s
     :return:
     """
     try:
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
                 sql = """
@@ -937,7 +938,7 @@ def delete_scheme_info(name: str, scheme_name: str) -> None:
     :param scheme_name: 要删除的方案名称
     """
     try:
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
                 # 使用参数化查询删除方案记录
@@ -957,7 +958,7 @@ def query_scheme_list(name: str) -> list:
     """
     try:
         # 动态替换数据库名称
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         # 连接到 PostgreSQL 数据库（这里是数据库 "bb"）
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
@@ -982,7 +983,7 @@ def upload_shp_to_pg(name: str, table_name: str, role: str, shp_file_path: str):
     """
     try:
         # 动态连接到指定的数据库
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         with psycopg.connect(conn_string) as conn:
             # 读取 Shapefile 文件
             gdf = gpd.read_file(shp_file_path)
@@ -1018,7 +1019,7 @@ def submit_risk_probability_result(name: str, result_file_path: str) -> None:
 
     try:
         # 动态替换数据库名称
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
 
         # 连接到 PostgreSQL 数据库
         with psycopg.connect(conn_string) as conn:
@@ -1072,7 +1073,7 @@ def pressure_sensor_placement_sensitivity(name: str, scheme_name: str, sensor_nu
     """
     sensor_location = sensitivity.get_ID(name=name, sensor_num=sensor_number, min_diameter=min_diameter)
     try:
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
                 sql = """
@@ -1104,7 +1105,7 @@ def pressure_sensor_placement_kmeans(name: str, scheme_name: str, sensor_number:
     dump_inp(name,inp_name,'2')
     sensor_location = api_ex.kmeans_sensor.kmeans_sensor_placement(name=name, sensor_num=sensor_number, min_diameter=min_diameter)
     try:
-        conn_string = f"dbname={name} host=127.0.0.1"
+        conn_string = get_pgconn_string(db_name=name)
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
                 sql = """