Update app.py

app.py

@@ -1,10 +1,48 @@
 from flask import Flask, jsonify, render_template, request
 import pandas as pd
 import re
+import json
 from datetime import datetime, timedelta
 
 app = Flask(__name__)
 
+# 加载教室到校区的映射
+try:
+    with open('./数据表/classroom_to_campus_mapping.json', 'r', encoding='utf-8') as f:
+        classroom_to_campus_mapping = json.load(f)
+    print(f"成功加载教室到校区映射，共{len(classroom_to_campus_mapping)}个教室")
+except Exception as e:
+    print(f"加载教室到校区映射失败: {e}")
+    classroom_to_campus_mapping = {}
+
+# 根据教室名称获取校区的函数
+def get_campus_by_classroom(location):
+    """
+    根据教室名称获取校区
+    """
+    if not location:
+        return "未知校区"
+    
+    # 移除括号内容，获取纯教室名称
+    clean_location = re.sub(r'\([^)]*\)', '', location).strip()
+    
+    # 首先尝试直接匹配
+    if location in classroom_to_campus_mapping:
+        return classroom_to_campus_mapping[location]
+    
+    # 尝试匹配清理后的教室名称
+    if clean_location in classroom_to_campus_mapping:
+        return classroom_to_campus_mapping[clean_location]
+    
+    # 如果映射中没有找到，使用原有的逻辑作为备用
+    if "仙葫" in location:
+        return "仙葫校区"
+    elif "五合" in location:
+        return "五合校区"
+    
+    # 默认返回五合校区
+    return "五合校区"
+
 # 加载学生数据表
 student_file_path = r"./数据表/区队-学号-姓名-1.xlsx"
 try:
@@ -154,10 +192,12 @@ def get_student_courses():
             
             # 根据地点判断校区
             location = row["地点"].split("（")[0] if "（" in row["地点"] else row["地点"]
-            campus = "仙葫" if "仙葫" in str(row["地点"]) else "五合"
+            campus = get_campus_by_classroom(str(row["地点"]))
+            # 简化校区名称显示
+            campus_display = campus.replace("校区", "")
             
             results.append({
-                "课程": row["课程"].split("]")[1] if "]" in row["课程"] else row["课程"],
+                "课程": row["课程"].split("]")[1].strip() if "]" in row["课程"] and len(row["课程"].split("]")) > 1 and row["课程"].split("]")[1].strip() else row["课程"],
                 "教师": row["教师"],
                 "地点": location,
                 "星期": day,
@@ -165,7 +205,7 @@ def get_student_courses():
                 "节次": periods,
                 "节次范围": f"第{periods[0]}-{periods[-1]}节",
                 "周次": row["周次"],
-                "校区": campus,
+                "校区": campus_display,
                 "上课班级": str(row["行政班级"]) if "行政班级" in row else ""
             })
 
@@ -207,10 +247,12 @@ def get_courses_by_teacher():
             
             # 根据地点判断校区
             location = row["地点"].split("（")[0] if "（" in row["地点"] else row["地点"]
-            campus = "仙葫" if "仙葫" in str(row["地点"]) else "五合"
+            campus = get_campus_by_classroom(str(row["地点"]))
+            # 简化校区名称显示
+            campus_display = campus.replace("校区", "")
             
             results.append({
-                "课程": row["课程"].split("]")[1] if "]" in row["课程"] else row["课程"],
+                "课程": row["课程"].split("]")[1].strip() if "]" in row["课程"] and len(row["课程"].split("]")) > 1 and row["课程"].split("]")[1].strip() else row["课程"],
                 "教师": row["教师"],
                 "地点": location,
                 "星期": day,
@@ -218,7 +260,7 @@ def get_courses_by_teacher():
                 "节次": periods,
                 "节次范围": f"第{periods[0]}-{periods[-1]}节",
                 "周次": row["周次"],
-                "校区": campus,
+                "校区": campus_display,
                 "上课班级": str(row["行政班级"]) if "行政班级" in row else ""
             })
 
@@ -295,13 +337,40 @@ def get_courses_by_classroom():
     
     # 解析课程信息
     results = []
+    seen_courses = set()  # 用于去重的集合
+    
     for _, row in filtered_data.iterrows():
         day_and_period = parse_day_and_period(str(row["节次"]))
         if day_and_period:
             day, periods = day_and_period
             course_date = calculate_date(week, day)
+            
+            # 提取课程名称
+            raw_course_name = str(row["课程名称"])
+            if "]" in raw_course_name:
+                parts = raw_course_name.split("]")
+                if len(parts) > 1 and parts[1].strip():
+                    course_name = parts[1].strip()
+                else:
+                    course_name = raw_course_name  # 如果分割后为空，使用原始名称
+            else:
+                course_name = raw_course_name
+            
+            # 如果课程名称为空或只有空白字符，跳过这条记录
+            if not course_name or course_name.strip() == "" or course_name == "nan":
+                continue
+            
+            # 创建唯一标识符：星期+节次+课程名称
+            course_key = (day, tuple(periods), course_name)
+            
+            # 如果这个课程时间段组合已经存在，跳过
+            if course_key in seen_courses:
+                continue
+                
+            seen_courses.add(course_key)
+            
             results.append({
-                "课程": str(row["课程名称"]).split("]")[1] if "]" in str(row["课程名称"]) else str(row["课程名称"]),
+                "课程": course_name,
                 "教师": str(row["教师"]),
                 "地点": str(row["教室"]),
                 "星期": day,
@@ -370,10 +439,12 @@ def get_student_courses_v2():
             
             # 根据地点判断校区
             location = row["地点"].split("（")[0] if "（" in row["地点"] else row["地点"]
-            campus = "仙葫" if "仙葫" in str(row["地点"]) else "五合"
+            campus = get_campus_by_classroom(str(row["地点"]))
+            # 简化校区名称显示
+            campus_display = campus.replace("校区", "")
             
             results.append({
-               "课程": row["课程"].split("]")[1] if "]" in row["课程"] else row["课程"],
+               "课程": row["课程"].split("]")[1].strip() if "]" in row["课程"] and len(row["课程"].split("]")) > 1 and row["课程"].split("]")[1].strip() else row["课程"],
                 "教师": row["教师"],
                 "地点": location,
                 "星期": day,
@@ -381,7 +452,7 @@ def get_student_courses_v2():
                 "节次": periods,
                 "节次范围": f"第{periods[0]}-{periods[-1]}节",
                 "周次": row["周次"],
-                "校区": campus,
+                "校区": campus_display,
                 "上课班级": str(row["行政班级"]) if "行政班级" in row else ""
             })