feat:修改递归查询部门写法

main_service.py

@@ -1,9 +1,13 @@
+import copy
 from email.policy import default
 import logging
+from functools import wraps
+
+from Demos.mmapfile_demo import page_size
 
 import util.utils
 from logging_config import LOGGING_CONFIG
-from service.cus_vanna_srevice import CustomVanna, QdrantClient
+from service.cus_vanna_srevice import CustomVanna, QdrantClient, TTLCacheWrapper
 from decouple import config
 import flask
 from util import load_ddl_doc
@@ -67,6 +71,7 @@ def init_vn(vn):
 from vanna.flask import VannaFlaskApp
 vn = create_vana()
 app = VannaFlaskApp(vn,chart=False)
+app.cache = TTLCacheWrapper(app.cache, ttl = config('TTL_CACHE', cast=int,default=60*60))
 init_vn(vn)
 cache = app.cache
 @app.flask_app.route("/yj_sqlbot/api/v0/generate_sql_2", methods=["GET"])
@@ -101,8 +106,9 @@ def generate_sql_2():
         return jsonify({"type": "error", "error": "No question provided"})
     try:
         id = cache.generate_id(question=question)
+        user_id = request.args.get("user_id")
         logger.info(f"Generate sql for {question}")
-        data = vn.generate_sql_2(question=question)
+        data = vn.generate_sql_2(question=question, cache=cache, user_id=user_id)
         logger.info("Generate sql result is {0}".format(data))
         data['id'] = id
         sql = data["resp"]["sql"]
@@ -115,21 +121,56 @@ def generate_sql_2():
         logger.error(f"generate sql failed:{e}")
         return jsonify({"type": "error", "error": str(e)})
 
