供地分析sql相关修改提交

aiAgent_gd/qwen_agent/memory/data/sqls/sql_examples_土地市场监测.jsonl

@@ -2,46 +2,46 @@
  {
  "query_type": "land_supply",
  "query": "2024年的供地中，有多少宗，多少面积？",
- "sql_code": "SELECT COUNT(1) AS 土地宗数,\n       round(SUM(gdzmj), 2) AS 出让总面积 \nFROM tdgy_xminfo \nWHERE to_char(jdsj, 'yyyy') = '2024';"
+ "sql_code": "SELECT COUNT(1) AS 土地宗数,\n       round(SUM(gdzmj), 2) AS 出让总面积 \nFROM ecgap_datacenter.tdgy_xminfo \nWHERE to_char(jdsj, 'yyyy') = '2024';"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我分析杭州市近五年的供地趋势，并绘制折线图（面积趋势）",
- "sql_code": "select extract(year from jdsj) as year,\n       sum(gdzmj) as total_gdzmj\nfrom\n    tdgy_xminfo\nwhere\n    xzqdm like '3301%'\n    and jdsj >= (date_trunc('year', current_date) - interval '4 years')\n    and jdsj < (date_trunc('year', current_date) + interval '1 year')\ngroup by extract(year from jdsj)\norder by year"
+ "sql_code": "select extract(year from jdsj) as year,\n       sum(gdzmj) as total_gdzmj\nfrom\n    ecgap_datacenter.tdgy_xminfo\nwhere\n    xzqdm like '3301%'\n    and jdsj >= (date_trunc('year', current_date) - interval '4 years')\n    and jdsj < (date_trunc('year', current_date) + interval '1 year')\ngroup by extract(year from jdsj)\norder by year"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我分析一下萧山区近5年的供地趋势，并绘制折线图（面积趋势）",
- "sql_code": "SELECT \n    to_char(jdsj, 'yyyy') as year,\n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area\nFROM tdgy_xminfo\nWHERE xzqdm = '330109'  -- 萧山区代码\nAND jdsj >= (date_trunc('year', current_date) - interval '4 years')\nAND jdsj < (date_trunc('year', current_date) + interval '1 year')\nGROUP BY to_char(jdsj, 'yyyy')\nORDER BY year;"
+ "sql_code": "SELECT \n    to_char(jdsj, 'yyyy') as year,\n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE xzqdm = '330109'  -- 萧山区代码\nAND jdsj >= (date_trunc('year', current_date) - interval '4 years')\nAND jdsj < (date_trunc('year', current_date) + interval '1 year')\nGROUP BY to_char(jdsj, 'yyyy')\nORDER BY year;"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我查一下2024年余杭区的供地面积和供地宗数",
- "sql_code": "SELECT \n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area\nFROM tdgy_xminfo\nWHERE xzqdm = '330110'  -- 余杭区代码\nAND to_char(jdsj, 'yyyy') = '2024';"
+ "sql_code": "SELECT \n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE xzqdm = '330110'  -- 余杭区代码\nAND to_char(jdsj, 'yyyy') = '2024';"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我对比一下2024年萧山区和余杭区的供地情况",
- "sql_code": "SELECT \n    xzqdm,\n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area\nFROM tdgy_xminfo\nWHERE xzqdm IN ('330109', '330110')  -- 萧山区和余杭区代码\nAND to_char(jdsj, 'yyyy') = '2024'\nGROUP BY xzqdm;"
+ "sql_code": "SELECT \n    xzqdm,\n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE xzqdm IN ('330109', '330110')  -- 萧山区和余杭区代码\nAND to_char(jdsj, 'yyyy') = '2024'\nGROUP BY xzqdm;"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我分析一下2024年万科在杭州市的拿地情况",
- "sql_code": "SELECT \n    xzqdm,\n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area,\n    round(sum(je), 2) as total_amount\nFROM tdgy_xminfo\nWHERE ssr LIKE '%万科%'\nAND xzqdm like '3301%'\nAND to_char(jdsj, 'yyyy') = '2024'\nGROUP BY xzqdm;"
+ "sql_code": "SELECT \n    xzqdm,\n    count(1) as land_count,\n    round(sum(gdzmj), 2) as total_area,\n    round(sum(je), 2) as total_amount\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE ssr LIKE '%万科%'\nAND xzqdm like '3301%'\nAND to_char(jdsj, 'yyyy') = '2024'\nGROUP BY xzqdm;"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我查找一下项目名称为未来科技城的地块",
- "sql_code": "SELECT \n    tzxmmc,\n    tdzl,\n    gdzmj,\n    je,\n    jdsj\nFROM tdgy_xminfo\nWHERE tzxmmc LIKE '%未来科技城%'\nORDER BY jdsj DESC;"
+ "sql_code": "SELECT \n    tzxmmc,\n    tdzl,\n    gdzmj,\n    je,\n    jdsj\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE tzxmmc LIKE '%未来科技城%'\nORDER BY jdsj DESC;"
  },
  {
  "query_type": "land_supply",
  "query": "2024年的地王是谁",
- "sql_code": "SELECT \n    tzxmmc,\n    tdzl,\n    gdzmj,\n    je,\n    jdsj,\n    ssr\nFROM tdgy_xminfo\nWHERE to_char(jdsj, 'yyyy') = '2024'\nORDER BY je DESC\nLIMIT 1;"
+ "sql_code": "SELECT \n    tzxmmc,\n    tdzl,\n    gdzmj,\n    je,\n    jdsj,\n    ssr\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE to_char(jdsj, 'yyyy') = '2024'\nORDER BY je DESC\nLIMIT 1;"
  },
  {
  "query_type": "land_supply",
  "query": "请帮我列出供地面积大于100亩的地块清单",
- "sql_code": "SELECT \n    tzxmmc,\n    tdzl,\n    round(gdzmj, 2) as area_mu,\n    je,\n    jdsj,\n    ssr\nFROM tdgy_xminfo\nWHERE gdzmj > 100 \nORDER BY gdzmj DESC;"
+ "sql_code": "SELECT \n    tzxmmc,\n    tdzl,\n    round(gdzmj, 2) as area_mu,\n    je,\n    jdsj,\n    ssr\nFROM ecgap_datacenter.tdgy_xminfo\nWHERE gdzmj > 100 \nORDER BY gdzmj DESC;"
  }
 ]

aiAgent_gd/qwen_agent/sub_agent/sql/land_supply_sql_agent.py

@@ -32,7 +32,7 @@ class LandSupplySqlAgent(BaseSubAgent):
         self.SubAgent_Summary_Prompt = "通过查询数据库，检索数据库得到的信息为:\n{obs}\n"
         self.SubAgent_PROMPT = """你是一个PostgreSQL专家，当前需要根据用户问题和上下文，生成语法正确的PostgreSQL查询语句。'
          #数据库表的表名和表结构如下：
-        `public.tdgy_xminfo`(
+        `ecgap_datacenter.tdgy_xminfo`(
             `gd_guid` COMMENTS '供地标识',
             `zd_guid` COMMENTS '宗地标识',
             `xzqdm` COMMENTS '行政区代码',