添加orm组件

Author: apconw

model/database_service.py

@@ -1,36 +1,36 @@
-from sqlalchemy.inspection import inspect
-
-from model.db_connection_pool import get_db_pool
-
-db_pool = get_db_pool()
-
-
-class DatabaseService:
-    """
-    数据库服务类
-    """
-
-    def __init__(self):
-        self.engine = db_pool.get_engine()
-
-    def get_table_schema(self):
-        """
-        获取数据中所有表结构
-        :return: 表结构
-        """
-        inspector = inspect(self.engine)
-        table_info = {}
-
-        for table_name in inspector.get_table_names():
-            columns = {
-                col["name"]: {"type": str(col["type"]), "comment": str(col["comment"])}
-                for col in inspector.get_columns(table_name)
-            }
-            foreign_keys = [
-                f"{fk['constrained_columns'][0]} -> {fk['referred_table']}.{fk['referred_columns'][0]}"
-                for fk in inspector.get_foreign_keys(table_name)
-            ]
-
-            table_info[table_name] = {"columns": columns, "foreign_keys": foreign_keys}
-
-        print(table_info)
+# from sqlalchemy.inspection import inspect
+#
+# from model.db_connection_pool import get_db_pool
+#
+# db_pool = get_db_pool()
+#
+#
+# class DatabaseService:
+#     """
+#     数据库服务类
+#     """
+#
+#     def __init__(self):
+#         self.engine = db_pool.get_engine()
+#
+#     def get_table_schema(self):
+#         """
+#         获取数据中所有表结构
+#         :return: 表结构
+#         """
+#         inspector = inspect(self.engine)
+#         table_info = {}
+#
+#         for table_name in inspector.get_table_names():
+#             columns = {
+#                 col["name"]: {"type": str(col["type"]), "comment": str(col["comment"])}
+#                 for col in inspector.get_columns(table_name)
+#             }
+#             foreign_keys = [
+#                 f"{fk['constrained_columns'][0]} -> {fk['referred_table']}.{fk['referred_columns'][0]}"
+#                 for fk in inspector.get_foreign_keys(table_name)
+#             ]
+#
+#             table_info[table_name] = {"columns": columns, "foreign_keys": foreign_keys}
+#
+#         print(table_info)

services/user_service.py

@@ -20,24 +20,24 @@
 logger = logging.getLogger(__name__)
 
 mysql_client = MysqlUtil()
-pool = get_db_pool()
+# pool = get_db_pool()
 
 
 async def authenticate_user(username, password):
     """验证用户凭据并返回用户信息或 None"""
-    with pool.get_session() as session:
-        session: Session = session
-        user_dict = model_to_dict(
-            session.query(TUser).filter(TUser.userName == username).filter(TUser.password == password).first()
-        )
-        if user_dict:
-            return user_dict
-    # sql = f"""select * from t_user where userName='{username}' and password='{password}'"""
-    # report_dict = MysqlUtil().query_mysql_dict(sql)
-    # if len(report_dict) > 0:
-    #     return report_dict[0]
-    # else:
-    #     return False
+    # with pool.get_session() as session:
+    #     session: Session = session
+    #     user_dict = model_to_dict(
+    #         session.query(TUser).filter(TUser.userName == username).filter(TUser.password == password).first()
+    #     )
+    #     if user_dict:
+    #         return user_dict
+    sql = f"""select * from t_user where userName='{username}' and password='{password}'"""
+    report_dict = MysqlUtil().query_mysql_dict(sql)
+    if len(report_dict) > 0:
+        return report_dict[0]
+    else:
+        return False
 
 
 async def generate_jwt_token(user_id, username):
@@ -265,13 +265,13 @@ def query_user_qa_record(chat_id):
     :param chat_id:
     :return:
     """
-    with pool.get_session() as session:
-        records = (
-            session.query(TUserQaRecord).filter(TUserQaRecord.chat_id == chat_id).order_by(TUserQaRecord.id.desc())
-        )
-        return model_to_dict(records)
-    # sql = f"select * from t_user_qa_record where chat_id='{chat_id}' order by id desc limit 1"
-    # return mysql_client.query_mysql_dict(sql)
+    # with pool.get_session() as session:
+    #     records = (
+    #         session.query(TUserQaRecord).filter(TUserQaRecord.chat_id == chat_id).order_by(TUserQaRecord.id.desc())
+    #     )
+    #     return model_to_dict(records)
+    sql = f"select * from t_user_qa_record where chat_id='{chat_id}' order by id desc limit 1"
+    return mysql_client.query_mysql_dict(sql)
 
 
 async def send_dify_feedback(chat_id, rating):