+def session_save(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        id=request.args.get("id")
+        user_id = request.args.get("user_id")
+        logger.info(f"   id: {id},user_id: {user_id}")
+        result = func(*args, **kwargs)
+
+        datas=[]
+        session_len = int(config("SESSION_LENGTH", default=2))
+        if cache.exists(id=user_id, field="data"):
+            datas = copy.deepcopy(cache.get(id=user_id, field="data"))
+        data = {
+            "id": id,
+            "question":cache.get(id=id, field="question"),
+            "sql":cache.get(id=id, field="sql")
+        }
+        datas.append(data)
+        logger.info("datas is {0}".format(datas))
+        if len(datas) > session_len and session_len > 0:
+            datas=datas[-session_len:]
+        # 删除id对应的所有缓存值,因为已经run_sql完毕，改用user_id保存为上下文
+        cache.delete(id=id, field="question")
+        cache.set(id=user_id, field="data", value=copy.deepcopy(datas))
+        logger.info(f" user data {cache.get(user_id, field='data')}")
+        return result
+
+    return wrapper
+
 
 
 @app.flask_app.route("/yj_sqlbot/api/v0/run_sql_2", methods=["GET"])
+@session_save
 @app.requires_cache(["sql"])
 def run_sql_2(id: str, sql: str):
     """
     Run SQL
     ---
     parameters:
-      - name: user
+      - name: user_id
         in: query
+        required: true
       - name: id
         in: query|body
         type: string
         required: true
+      - name: page_size
+        in: query
+      -name: page_num
+        in: query
     responses:
       200:
         schema:
@@ -155,13 +196,14 @@ def run_sql_2(id: str, sql: str):
                 }
             )
 
+        # count_sql = f"SELECT COUNT(*) AS total_count FROM ({sql}) AS subquery"
+        # df_count = vn.run_sql(count_sql)
+        # print(df_count,"is type",type(df_count))
+        # total_count = df_count.to_dict(orient="records")[0]["total_count"]
+        # logger.info("Total count is {0}".format(total_count))
         df = vn.run_sql(sql=sql)
-        logger.info("")
-        app.cache.set(id=id, field="df", value=df)
         result = df.to_dict(orient='records')
         logger.info("df ---------------{0}   {1}".format(result,type(result)))
-        # result = util.utils.deal_result(data=result)
-
         return jsonify(
             {
                 "type": "success",
@@ -174,6 +216,7 @@ def run_sql_2(id: str, sql: str):
         logger.error(f"run sql failed:{e}")
         return jsonify({"type": "sql_error", "error": str(e)})
 
+
 if __name__ == '__main__':
 
     app.run(host='0.0.0.0', port=8084, debug=False)

service/cus_vanna_srevice.py

@@ -1,5 +1,9 @@
+from dataclasses import field
 from email.policy import default
-from typing import List, Union
+from typing import List, Union, Any, Optional
+import time
+import threading
+from vanna.flask import Cache, MemoryCache
 import  dmPython
 import orjson
 import pandas as pd
@@ -65,37 +69,55 @@ class OpenAICompatibleLLM(VannaBase):
             port: int = None,
             **kwargs
     ):
-        conn = None
+        self.conn = None
         try:
-            conn = dmPython.connect(user=user, password=password, server=host, port=port)
+            self.conn = dmPython.connect(user=user, password=password, server=host, port=port)
         except Exception as e:
             raise Exception(f"Failed to connect to dameng database: {e}")
 
         def run_sql_damengsql(sql: str) -> Union[pd.DataFrame, None]:
-            if conn:
-                try:
-                    # conn.ping(reconnect=True)
-                    cs = conn.cursor()
-                    cs.execute(sql)
-                    results = cs.fetchall()
+            logger.info(f"start to run_sql_damengsql")
+            try:
+                if not is_connection_alive(conn=self.conn):
+                    logger.info("connection is not alive, reconnecting..........")
+                    reconnect()
+                # conn.ping(reconnect=True)
+                cs = self.conn.cursor()
+                cs.execute(sql)
+                results = cs.fetchall()
 
-                    # Create a pandas dataframe from the results
-                    df = pd.DataFrame(
-                        results, columns=[desc[0] for desc in cs.description]
-                    )
+                # Create a pandas dataframe from the results
+                df = pd.DataFrame(
+                    results, columns=[desc[0] for desc in cs.description]
+                )
 
-                    return df
-
-
-
-                except Exception as e:
-                    conn.rollback()
-                    raise e
+                return df
+            except Exception as e:
+                self.conn.rollback()
+                logger.error(f"Failed to execute sql query: {e}")
+                raise e
             return None
 
+        def reconnect():
+            try:
+                self.conn = dmPython.connect(user=user, password=password, server=host, port=port)
+            except Exception as e:
+                raise Exception(f"reconnect failed: {e}")
+        def is_connection_alive(conn) -> bool:
+            if conn is None:
+                return False
+            try:
+                cursor = conn.cursor()
+                cursor.execute("SELECT 1 FROM DUAL")
+                cursor.close()
+                return True
+            except Exception as e:
+                return False
+
         self.run_sql_is_set = True
         self.run_sql = run_sql_damengsql
 
+
     def user_message(self, message: str) -> any:
         return {"role": "user", "content": message}
 
@@ -182,27 +204,31 @@ class OpenAICompatibleLLM(VannaBase):
 
         return response.choices[0].message.content
 
-    def generate_sql_2(self, question: str, allow_llm_to_see_data=False, **kwargs) -> dict:
+    def generate_sql_2(self, question: str, cache=None,user_id=None, allow_llm_to_see_data=False, **kwargs) -> dict:
         try:
             logger.info("Start to generate_sql_2 in cus_vanna_srevice")
             question_sql_list = self.get_similar_question_sql(question, **kwargs)
             if question_sql_list and len(question_sql_list)>2:
-                question_sql_list=question_sql_list[:1]
+                question_sql_list=question_sql_list[:2]
 
             ddl_list = self.get_related_ddl(question, **kwargs)
             #doc_list = self.get_related_documentation(question, **kwargs)
             template = get_base_template()
             sql_temp = template['template']['sql']
             char_temp = template['template']['chart']
+            history = None
+            if user_id and cache:
+                history = cache.get(id=user_id, field="data")
             # --------基于提示词，生成sql以及图表类型
             sys_temp = sql_temp['system'].format(engine=config("DB_ENGINE", default='mysql'), lang='中文',
                                                  schema=ddl_list, documentation=[train_ddl.train_document],
-                                                 retrieved_examples_data=question_sql_list,
+                                                 history=history,retrieved_examples_data=question_sql_list,
                                                  data_training=question_sql_list,)
-            logger.info(f"sys_temp:{sys_temp}")
+
             user_temp = sql_temp['user'].format(question=question,
                                                 current_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
             logger.info(f"user_temp:{user_temp}")
+            logger.info(f"sys_temp:{sys_temp}")
             llm_response = self.submit_prompt(
                 [{'role': 'system', 'content': sys_temp}, {'role': 'user', 'content': user_temp}], **kwargs)
             logger.info(f"llm_response:{llm_response}")
@@ -290,4 +316,88 @@ class CustomQdrant_VectorStore(Qdrant_VectorStore):
 class CustomVanna(CustomQdrant_VectorStore, OpenAICompatibleLLM):
     def __init__(self, llm_config=None, vector_store_config=None):
         CustomQdrant_VectorStore.__init__(self, config_file=vector_store_config)
-        OpenAICompatibleLLM.__init__(self, config_file=llm_config)
+        OpenAICompatibleLLM.__init__(self, config_file=llm_config)
+
+class TTLCacheWrapper:
+    "为MemoryCache()添加带ttl的包装器，防治内存泄漏"
+    def __init__(self, cache: Optional[Cache] = None, ttl: int = 3600):
+        self.cache = cache or MemoryCache()
+        self.ttl = ttl
+        self._expiry_times = {}
+        self._cleanup_thread = None
+        self._start_cleanup()
+
+    def _start_cleanup(self):
+        """启动后台清理线程"""
+
+        def cleanup():
+            while True:
+                current_time = time.time()
+                expired_keys = []
+
+                # 找出所有过期的key
+                for key_info, expiry in self._expiry_times.items():
+                    if expiry <= current_time:
+                        expired_keys.append(key_info)
+
+                # 清理过期数据
+                for key_info in expired_keys:
+                    id, field = key_info
+                    if hasattr(self.cache, 'delete'):
+                        self.cache.delete(id=id)
+                    del self._expiry_times[key_info]
+
+                time.sleep(180)  # 每3分钟清理一次
+
+        self._cleanup_thread = threading.Thread(target=cleanup, daemon=True)
+        self._cleanup_thread.start()
+
+    def set(self, id: str, field: str, value: Any, ttl: Optional[int] = None):
+        """设置缓存值，支持TTL"""
+        # 使用提供的TTL或默认TTL
+        actual_ttl = ttl if ttl is not None else self.ttl
+
+        # 调用原始cache的set方法
+        self.cache.set(id=id, field=field, value=value)
+
+        # 记录过期时间
+        key_info = (id, field)
+        self._expiry_times[key_info] = time.time() + actual_ttl
+
+    def get(self, id: str, field: str) -> Any:
+        """获取缓存值，自动处理过期"""
+        key_info = (id, field)
+
+        # 检查是否过期
+        if key_info in self._expiry_times:
+            if time.time() > self._expiry_times[key_info]:
+                # 已过期，删除并返回None
+                if hasattr(self.cache, 'delete'):
+                    self.cache.delete(id=id)
+                del self._expiry_times[key_info]
+                return None
+
+        # 返回缓存值
+        return self.cache.get(id=id, field=field)
+
+    def delete(self, id: str, field: str):
+        """删除缓存值"""
+        key_info = (id, field)
+        if hasattr(self.cache, 'delete'):
+            self.cache.delete(id=id)
+        if key_info in self._expiry_times:
+            del self._expiry_times[key_info]
+
+    def exists(self, id: str, field: str) -> bool:
+        """检查缓存是否存在且未过期"""
+        key_info = (id, field)
+        if key_info in self._expiry_times:
+            if time.time() > self._expiry_times[key_info]:
+                # 已过期，清理并返回False
+                self.delete(id=id, field=field)
+                return False
+        return self.get(id=id, field=field) is not None
+
+    # 代理其他方法到原始cache
+    def __getattr__(self, name):
+        return getattr(self.cache, name)

template.yaml

@@ -16,6 +16,7 @@ template:
           <retrieved-examples>：[RAG核心区] 通过检索与当前问题最相关的历史问答对。**这是最高优先级的s参考**，优先从中寻找与用户问题意图或表述最相似的案例来指导你生成SQL。
           <sql-examples>：通用SQL示例库。当<retrieved-examples>中没有足够参考时，可在此处寻找相似的用法、函数模板或Join思路作为补充参考。
           <documentation>：数据库或业务相关的补充文档。
+          <history>:上下文历史,可以通过上下文历史，丰富问题背景
           <error-msg>：[可选] 上一次生成的SQL执行失败时的错误信息，用于修正和优化你的输出。
           <background-infos>：[可选] 背景信息，如当前提问时间<current-time>等。
           用户的提问位于 <user-question> 块内。
@@ -156,10 +157,15 @@ template:
         <db-engine>{engine}</db-engine>
         <m-schema>{schema}</m-schema>
         <documentation>{documentation}</documentation>
+        <history>{history}</history>
          <terminologies>
             <terminology>
-              <words><word国网</word><word>电网</word><word>雅江</word><word>联通</word></words>
-              <description>这些都可能是内部或者外部单位的名称</description>
+              <words><word>国网</word><word>电网</word><word>雅江</word><word>联通</word></words>
+              <description>这些都可能是外部单位的名称</description>
+            </terminology>
+            <terminology>
+              <words><word>数信中心</word><word>建设处</word><word>规划发展部</word></words>
+              <description>这些都可能是单位的名称</description>
             </terminology>
           </terminologies>
         <!-- [RAG 集成区] -->

util/load_ddl_doc.py

@@ -2,7 +2,10 @@ from service.cus_vanna_srevice import CustomVanna
 from util import train_ddl
 from  util import q_and_a_dict
 table_ddls = [
-    train_ddl.person_ddl_sql,train_ddl.rule_ddl,train_ddl.user_status_ddl
+    train_ddl.person_ddl_sql,train_ddl.user_status_ddl,
+    train_ddl.user_attendance_ddl,train_ddl.person_ac_area,
+    train_ddl.org_orgs_ddl
+
 ]
 list_documentions = [
     train_ddl.train_document,

util/q_and_a_dict.py

@@ -1,33 +1,5 @@
 question_and_answer = [
-    {"question": "考勤地点有哪些",
-     "answer": '''
-               SELECT DISTINCT CASE "region"
-                                   WHEN '1' THEN '北京'
-                                   WHEN '2' THEN '成都'
-                                   WHEN '3' THEN '秭归'
-                                   WHEN '4' THEN '拉萨'
-                                   WHEN '5' THEN '林芝' END AS "考勤地点"
-               FROM "YJOA_APPSERVICE_DB"."t_yj_person_attendance_rules"
-               WHERE "region" IS NOT NULL LIMIT 1000
-               '''
-     },
-    {"question": "成都的考勤规则是什么",
-     "answer": '''
-               SELECT "region"                                AS "region_code",
-                      CASE
-                          WHEN "region" = '1' THEN '北京'
-                          WHEN "region" = '2' THEN '成都'
-                          WHEN "region" = '3' THEN '秭归'
-                          WHEN "region" = '4' THEN '拉萨'
-                          WHEN "region" = '5' THEN '林芝' END AS "region_name",
-                      "morning_check_time"                    AS "morning_check_time",
-                      "afternoon_check_time"                  AS "afternoon_check_time",
-                      "before_lunch_time"                     AS "before_lunch_time",
-                      "after_lunch_time"                      AS "after_lunch_time"
-               FROM "YJOA_APPSERVICE_DB"."t_yj_person_attendance_rules"
-               WHERE "region" = '2' LIMIT 1000
-               '''
-     },
+
     {"question": "所有员工男女各有多少人",
      "answer": '''
                SELECT CASE WHEN "gender" = '1' THEN '男' WHEN "gender" = '2' THEN '女' END AS "gender",
@@ -39,16 +11,15 @@ question_and_answer = [
                '''
      },
     {
-        "question": "联通下面有哪些员工",
+        "question": "外部单位是联通下面有哪些员工",
         "answer": '''
                   SELECT "id"            AS "id",
                          "code"          AS "工号",
                          "name"          AS "姓名",
-                         "internal_unit" AS "内部单位",
+
                          "external_unit" AS "外部单位"
                   FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database"
-                  WHERE "internal_unit" LIKE '%联通%'
-                     OR "external_unit" LIKE '%联通%' LIMIT 1000
+                  WHERE "external_unit" LIKE '%联通%' LIMIT 1000
                   '''
     },
     {
@@ -65,26 +36,7 @@ question_and_answer = [
                     AND ps."date_value" LIKE '2025-09%' LIMIT 1000
                   '''
     },
-    {
-        "question": "联通的员工，8月份有哪些迟到，旷工的",
-        "answer": '''
-                  SELECT DISTINCT p."code"                                      AS "工号",
-                                  p."name"                                      AS "姓名",
-                                  p."internal_unit"                             AS "内部单位",
-                                  p."external_unit"                             AS "外部单位",
-                                  CASE
-                                      WHEN ps."status" = '1006' THEN '迟到,早退'
-                                      WHEN ps."status" = '1005' THEN '旷工' END AS "人员状态",
-                                  ps."date_value"                               AS "日期"
-                  FROM "YJOA_APPSERVICE_DB"."t_yj_person_status" ps
-                           JOIN "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p ON ps."person_id" = p."code"
-                  WHERE (p."internal_unit" LIKE '%联通%' OR p."external_unit" LIKE '%联通%')
-                    AND ps."status" IN ('1005', '1006')
-                    AND ps."date_value" LIKE '2025-08%'
-                    AND ps."dr" = 0
-                  ORDER BY ps."date_value" DESC LIMIT 1000
-                  '''
-    },
+
     {
         "question": "博士和硕士分别有哪些员工",
         "answer": '''
@@ -103,7 +55,7 @@ question_and_answer = [
                   ORDER BY "最高学位", "姓名" LIMIT 1000
                   '''
     }, {
-        "question": "8月份在藏超过10天的有哪些员工",
+        "question": "8月份在藏,超过10天的有哪些员工",
         "answer": '''
                   SELECT DISTINCT p."code"                       AS "工号",
                                   p."name"                       AS "姓名",
@@ -154,16 +106,7 @@ question_and_answer = [
                   ORDER BY ps."date_value" DESC LIMIT 1000
                   '''
     },
-    {
-        "question": "8月份有多人迟到",
-        "answer": '''
-                  SELECT count(distinct person_id)
-                  FROM "YJOA_APPSERVICE_DB"."t_yj_person_status" ps
-                  WHERE ps."status" = '1006'
-                    AND ps."date_value" LIKE '2025-08%'
-                    AND ps."dr" = 0 LIMIT 1000
-                  '''
-    },
+
     {
         "question": "负责智能体相关工作的是哪些员工",
         "answer": '''
@@ -176,19 +119,7 @@ question_and_answer = [
                   FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database"
                   WHERE "work_content" LIKE '%智能体%' LIMIT 1000
                   '''
-    },{
-        "question": "9月，旷工，迟到分别有多少人",
-        "answer": '''
-                  SELECT CASE WHEN "status" = '1006' THEN '迟到' WHEN "status" = '1005' THEN '旷工' END AS "status_name",
-                         COUNT(DISTINCT "person_id")                                                    AS "person_count"
-                  FROM "YJOA_APPSERVICE_DB"."t_yj_person_status"
-                  WHERE "status" IN ('1006', '1005')
-                    AND "date_value" LIKE '2025-09%'
-                    AND "dr" = 0
-                  GROUP BY "status"
-                  ORDER BY "status" LIMIT 1000
-                  '''
-    },{
+    }, {
         "question": "在研发基地工作的有哪些员工",
         "answer": '''
                   SELECT "id"             AS "id",
@@ -201,6 +132,141 @@ question_and_answer = [
                   WHERE ("office_address" LIKE '%研发基地%' OR "office_city" LIKE '%研发基地%')
                     AND "dr" = '0' LIMIT 1000
                   '''
+    },
+    {
+        "question": "查询张三9月在林芝的打卡记录",
+        "answer": '''
+                  SELECT a."person_name"                         AS "姓名",
+                         a."person_id"                           AS "人员ID",
+                         a."attendance_time"                     AS "考勤时间",
+                         a."attendance_address"                  AS "考勤地址",
+                         CASE
+                             WHEN a."status" = 0 THEN '在岗'
+                             WHEN a."status" = 1 THEN '出差'
+                             WHEN a."status" = 2 THEN '休假' END AS "状态",
+                         CASE
+                             WHEN a."enter_or_exit" = 0 THEN '进'
+                             WHEN a."enter_or_exit" = 1
+                                 THEN '出' END                   AS "进出类型",
+                         CASE
+                             WHEN b."region" = 1 THEN '北京'
+                             WHEN b."region" = 2 THEN '成都'
+                             WHEN b."region" = 3 THEN '秭归'
+                             WHEN b."region" = 5 THEN '林芝' END AS "地区", AS "门禁点"
+                  FROM "YJOA_APPSERVICE_DB"."t_yj_person_attendance" a
+                      JOIN "YJOA_APPSERVICE_DB"."t_yj_person_ac_area" b
+                  ON a."access_control_point" = b."ac_point"
+                  WHERE a."person_name" = '张三'
+                    AND b."region" = 5
+                    AND a."attendance_time" >= '2025-09-01'
+                    AND a."attendance_time"
+                      < '2025-10-01'
+                    AND a."dr" = 0
+                  ORDER BY a."attendance_time" DESC LIMIT 1000
+                  '''
+    }, {
+        "question": "查询张三9月份有多少天在岗",
+        "answer": '''
+                  SELECT p."code"                                         AS "工号",
+                         p."name"                                         AS "姓名",
+                         CASE
+                             WHEN p."internal_unit" IS NOT NULL AND p."internal_unit" != '' THEN p."internal_unit"
+                             ELSE p."external_unit"
+                             END                                          AS "单位",
+                         COUNT(CASE WHEN ps."status" = '1001' THEN 1 END) AS "在岗天数"
+                  FROM YJOA_APPSERVICE_DB."t_yj_person_status" ps
+                           JOIN YJOA_APPSERVICE_DB."t_pr3rl2oj_yj_person_database" p ON ps."person_id" = p."code"
+                  WHERE p."name" = '张三'
+                    AND ps."date_value" LIKE '2025-09%'
+                    AND ps."dr" = 0
+                    AND p."dr" = 0
+                  GROUP BY p."code", p."name",
+                           CASE
+                               WHEN p."internal_unit" IS NOT NULL AND p."internal_unit" != '' THEN p."internal_unit"
+                               ELSE p."external_unit"
+                               END LIMIT 1000
+                  '''
+    }, {
+        "question": "数信中心 部门下有多少员工",
+        "answer": '''
+                  select count(*)
+                  from YJOA_APPSERVICE_DB.t_pr3rl2oj_yj_person_database
+                  where internal_dept in (SELECT "id"
+                                          FROM "IUAP_APDOC_BASEDOC"."org_orgs" START
+                  WITH "name" LIKE '%数信中心%'
+                  CONNECT BY PRIOR "id" = "parentid"
+                      )
+
+
+                  '''
+    },
+    {
+        "question": "各个外部单位下的员工人数统计",
+        "answer": '''
+                  sELECT "external_unit" AS "外部单位", COUNT(*) AS "员工人数"
+                  FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database"
+                  WHERE "external_unit" IS NOT NULL
+                    AND "external_unit" != ''
+                  GROUP BY "external_unit"
+                  ORDER BY "员工人数" DESC LIMIT 1000
+                  '''
+    },
+    {
+        "question": "数信中心下各个处室分别有多少人",
+        "answer": '''
+                  SELECT o.name AS "处室名称", COUNT(p.id) AS "人数"
+                  FROM YJOA_APPSERVICE_DB.t_pr3rl2oj_yj_person_database p
+                           JOIN IUAP_APDOC_BASEDOC.org_orgs o ON p.internal_dept = o.id
+                  WHERE o.parentid IN (SELECT id FROM IUAP_APDOC_BASEDOC.org_orgs WHERE name LIKE '%数信中心%')
+                    AND p.dr = 0
+                  GROUP BY o.name
+                  ORDER BY "人数" DESC LIMIT 1000
+                  '''
+    }, {
+        "question": "张三9月在林芝工作有多少天",
+        "answer": '''
+                  SELECT count(distinct (TO_CHAR(a."attendance_time", 'yyyy-MM-dd'))) as count
+                  FROM "YJOA_APPSERVICE_DB"."t_yj_person_attendance" a LEFT JOIN "YJOA_APPSERVICE_DB"."t_yj_person_ac_area" b
+                  ON a."access_control_point" = b."ac_point"
+
+                  WHERE a."person_name" = '张三'
+                    and b.region=5
+                    AND a."attendance_time" >= '2025-09-01'
+                    AND a."attendance_time"
+                      < '2025-10-01'
+                    AND a."dr" = 0 LIMIT 1000
+                  '''
+    },
+    {
+        "question": "10月数信中心有哪些有员工请假",
+        "answer": '''
+                  SELECT  p."id"                                                               AS "id",
+                                  p."code"                                                             AS "工号",
+                                  p."name"                                                             AS "姓名",
+                                  p."internal_unit"                                                    AS "内部单位",
+                                  p."external_unit"                                                    AS "外部单位",
+                                  CASE WHEN ps."status" = '1003' THEN '休假,请假' ELSE ps."status" END AS "状态"
+                  FROM "YJOA_APPSERVICE_DB"."t_pr3rl2oj_yj_person_database" p
+                           INNER JOIN "YJOA_APPSERVICE_DB"."t_yj_person_status" ps ON p."code" = ps."person_id"
+                  WHERE ps."status" = '1003'
+                    AND ps."date_value" LIKE '2025-10%'
+                    and p.internal_dept in (SELECT "id"
+                                          FROM "IUAP_APDOC_BASEDOC"."org_orgs" START
+                  WITH "name" LIKE '%数信中心%'
+                  CONNECT BY PRIOR "id" = "parentid"
+                      )
+                    AND p."dr" = 0
+                    AND ps."dr" = 0 LIMIT 1000
+                  '''
+    },
+    {
+        "question": "有多少个人迟到，9月",
+        "answer": '''
+                  SELECT COUNT(DISTINCT ps."person_id") AS "迟到人数"
+                  FROM "YJOA_APPSERVICE_DB"."t_yj_person_status" ps
+                  WHERE ps."status" = '1006'
+                    AND ps."date_value" LIKE '2025-09%' LIMIT 1000
+                  '''
     }
 
 ]

util/train_ddl.py

@@ -443,12 +443,26 @@ person_ddl_sql = """
   ],
   "relationships": [
     {
-      "from": "ytenant_id",
-      "to_table": "租户表",
+      "from": "input_dept",
+      "to_table": "IUAP_APDOC_BASEDOC.org_orgs",
       "to_field": "id",
       "type": "foreign_key",
-      "comment": "关联租户信息"
-    }
+      "comment": "关联部门表"
+    },
+    {
+      "from": "internal_dept",
+      "to_table": "IUAP_APDOC_BASEDOC.org_orgs",
+      "to_field": "id",
+      "type": "foreign_key",
+      "comment": "关联部门表"
+    },
+    {
+      "from": "internal_unit",
+      "to_table": "IUAP_APDOC_BASEDOC.org_orgs",
+      "to_field": "id",
+      "type": "foreign_key",
+      "comment": "关联部门表"
+    },
   ],
  
   "tags": ["人员管理", "人力资源", "审批流程", "基本信息", "工作信息"],
