优化集成：实现课程资源关系表权威存储与旧字段兼容修复

RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml

@@ -94,6 +94,10 @@ train:
     identity:
       encryption-key: ${TRAIN_STUDENT_IDENTITY_ENCRYPTION_KEY:}
       hash-key: ${TRAIN_STUDENT_IDENTITY_HASH_KEY:}
+  mock:
+    device:
+      # 模拟设备打卡接口开关 (生产环境与公共配置必须默认关闭，仅允许在测试环境显式开启)
+      enabled: ${TRAIN_MOCK_DEVICE_ENABLED:false}
 
 # token配置
 token:
@@ -142,10 +146,3 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 
-# 培训业务配置
-train:
-  mock:
-    device:
-      # 模拟设备打卡接口开关 (生产环境与公共配置必须默认关闭，仅允许在测试环境显式开启)
-      enabled: false
-

RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/TrainCourse.java

@@ -43,6 +43,10 @@ public class TrainCourse extends BaseEntity
     @Excel(name = "课程内容")
     private String courseContent;
 
+    /** 关联教学资源ID (历史兼容字段，新系统权威关联存储为 train_course_resource) */
+    @Excel(name = "课程资源ID")
+    private String resourceId;
+
     /** 课程状态 (1:正常, 0:停用) */
     @Excel(name = "课程状态", readConverterExp = "1=正常,0=停用")
     private Integer status;
@@ -180,6 +184,16 @@ public class TrainCourse extends BaseEntity
         return courseContent;
     }
 
+    public void setResourceId(String resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceId()
+    {
+        return resourceId;
+    }
+
     public void setStatus(Integer status)
     {
         this.status = status;
@@ -210,6 +224,7 @@ public class TrainCourse extends BaseEntity
             .append("cDuration", getcDuration())
             .append("teachingObjective", getTeachingObjective())
             .append("courseContent", getCourseContent())
+            .append("resourceId", getResourceId())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())

RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/domain/vo/CourseDetailVO.java

@@ -60,6 +60,9 @@ public class CourseDetailVO implements Serializable
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /** 关联教学资源ID (兼容旧接口，优先使用关系表首个资源ID) */
+    private String resourceId;
+
     /**
      * 已关联的教学资源列表
      */
@@ -89,6 +92,7 @@ public class CourseDetailVO implements Serializable
         vo.setCreateTime(course.getCreateTime());
         vo.setUpdateBy(course.getUpdateBy());
         vo.setUpdateTime(course.getUpdateTime());
+        vo.setResourceId(course.getResourceId());
         return vo;
     }
 
@@ -282,6 +286,16 @@ public class CourseDetailVO implements Serializable
         this.updateTime = updateTime;
     }
 
+    public String getResourceId()
+    {
+        return resourceId;
+    }
+
+    public void setResourceId(String resourceId)
+    {
+        this.resourceId = resourceId;
+    }
+
     public List<TrainResource> getResources()
     {
         return resources;

RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/service/impl/TrainCourseServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.train.mapper.TrainCourseMapper;
 import com.ruoyi.train.mapper.TrainCourseResourceMapper;
 import com.ruoyi.train.mapper.TrainPlanCourseMapper;
 import com.ruoyi.train.domain.TrainCourse;
+import com.ruoyi.train.domain.TrainResource;
 import com.ruoyi.train.domain.vo.CourseDetailVO;
 import com.ruoyi.train.service.ITrainCourseService;
 
@@ -46,7 +47,14 @@ public class TrainCourseServiceImpl implements ITrainCourseService
         CourseDetailVO detail = CourseDetailVO.from(course);
         if (detail != null)
         {
-            detail.setResources(trainCourseResourceMapper.selectResourcesByCourseId(cId));
+            List<TrainResource> resources = trainCourseResourceMapper.selectResourcesByCourseId(cId);
+            detail.setResources(resources);
+            // 规范权威读取：优先以 train_course_resource 规范关联表首个资源派生兼容 resourceId；
+            // 若关系表暂无关联但实体存在历史 resourceId，则保留历史 resourceId
+            if (resources != null && !resources.isEmpty())
+            {
+                detail.setResourceId(resources.get(0).getResourceId());
+            }
         }
         return detail;
     }

RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainCourseMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cDuration"    column="c_duration"    />
         <result property="teachingObjective"    column="teaching_objective"    />
         <result property="courseContent"    column="course_content"    />
+        <result property="resourceId"    column="resource_id"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTrainCourseVo">
-        select c_id, c_code, c_name, c_type, c_duration, teaching_objective, course_content, status, del_flag, create_by, create_time, update_by, update_time, remark from train_course
+        select c_id, c_code, c_name, c_type, c_duration, teaching_objective, course_content, resource_id, status, del_flag, create_by, create_time, update_by, update_time, remark from train_course
     </sql>
 
     <select id="selectTrainCourseList" parameterType="TrainCourse" resultMap="TrainCourseResult">
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cDuration != null">c_duration,</if>
             <if test="teachingObjective != null and teachingObjective != ''">teaching_objective,</if>
             <if test="courseContent != null and courseContent != ''">course_content,</if>
+            <if test="resourceId != null and resourceId != ''">resource_id,</if>
             <if test="status != null">status,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cDuration != null">#{cDuration},</if>
             <if test="teachingObjective != null and teachingObjective != ''">#{teachingObjective},</if>
             <if test="courseContent != null and courseContent != ''">#{courseContent},</if>
+            <if test="resourceId != null and resourceId != ''">#{resourceId},</if>
             <if test="status != null">#{status},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cDuration != null">c_duration = #{cDuration},</if>
             <if test="teachingObjective != null">teaching_objective = #{teachingObjective},</if>
             <if test="courseContent != null">course_content = #{courseContent},</if>
+            <if test="resourceId != null">resource_id = #{resourceId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>

RuoYi-Vue/sql/train/v2/012_pilot_20261010_course_resource_relation.sql

@@ -51,7 +51,7 @@ END $$;
 
 -- 步骤 3: 幂等迁移历史 train_course.resource_id 字段数据
 -- 仅当 train_course.resource_id 非空且关联在 train_resource 中有效(del_flag='0')时迁移，
--- 且 ON CONFLICT (c_id, resource_id) DO NOTHING 避免覆盖已存在的关联，亦不破坏已解绑关系。
+-- 且具有重复部署防恢复机制：一旦完成迁移，不会在重复部署时重新恢复用户已解绑的资源关系。
 DO $$
 BEGIN
     IF EXISTS (
@@ -59,6 +59,8 @@ BEGIN
          WHERE table_schema = 'public'
            AND table_name = 'train_course'
            AND column_name = 'resource_id'
+    ) AND NOT EXISTS (
+        SELECT 1 FROM public.train_course_resource WHERE create_by = 'migration_012'
     ) THEN
         INSERT INTO public.train_course_resource
             (c_id, resource_id, sort_no, create_by, create_time)
@@ -82,6 +84,10 @@ BEGIN
            AND r.del_flag = '0'
          WHERE legacy.resource_id <> ''
         ON CONFLICT (c_id, resource_id) DO NOTHING;
+
+        -- 历史关联已安全迁移至 train_course_resource 规范关系表，清空旧有历史字符串以防解绑后重复恢复，
+        -- 物理字段 resource_id 依然保留在 train_course 表中，满足旧系统只读与字段兼容契约。
+        UPDATE public.train_course SET resource_id = NULL WHERE resource_id IS NOT NULL;
     END IF;
 END $$;