移除过时的db handler

src/TG-tools/history_message_upload.py

@@ -10,7 +10,7 @@ from pathlib import Path
 from tqdm import tqdm
 
 from src.My_Logger.project_logger import LoggerClass
-from src.PostgresSQL.databaseHandler import DatabaseHandler
+from src.PostgresSQL.db_handler import PgHandler
 from src.utils.utils import size_of_file
 from src.config.load_config import project_config
 
@@ -46,7 +46,10 @@ class MessageUploader:
         self.config = project_config
         self.load_path = local_load_path
         self.file_param_list = ['photo', 'file']
-        self.db_handler = DatabaseHandler(self.config, self.logger)
+        # 使用 PgHandler 替代旧的 DatabaseHandler，按 config 构造连接
+        self.db_handler = PgHandler(host=self.config['host'], port=int(self.config.get('port', 5432)),
+                                    user=self.config.get('user'), password=self.config.get('password'),
+                                    database=self.config.get('database'))
         self.file_db_path = local_file_db_path
 
         self.size_limit = size_limit * 1024 * 1024 * 1024
@@ -82,7 +85,8 @@ class MessageUploader:
     def prepare_database(self, table_name):
         # self.db_handler.create_database(table_name, force_create=False)
         if not self.db_handler.exists_table(table_name):
-            self.db_handler.create_table(self.table_format, table_name, False, ['message_id'])
+            # 使用 PgHandler 的 create_table_from_dict 接口创建表
+            self.db_handler.create_table_from_dict(self.table_format, table_name, force_create=False, primary_key_list=['message_id'])
             time.sleep(0.5)
             self.logger.info(f'Table {table_name} created.')
 
@@ -94,8 +98,8 @@ class MessageUploader:
 
     def upload_to_database(self, target_list, table_name):
         db_handler = self.db_handler
-        db_handler.insert_json_into_table(table_name=table_name, data_list=target_list,
-                                          batch=10000, unique_columns='message_id')
+        # 调用 PgHandler.insert_json_into_table(table, json_list, schema, batch, unique_columns)
+        db_handler.insert_json_into_table(table=table_name, json_list=target_list, schema='public', batch=10000, unique_columns='message_id')
 
     def process_loaded_message(self, loaded_messages, table_name):
         self.logger.info('Start processing messages')
@@ -209,4 +213,3 @@ if __name__ == "__main__":
     finally:
         tg.db_handler.close()
         print('done')
-