@@ -461,8 +475,9 @@ train_document='''
                 查询地址，籍贯，公司，单位时，尽量使用like查询;
                 查询人员信息时,由于数据表字段过多。只需要展示人员关键信息字段，id，工号，姓名，单位以及用户问题中需要查询的字段;
                 表字段信息以及字段枚举信息在values下，注意相关字段枚举值的转换;
-                查询单位信息时，内部单位和外部单位都需要查询，用OR条件查询;
-                
+                查询单位时，通过orgs表查询，且需要基于parentID查询递归查询单位下的子单位；
+                查询内部单位时，则可以直接查询人员信息表，通过like模糊查询;
+                没有明确说明查询外部单位，都默认查询通过orgs查询单位;
         '''
 
 rule_ddl='''
@@ -509,7 +524,7 @@ rule_ddl='''
     {
       "name": "region",
       "type": "VARCHAR(50)",
-      "comment": "区域",
+      "comment": "地区",
       "value":{
         "1":"北京",
         "2":"成都",
@@ -518,14 +533,14 @@ rule_ddl='''
         "5": "林芝"
       },
       "role": "dimension",
-      "tags": [ "考勤的位置","非办公区域不要混淆","枚举"]
+      "tags": [ "考勤的地区位置","非办公区域，不要混淆","枚举"]
     },
   ],
   "relationships": [
     {
       "from": "region",
-      "to_table": "区域配置表",
-      "to_field": "region_code",
+      "to_table": "t_yj_person_ac_area",
+      "to_field": "region",
       "type": "foreign_key",
       "comment": "关联区域配置信息"
     }
@@ -539,7 +554,7 @@ user_status_ddl='''
 {
   "db_name":"YJOA_APPSERVICE_DB",
   "table_name": "t_yj_person_status",
-  "table_comment": "人员状态记录表，记录人员每日考勤状态信息包括西藏地区标识",
+  "table_comment": "人员状态记录表，记录人员每日考勤汇总状态信息包括西藏地区标识",
   "columns": [
     {
       "name": "id",
@@ -617,4 +632,263 @@ user_status_ddl='''
  
   "tags": ["人员状态", "状态记录", "地区管理", "西藏标识", "每日状态"]
 }
+'''
+
+user_attendance_ddl = '''
+{
+  "db_name": "YJOA_APPSERVICE_DB",
+  "table_name": "t_yj_person_attendance",
+  "table_comment": "人员考勤记录打卡表，存储员工的打卡记录、考勤状态和位置信息",
+  "columns": [
+    {
+      "name": "id",
+      "type": "VARCHAR(200)",
+      "comment": "主键ID",
+      "role": "dimension",
+      "tags": ["主键", "ID标识"]
+    },
+    {
+      "name": "person_name",
+      "type": "VARCHAR(50)",
+      "comment": "人员姓名",
+      "role": "dimension",
+      "tags": ["人员信息", "姓名"]
+    },
+    {
+      "name": "person_id",
+      "type": "VARCHAR(200)",
+      "comment": "人员ID",
+      "role": "dimension",
+      "tags": ["人员标识", "关联字段"]
+    },
+    {
+      "name": "phone_number",
+      "type": "VARCHAR(50)",
+      "comment": "手机号码",
+      "role": "dimension",
+      "tags": ["联系方式", "人员信息"]
+    },
+    {
+      "name": "attendance_time",
+      "type": "DATETIME",
+      "comment": "考勤时间",
+      "role": "dimension",
+      "tags": ["时间戳", "打卡时间", "关键时间"]
+    },
+    {
+      "name": "attendance_address",
+      "type": "VARCHAR(200)",
+      "comment": "考勤地址",
+      "role": "dimension",
+      "tags": ["位置信息", "打卡地点"]
+    },
+    {
+      "name": "status",
+      "type": "INT",
+      "comment": "状态",
+      "value": {
+        "0": "在岗",
+        "1": "出差",
+        "2": "休假"
+      },
+      "role": "dimension",
+      "tags": ["状态标识", "人员在岗状态","枚举"]
+    },
+    {
+      "name": "original_id",
+      "type": "VARCHAR(200)",
+      "comment": "原始ID",
+      "role": "dimension",
+      "tags": ["原数据ID"]
+    },
+    {
+      "name": "source",
+      "type": "VARCHAR(50)",
+      "comment": "数据来源",
+      "value": {
+        "APP": "手机应用",
+        "DEVICE": "考勤设备",
+        "SYSTEM": "系统导入"
+      },
+      "role": "dimension",
+      "tags": ["来源系统", "数据渠道"]
+    },
+    {
+      "name": "dr",
+      "type": "INT",
+      "comment": "删除标志",
+      "value": {
+        "0": "正常",
+        "1": "已删除"
+      },
+      "role": "dimension",
+      "tags": ["软删除", "数据状态"]
+    },
+   
+    {
+      "name": "enter_or_exit",
+      "type": "INT",
+      "comment": "进出类型",
+      "value": {
+        "0": "进",
+        "1": "出"
+      },
+      "role": "dimension",
+      "tags": ["进出标识", "打卡方向"]
+    },
+    {
+      "name": "access_control_point",
+      "type": "VARCHAR(50)",
+      "comment": "门禁点",
+      "role": "dimension",
+      "tags": ["门禁位置", "打卡设备点"]
+    },
+    {
+      "name": "by_go_type",
+      "type": "VARCHAR(8)",
+      "comment": "打卡类型",
+      "role": "dimension",
+      "tags": ["类型标识", "打卡类型"]
+    }
+  ],
+  "relationships": [
+    {
+      "from": "person_id",
+      "to_table": "t_pr3rl2oj_yj_person_database",
+      "to_field": "code",
+      "type": "foreign_key",
+      "comment": "关联人员基本信息"
+    },
+    {
+      "from": "access_control_point",
+      "to_table": "t_yj_person_ac_position",
+      "to_field": "ac_point",
+      "type": "foreign_key",
+      "comment": "关联门禁点配置信息"
+    }
+  ],
+  "tags": ["考勤记录", "打卡数据", "人员考勤", "时间记录", "位置信息", "门禁系统"]
+}
+'''
+
+person_ac_position = '''
+{
+  "db_name":"YJOA_APPSERVICE_DB",
+  "table_name": "t_yj_person_ac_position",
+  "table_comment": "门禁控制点位置记录",
+  "columns": [
+    {
+      "name": "ac_point",
+      "type": "VARCHAR(50)",
+      "comment": "门禁点",
+      "role": "dimension",
+      "tags": ["门禁点", "门禁点标识"]
+    },
+    {
+      "name": "position",
+      "type": "VARCHAR(50)",
+      "comment": "位置编号",
+      "role": "dimension",
+      "tags": ["门禁位置"]
+    },
+  ],
+  "relationships": [
+    {
+      "from": "ac_point",
+      "to_table": "t_yj_person_ac_area",
+      "to_field": "ac_point",
+      "type": "foreign_key",
+      "comment": "关联门禁区域关系表"
+    },
+  ],
+ 
+  "tags": ["门禁控制点","门禁位置"]
+}
+'''
+
+person_ac_area = '''
+{
+  "db_name":"YJOA_APPSERVICE_DB",
+  "table_name": "t_yj_person_ac_area",
+  "table_comment": "门禁区域关系表",
+  "columns": [
+    {
+      "name": "ac_point",
+      "type": "VARCHAR(50)",
+      "comment": "门禁点",
+      "role": "dimension",
+      "tags": ["门禁点", "门禁点标识"]
+    },
+    {
+      "name": "area",
+      "type": "Int",
+      "comment": "区域位置",
+      "role": "dimension",
+      "tags": ["门禁所属区域"]
+    },
+    {
+      "name": "region",
+      "type": "Int",
+      "comment": "地区位置",
+      "value":{
+        "1":"北京",
+        "2":"成都",
+        "3":"秭归",
+        "5":"林芝"
+      },
+      "role": "dimension",
+      "tags": ["门禁所属地区"]
+    },
+  ],
+ 
+  "tags": ["门禁详情","门禁区域位置","门禁地区信息","枚举"]
+}
+'''
+
+
+org_orgs_ddl = '''
+{
+  "db_name":"IUAP_APDOC_BASEDOC",
+  "table_name": "org_orgs",
+  "table_comment": "人员状态记录表，记录人员每日考勤状态信息包括西藏地区标识",
+  "columns": [
+    {
+      "name": "id",
+      "type": "VARCHAR(36)",
+      "comment": "主键ID",
+      "role": "dimension",
+      "tags": ["主键", "id标识"]
+    },
+     {
+      "name": "parentid",
+      "type": "VARCHAR(36)",
+      "comment": "父级部门ID",
+      "role": "dimension",
+      "tags": ["主键", "id标识"]
+    },
+    {
+      "name": "code",
+      "type": "VARCHAR(50)",
+      "comment": "编号",
+      "role": "dimension",
+      "tags": ["部门编号"]
+    },
+    {
+      "name": "name",
+      "type": "VARCHAR(50)",
+      "comment": "部门名称",
+      "role": "dimension",
+      "tags": ["部门名称"，"单位名称"]
+    },
+    {
+      "name": "shortname",
+      "type": "VARCHAR(1152)",
+      "comment": "部门简称",
+      "role": "dimension",
+      "tags": ["部门名称","部门简称","部门缩写"]
+    },
+  ],
+ 
+  "tags": ["部门id","部门信息","部门名称"]
+}
 '''