From 8b55f0c5b6a0c7b5503df6b514d7fe4760940757 Mon Sep 17 00:00:00 2001
From: 2991692032 <cizq297@gmail.com>
Date: Fri, 23 May 2025 14:54:14 +0800
Subject: [PATCH] v2

---
 Front/vue-unilife/src/api/schedule.ts         |  6 ++++++
 .../src/views/schedule/CourseTableView.vue    | 21 +++++++++++++++++--
 .../unilife/controller/CourseController.java  | 11 ++++++++++
 .../java/com/unilife/mapper/CourseMapper.java |  8 +++++++
 .../unilife/model/dto/CreateCourseDTO.java    |  5 +++++
 .../java/com/unilife/model/entity/Course.java |  5 +++++
 .../java/com/unilife/model/vo/CourseVO.java   |  5 +++++
 .../com/unilife/service/CourseService.java    |  8 +++++++
 .../service/impl/CourseServiceImpl.java       | 20 ++++++++++++++++++
 unilife-server/src/main/resources/db/init.sql |  8 ++++++-
 .../main/resources/mappers/CourseMapper.xml   | 20 +++++++++++++-----
 11 files changed, 109 insertions(+), 8 deletions(-)

diff --git a/Front/vue-unilife/src/api/schedule.ts b/Front/vue-unilife/src/api/schedule.ts
index bfe2577..36219a5 100644
--- a/Front/vue-unilife/src/api/schedule.ts
+++ b/Front/vue-unilife/src/api/schedule.ts
@@ -44,6 +44,7 @@ export interface CreateCourseParams {
   endTime: string;
   startWeek: number;
   endWeek: number;
+  semester?: string;
   color?: string;
 }
 
@@ -91,6 +92,11 @@ export default {
     return get<{ code: number; data: { total: number; list: CourseItem[] } }>(`/courses/day/${dayOfWeek}`);
   },
   
