diff --git a/AI/Text2Sql/Model/__pycache__/biModel.cpython-310.pyc b/AI/Text2Sql/Model/__pycache__/biModel.cpython-310.pyc index 9412da1a..7ba4c46c 100644 Binary files a/AI/Text2Sql/Model/__pycache__/biModel.cpython-310.pyc and b/AI/Text2Sql/Model/__pycache__/biModel.cpython-310.pyc differ diff --git a/AI/Text2Sql/Model/biModel.py b/AI/Text2Sql/Model/biModel.py index 13bfe7fb..fb591990 100644 --- a/AI/Text2Sql/Model/biModel.py +++ b/AI/Text2Sql/Model/biModel.py @@ -138,35 +138,38 @@ async def get_column_names(db: asyncpg.Connection, sql: str): return column_names else: return [] + def generate_columns(data): """ 根据数据生成 category_columns_str 和 value_column_str - :param data: 数据集(列表字典格式,例如:[{"行政区划": "北京", "学校": "清华附中", "课程数量": 100}, ...]) + :param data: 数据集(列表字典格式,例如:[{"行政区划名": "二道区", "学校名称": "清华附中", "课程数量": 100}, ...]) :return: (category_columns_str, value_column_str) """ # 获取所有字段名 columns = list(data[0].keys()) if data else [] - # 1. 有行政区划+学校两个字段的 - if any("行政区划" in col for col in columns) and any("学校" in col for col in columns): - category_columns_str = "行政区划,学校" + # 1. 有行政区划名+学校名称两个字段的 + if "行政区划名" in columns and "学校名称" in columns: + category_columns_str = "行政区划名,学校名称" + elif "行政区划" in columns and "学校名称" in columns: + category_columns_str = "行政区划,学校名称" # 2. 有学段+科目的 - elif any("学段" in col for col in columns) and any("科目" in col for col in columns): + elif "学段" in columns and "科目" in columns: category_columns_str = "学段,科目" - # 3. 只有行政区的 - elif any("行政区划" in col for col in columns): - category_columns_str = "行政区划" + # 3. 只有行政区划名的 + elif "行政区划名" in columns: + category_columns_str = "行政区划名" # 4. 只有学段的 - elif any("学段" in col for col in columns): + elif "学段" in columns: category_columns_str = "学段" # 5. 上面都不是的,用第一个字段记录 else: category_columns_str = columns[0] if columns else "" # 6. Y轴一般的常见词是:课程数量,数量,如果都没有,用最后一个字段记录 - if any("课程数量" in col for col in columns): + if "课程数量" in columns: value_column_str = "课程数量" - elif any("数量" in col for col in columns): + elif "数量" in columns: value_column_str = "数量" else: value_column_str = columns[-1] if columns else "" diff --git a/AI/Text2Sql/static/html/d103f661-3337-4439-bc21-817e1ec79167.html b/AI/Text2Sql/static/html/d103f661-3337-4439-bc21-817e1ec79167.html new file mode 100644 index 00000000..abc5249c --- /dev/null +++ b/AI/Text2Sql/static/html/d103f661-3337-4439-bc21-817e1ec79167.html @@ -0,0 +1,500 @@ + + +
+ +