+  // 获取用户在指定学期的课程
+  getCoursesBySemester(semester: string) {
+    return get<{ code: number; data: { total: number; list: CourseItem[] } }>(`/courses/semester/${semester}`);
+  },
+  
   // 更新课程
   updateCourse(id: number, data: UpdateCourseParams) {
     return put<{ code: number; message: string }>(`/courses/${id}`, data);
diff --git a/Front/vue-unilife/src/views/schedule/CourseTableView.vue b/Front/vue-unilife/src/views/schedule/CourseTableView.vue
index 56e55f2..adea693 100644
--- a/Front/vue-unilife/src/views/schedule/CourseTableView.vue
+++ b/Front/vue-unilife/src/views/schedule/CourseTableView.vue
@@ -14,7 +14,7 @@
         <div class="filter-row">
           <div class="semester-selector">
             <span class="filter-label">学期：</span>
-            <el-select v-model="currentSemester" placeholder="选择学期" style="min-width: 220px;">
+            <el-select v-model="currentSemester" placeholder="选择学期" style="min-width: 220px;" @change="handleSemesterChange">
               <el-option label="2023-2024学年第一学期" value="2023-1"></el-option>
               <el-option label="2023-2024学年第二学期" value="2023-2"></el-option>
             </el-select>
@@ -264,6 +264,7 @@ const courseForm = reactive({
   endTime: '',
   startWeek: 1,
   endWeek: 16,
+  semester: '2023-1', // 默认学期
   color: '#409EFF'
 });
 
@@ -293,7 +294,15 @@ onMounted(async () => {
 const fetchCourses = async () => {
   loading.value = true;
   try {
-    const res = await scheduleApi.getAllCourses();
+    let res;
+    if (currentSemester.value) {
+      // 按学期查询
+      res = await scheduleApi.getCoursesBySemester(currentSemester.value);
+    } else {
+      // 查询所有课程
+      res = await scheduleApi.getAllCourses();
+    }
+    
     if (res.code === 200) {
       courses.value = res.data.list;
     }
@@ -364,6 +373,7 @@ const handleCellClick = (day: number, timeSlotId: number) => {
   
   courseForm.startWeek = currentWeek.value;
   courseForm.endWeek = currentWeek.value + 15 > 20 ? 20 : currentWeek.value + 15;
+  courseForm.semester = currentSemester.value; // 设置当前学期
   courseForm.color = getRandomColor();
   
   courseDialogVisible.value = true;
@@ -392,6 +402,7 @@ const handleAddCourse = () => {
   courseForm.endTime = '09:40';
   courseForm.startWeek = 1;
   courseForm.endWeek = 16;
+  courseForm.semester = currentSemester.value; // 设置当前学期
   courseForm.color = getRandomColor();
   
   courseDialogVisible.value = true;
@@ -591,6 +602,7 @@ const saveCourse = async () => {
       endTime: formatTime(courseForm.endTime),
       startWeek: courseForm.startWeek,
       endWeek: courseForm.endWeek,
+      semester: courseForm.semester,
       color: courseForm.color || '#409EFF'
     };
 
@@ -667,6 +679,11 @@ const getRandomColor = () => {
   ];
   return colors[Math.floor(Math.random() * colors.length)];
 };
+
+// 学期选择变化处理
+const handleSemesterChange = () => {
+  fetchCourses();
+};
 </script>
 
 <style scoped>
diff --git a/unilife-server/src/main/java/com/unilife/controller/CourseController.java b/unilife-server/src/main/java/com/unilife/controller/CourseController.java
index 92f807a..47b2eb5 100644
--- a/unilife-server/src/main/java/com/unilife/controller/CourseController.java
+++ b/unilife-server/src/main/java/com/unilife/controller/CourseController.java
@@ -63,6 +63,17 @@ public class CourseController {
         return courseService.getCourseListByDayOfWeek(userId, dayOfWeek);
     }
 
+    @Operation(summary = "获取用户在指定学期的课程")
+    @GetMapping("/semester/{semester}")
+    public Result<?> getCourseListBySemester(@PathVariable("semester") String semester) {
+        // 从当前上下文获取用户ID
+        Long userId = BaseContext.getId();
+        if (userId == null) {
+            return Result.error(401, "未登录");
+        }
+        return courseService.getCourseListBySemester(userId, semester);
+    }
+
     @Operation(summary = "更新课程")
     @PutMapping("/{id}")
     public Result<?> updateCourse(
diff --git a/unilife-server/src/main/java/com/unilife/mapper/CourseMapper.java b/unilife-server/src/main/java/com/unilife/mapper/CourseMapper.java
index 2ef6aab..6b2e271 100644
--- a/unilife-server/src/main/java/com/unilife/mapper/CourseMapper.java
+++ b/unilife-server/src/main/java/com/unilife/mapper/CourseMapper.java
@@ -52,6 +52,14 @@ public interface CourseMapper {
      */
     List<Course> getListByUserIdAndDayOfWeek(@Param("userId") Long userId, @Param("dayOfWeek") Byte dayOfWeek);
     
+    /**
+     * 获取用户在指定学期的课程
+     * @param userId 用户ID
+     * @param semester 学期（如：2023-1）
+     * @return 课程列表
+     */
+    List<Course> getListByUserIdAndSemester(@Param("userId") Long userId, @Param("semester") String semester);
+    
     /**
      * 检查用户在指定时间段是否有课程冲突
      * @param userId 用户ID
diff --git a/unilife-server/src/main/java/com/unilife/model/dto/CreateCourseDTO.java b/unilife-server/src/main/java/com/unilife/model/dto/CreateCourseDTO.java
index d192923..bce3205 100644
--- a/unilife-server/src/main/java/com/unilife/model/dto/CreateCourseDTO.java
+++ b/unilife-server/src/main/java/com/unilife/model/dto/CreateCourseDTO.java
@@ -51,6 +51,11 @@ public class CreateCourseDTO {
      */
     private Byte endWeek;
     
+    /**
+     * 学期（如：2023-1）
+     */
+    private String semester;
+    
     /**
      * 显示颜色
      */
diff --git a/unilife-server/src/main/java/com/unilife/model/entity/Course.java b/unilife-server/src/main/java/com/unilife/model/entity/Course.java
index bd60138..e01ff39 100644
--- a/unilife-server/src/main/java/com/unilife/model/entity/Course.java
+++ b/unilife-server/src/main/java/com/unilife/model/entity/Course.java
@@ -70,6 +70,11 @@ public class Course implements Serializable {
      */
     private Byte endWeek;
 
+    /**
+     * 学期（如：2023-1）
+     */
+    private String semester;
+
     /**
      * 显示颜色
      */
diff --git a/unilife-server/src/main/java/com/unilife/model/vo/CourseVO.java b/unilife-server/src/main/java/com/unilife/model/vo/CourseVO.java
index a55a813..2fbfc22 100644
--- a/unilife-server/src/main/java/com/unilife/model/vo/CourseVO.java
+++ b/unilife-server/src/main/java/com/unilife/model/vo/CourseVO.java
@@ -66,6 +66,11 @@ public class CourseVO {
      */
     private Byte endWeek;
     
+    /**
+     * 学期（如：2023-1）
+     */
+    private String semester;
+    
     /**
      * 显示颜色
      */
diff --git a/unilife-server/src/main/java/com/unilife/service/CourseService.java b/unilife-server/src/main/java/com/unilife/service/CourseService.java
index 4bb152f..1688fe4 100644
--- a/unilife-server/src/main/java/com/unilife/service/CourseService.java
+++ b/unilife-server/src/main/java/com/unilife/service/CourseService.java
@@ -38,6 +38,14 @@ public interface CourseService {
      */
     Result getCourseListByDayOfWeek(Long userId, Byte dayOfWeek);
     
+    /**
+     * 获取用户在指定学期的课程
+     * @param userId 用户ID
+     * @param semester 学期（如：2023-1）
+     * @return 结果
+     */
+    Result getCourseListBySemester(Long userId, String semester);
+    
     /**
      * 更新课程
      * @param courseId 课程ID
diff --git a/unilife-server/src/main/java/com/unilife/service/impl/CourseServiceImpl.java b/unilife-server/src/main/java/com/unilife/service/impl/CourseServiceImpl.java
index 0c48a1d..c23adac 100644
--- a/unilife-server/src/main/java/com/unilife/service/impl/CourseServiceImpl.java
+++ b/unilife-server/src/main/java/com/unilife/service/impl/CourseServiceImpl.java
@@ -137,6 +137,26 @@ public class CourseServiceImpl implements CourseService {
         return Result.success(data);
     }
 
+    @Override
+    public Result getCourseListBySemester(Long userId, String semester) {
+        // 获取用户在指定学期的课程
+        List<Course> courses = courseMapper.getListByUserIdAndSemester(userId, semester);
+
+        // 转换为VO
+        List<CourseVO> courseVOs = courses.stream().map(course -> {
+            CourseVO courseVO = new CourseVO();
+            BeanUtil.copyProperties(course, courseVO);
+            return courseVO;
+        }).collect(Collectors.toList());
+
+        // 返回结果
+        Map<String, Object> data = new HashMap<>();
+        data.put("total", courseVOs.size());
+        data.put("list", courseVOs);
+
+        return Result.success(data);
+    }
+
     @Override
     @Transactional
     public Result updateCourse(Long courseId, Long userId, CreateCourseDTO createCourseDTO) {
diff --git a/unilife-server/src/main/resources/db/init.sql b/unilife-server/src/main/resources/db/init.sql
index 3969e76..4f96b17 100644
--- a/unilife-server/src/main/resources/db/init.sql
+++ b/unilife-server/src/main/resources/db/init.sql
@@ -146,11 +146,13 @@ CREATE TABLE IF NOT EXISTS `courses` (
   `end_time` TIME NOT NULL COMMENT '结束时间',
   `start_week` TINYINT NOT NULL COMMENT '开始周次',
   `end_week` TINYINT NOT NULL COMMENT '结束周次',
+  `semester` VARCHAR(20) DEFAULT NULL COMMENT '学期（如：2023-1）',
   `color` VARCHAR(20) DEFAULT NULL COMMENT '显示颜色',
   `status` TINYINT DEFAULT 1 COMMENT '状态（0-删除, 1-正常）',
   `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `updated_at` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   INDEX `idx_user_id` (`user_id`),
+  INDEX `idx_semester` (`semester`),
   FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='课程表';
 
@@ -184,4 +186,8 @@ INSERT INTO `categories` (`name`, `description`, `icon`, `sort`, `status`) VALUE
 
 -- 初始化管理员账号
 INSERT INTO `users` (`username`, `email`, `password`, `nickname`, `role`, `status`, `is_verified`) VALUES
-('admin', 'admin@unilife.com', '123456', '系统管理员', 2, 1, 1);
\ No newline at end of file
+('admin', 'admin@unilife.com', '123456', '系统管理员', 2, 1, 1);
+
+-- 数据库迁移：为现有courses表添加semester字段
+ALTER TABLE `courses` ADD COLUMN `semester` VARCHAR(20) DEFAULT NULL COMMENT '学期（如：2023-1）' AFTER `end_week`;
+ALTER TABLE `courses` ADD INDEX `idx_semester` (`semester`);
\ No newline at end of file
diff --git a/unilife-server/src/main/resources/mappers/CourseMapper.xml b/unilife-server/src/main/resources/mappers/CourseMapper.xml
index c5327b6..479b810 100644
--- a/unilife-server/src/main/resources/mappers/CourseMapper.xml
+++ b/unilife-server/src/main/resources/mappers/CourseMapper.xml
@@ -12,6 +12,7 @@
         <result column="end_time" property="endTime"/>
         <result column="start_week" property="startWeek"/>
         <result column="end_week" property="endWeek"/>
+        <result column="semester" property="semester"/>
         <result column="color" property="color"/>
         <result column="status" property="status"/>
         <result column="created_at" property="createdAt"/>
@@ -21,23 +22,23 @@
     <insert id="insert" parameterType="com.unilife.model.entity.Course" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO courses (
             user_id, name, teacher, location, day_of_week, start_time, end_time, 
-            start_week, end_week, color, status, created_at, updated_at
+            start_week, end_week, semester, color, status, created_at, updated_at
         ) VALUES (
             #{userId}, #{name}, #{teacher}, #{location}, #{dayOfWeek}, #{startTime}, #{endTime}, 
-            #{startWeek}, #{endWeek}, #{color}, #{status}, NOW(), NOW()
+            #{startWeek}, #{endWeek}, #{semester}, #{color}, #{status}, NOW(), NOW()
         )
     </insert>
     
     <select id="getById" resultMap="courseResultMap">
         SELECT id, user_id, name, teacher, location, day_of_week, start_time, end_time, 
-               start_week, end_week, color, status, created_at, updated_at
+               start_week, end_week, semester, color, status, created_at, updated_at
         FROM courses
         WHERE id = #{id} AND status != 0
     </select>
     
     <select id="getListByUserId" resultMap="courseResultMap">
         SELECT id, user_id, name, teacher, location, day_of_week, start_time, end_time, 
-               start_week, end_week, color, status, created_at, updated_at
+               start_week, end_week, semester, color, status, created_at, updated_at
         FROM courses
         WHERE user_id = #{userId} AND status != 0
         ORDER BY day_of_week ASC, start_time ASC
@@ -53,6 +54,7 @@
             end_time = #{endTime},
             start_week = #{startWeek},
             end_week = #{endWeek},
+            semester = #{semester},
             color = #{color},
             updated_at = NOW()
         WHERE id = #{id} AND user_id = #{userId}
@@ -67,12 +69,20 @@
     
     <select id="getListByUserIdAndDayOfWeek" resultMap="courseResultMap">
         SELECT id, user_id, name, teacher, location, day_of_week, start_time, end_time, 
-               start_week, end_week, color, status, created_at, updated_at
+               start_week, end_week, semester, color, status, created_at, updated_at
         FROM courses
         WHERE user_id = #{userId} AND day_of_week = #{dayOfWeek} AND status != 0
         ORDER BY start_time ASC
     </select>
     
+    <select id="getListByUserIdAndSemester" resultMap="courseResultMap">
+        SELECT id, user_id, name, teacher, location, day_of_week, start_time, end_time, 
+               start_week, end_week, semester, color, status, created_at, updated_at
+        FROM courses
+        WHERE user_id = #{userId} AND semester = #{semester} AND status != 0
+        ORDER BY day_of_week ASC, start_time ASC
+    </select>
+    
     <select id="checkConflict" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM courses