From 527ad7c7a3988aa69beaad238c3a9617bd2cf5dd Mon Sep 17 00:00:00 2001
From: TheBreeze <3246119723@qq.com>
Date: Mon, 25 May 2026 11:38:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=9C=A8=E8=A7=86=E9=A2=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/modules/video.js             |   5 +
 .../components/KnowledgeGraph/NodeDetail.vue  |  57 +++++
 frontend/src/views/VideoPlayer/index.vue      | 197 +++++++++++++++++-
 .../controller/VideoController.java           |   5 +
 .../learningplatform/dto/VideoResponse.java   |   1 +
 .../service/GraphService.java                 |  96 +++++++++
 .../service/VideoService.java                 | 100 +++++++++
 7 files changed, 456 insertions(+), 5 deletions(-)

diff --git a/frontend/src/api/modules/video.js b/frontend/src/api/modules/video.js
index a686971..1fc72f0 100644
--- a/frontend/src/api/modules/video.js
+++ b/frontend/src/api/modules/video.js
@@ -14,6 +14,11 @@ export function getVideoDetail(id) {
   return http.get(`/video/${id}`)
 }
 
+/** 根据知识图谱关联关系推荐相关视频。 */
+export function getRecommendedVideos(id) {
+  return http.get(`/video/${id}/recommendations`)
+}
+
 /** 查询当前用户在某个视频上的观看记录。 */
 export function getWatchRecord(videoId) {
   return http.get(`/video/watch-record/${videoId}`, {
diff --git a/frontend/src/components/KnowledgeGraph/NodeDetail.vue b/frontend/src/components/KnowledgeGraph/NodeDetail.vue
index 226ee08..942bf4d 100644
--- a/frontend/src/components/KnowledgeGraph/NodeDetail.vue
+++ b/frontend/src/components/KnowledgeGraph/NodeDetail.vue
@@ -59,6 +59,36 @@
           </div>
         </div>
       </div>
+
+      <div class="section" v-if="node.relatedVideos?.length">
+        <div class="section-title">相关视频</div>
+        <div class="section-content">
+          <div
+            v-for="video in node.relatedVideos"
+            :key="video.id"
+            class="related-item"
+            @click="openVideo(video.id)"
+          >
+            <span class="related-name">{{ video.title }}</span>
+            <span class="related-type">视频</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="section" v-if="node.relatedExercises?.length">
+        <div class="section-title">配套习题</div>
+        <div class="section-content">
+          <div
+            v-for="exercise in node.relatedExercises"
+            :key="exercise.id"
+            class="related-item"
+            @click="openExercise(exercise)"
+          >
+            <span class="related-name">{{ exercise.title }}</span>
+            <span class="related-type">{{ exerciseTypeLabel(exercise.type) }}</span>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 
@@ -176,6 +206,33 @@ const corePointList = computed(() => {
   if (!props.node?.corePoints) return []
   return props.node.corePoints.split(/[、，,]/).map((s) => s.trim()).filter(Boolean)
 })
+
+const openVideo = (id) => {
+  router.push({ name: 'VideoPlayer', query: { videoId: id } })
+}
+
+const openExercise = (exercise) => {
+  if (!exercise?.id) return
+  if (['SINGLE_CHOICE', 'MULTIPLE_CHOICE'].includes(exercise.type)) {
+    router.push({ path: `/exercise/choice/${exercise.id}` })
+    return
+  }
+  if (exercise.type === 'FILL_BLANK') {
+    router.push({ path: `/exercise/fill/${exercise.id}` })
+    return
+  }
+  router.push({ path: `/exercise/${exercise.id}` })
+}
+
+const exerciseTypeLabel = (type) => {
+  const map = {
+    SINGLE_CHOICE: '单选',
+    MULTIPLE_CHOICE: '多选',
+    FILL_BLANK: '填空',
+    PROGRAMMING: '编程',
+  }
+  return map[type] || '习题'
+}
 </script>
 
 <style scoped>
diff --git a/frontend/src/views/VideoPlayer/index.vue b/frontend/src/views/VideoPlayer/index.vue
index fe8b00a..723d9b9 100644
--- a/frontend/src/views/VideoPlayer/index.vue
+++ b/frontend/src/views/VideoPlayer/index.vue
@@ -45,7 +45,16 @@
         >
           <span class="video-title">{{ item.title }}</span>
           <span class="video-meta">
-            知识点 {{ item.knowledgePointId }}
+            {{ item.knowledgePointName || '未命名知识点' }}
+            <el-tag
+              v-if="item.knowledgePointDifficulty"
+              class="meta-tag"
+              :type="difficultyType(item.knowledgePointDifficulty)"
+              size="small"
+              effect="plain"
+            >
+              {{ difficultyLabel(item.knowledgePointDifficulty) }}
+            </el-tag>
             <template v-if="item.duration"> · {{ formatDuration(item.duration) }}</template>
           </span>
         </button>
@@ -128,6 +137,44 @@
               {{ watchState.isCompleted ? '已标记完成' : '标记为已完成' }}
             </el-button>
           </div>
+
+          <section class="resource-section" v-if="recommendedVideos.length">
+            <div class="resource-header">
+              <h3>图谱推荐视频</h3>
+              <span>来自当前知识点及相邻图谱节点</span>
+            </div>
+            <div class="resource-list">
+              <button
+                v-for="item in recommendedVideos"
+                :key="item.id"
+                class="resource-item"
+                type="button"
+                @click="selectVideo(item)"
+              >
+                <span>{{ item.title }}</span>
+                <small>{{ item.knowledgePointName || '相关知识点' }}</small>
+              </button>
+            </div>
+          </section>
+
+          <section class="resource-section" v-if="relatedExercises.length">
+            <div class="resource-header">
+              <h3>配套习题</h3>
+              <span>看完视频后可直接练习</span>
+            </div>
+            <div class="resource-list">
+              <button
+                v-for="item in relatedExercises"
+                :key="item.id"
+                class="resource-item"
+                type="button"
+                @click="openExercise(item)"
+              >
+                <span>{{ item.title }}</span>
+                <small>{{ exerciseTypeLabel(item.type) }} · {{ difficultyLabel(item.difficulty) }}</small>
+              </button>
+            </div>
+          </section>
         </template>
 
         <el-empty v-else description="请选择一个视频开始学习" />
@@ -137,21 +184,25 @@
 </template>
 
 <script setup>
-import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import { Refresh, Search } from '@element-plus/icons-vue'
-import { getVideoList, getWatchRecord, saveWatchProgress } from '@/api/modules/video.js'
+import { getRecommendedVideos, getVideoList, getWatchRecord, saveWatchProgress } from '@/api/modules/video.js'
+import { getExercisesByKnowledge } from '@/api/modules/exercise.js'
 
 const loading = ref(false)
 const videos = ref([])
 const selectedVideo = ref(null)
+const recommendedVideos = ref([])
+const relatedExercises = ref([])
 const videoRef = ref(null)
 const pendingResumeSeconds = ref(null)
 const lastReportAt = ref(0)
 const embeddedTimer = ref(null)
 const embeddedLastReportAt = ref(0)
 const router = useRouter()
+const route = useRoute()
 
 const filter = reactive({
   knowledgeId: undefined,
@@ -177,7 +228,13 @@ const fetchVideoList = async () => {
       resetWatchState()
       return
     }
-    if (!selectedVideo.value || !videos.value.some((item) => item.id === selectedVideo.value.id)) {
+    const routeVideoId = Number(route.query.videoId)
+    const routeVideo = Number.isFinite(routeVideoId)
+      ? videos.value.find((item) => item.id === routeVideoId)
+      : null
+    if (routeVideo) {
+      await selectVideo(routeVideo)
+    } else if (!selectedVideo.value || !videos.value.some((item) => item.id === selectedVideo.value.id)) {
       await selectVideo(videos.value[0])
     }
   } catch (error) {
@@ -194,6 +251,8 @@ const selectVideo = async (video) => {
   stopEmbeddedTracking()
   selectedVideo.value = video
   resetWatchState()
+  recommendedVideos.value = []
+  relatedExercises.value = []
   pendingResumeSeconds.value = null
 
   try {
@@ -212,6 +271,8 @@ const selectVideo = async (video) => {
       startEmbeddedTracking()
     }
   }
+
+  fetchRelatedResources(video)
 }
 
 const resetFilter = () => {
@@ -227,6 +288,32 @@ const openGraphNode = () => {
   })
 }
 
+const fetchRelatedResources = async (video) => {
+  try {
+    const [videos, exercises] = await Promise.all([
+      getRecommendedVideos(video.id),
+      video.knowledgePointId ? getExercisesByKnowledge(video.knowledgePointId) : Promise.resolve([]),
+    ])
+    recommendedVideos.value = Array.isArray(videos) ? videos : []
+    relatedExercises.value = Array.isArray(exercises) ? exercises.slice(0, 6) : []
+  } catch (error) {
+    console.error('Failed to load related resources', error)
+  }
+}
+
+const openExercise = (exercise) => {
+  if (!exercise?.id) return
+  if (['SINGLE_CHOICE', 'MULTIPLE_CHOICE'].includes(exercise.type)) {
+    router.push({ path: `/exercise/choice/${exercise.id}` })
+    return
+  }
+  if (exercise.type === 'FILL_BLANK') {
+    router.push({ path: `/exercise/fill/${exercise.id}` })
+    return
+  }
+  router.push({ path: `/exercise/${exercise.id}` })
+}
+
 const resetWatchState = () => {
   watchState.watchProgress = 0
   watchState.watchDuration = 0
@@ -361,6 +448,26 @@ const formatTime = (time) => {
   return new Date(time).toLocaleString()
 }
 
+const difficultyLabel = (difficulty) => {
+  const map = { EASY: '简单', MEDIUM: '中等', HARD: '困难' }
+  return map[difficulty] || difficulty || '未知'
+}
+
+const difficultyType = (difficulty) => {
+  const map = { EASY: 'success', MEDIUM: 'warning', HARD: 'danger' }
+  return map[difficulty] || 'info'
+}
+
+const exerciseTypeLabel = (type) => {
+  const map = {
+    SINGLE_CHOICE: '单选题',
+    MULTIPLE_CHOICE: '多选题',
+    FILL_BLANK: '填空题',
+    PROGRAMMING: '编程题',
+  }
+  return map[type] || type || '习题'
+}
+
 const isDirectVideoUrl = (url) => {
   if (!url) return false
   return /\.(mp4|webm|ogg)(\.download)?(\?.*)?$/i.test(url)
@@ -382,6 +489,17 @@ const buildEmbedUrl = (url) => {
 }
 
 onMounted(fetchVideoList)
+watch(
+  () => route.query.videoId,
+  async (videoId) => {
+    const targetId = Number(videoId)
+    if (!Number.isFinite(targetId) || videos.value.length === 0) return
+    const target = videos.value.find((item) => item.id === targetId)
+    if (target && selectedVideo.value?.id !== target.id) {
+      await selectVideo(target)
+    }
+  },
+)
 onBeforeUnmount(() => {
   flushProgress()
   if (!isNativeVideo.value && selectedVideo.value) {
@@ -487,10 +605,18 @@ onBeforeUnmount(() => {
 }
 
 .video-meta {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex-wrap: wrap;
   color: #667085;
   font-size: 13px;
 }
 
+.meta-tag {
+  height: 20px;
+}
+
 .player-panel {
   padding: 18px;
   display: flex;
@@ -568,6 +694,67 @@ onBeforeUnmount(() => {
   margin-top: 12px;
 }
 
+.resource-section {
+  margin-top: 18px;
+  padding-top: 16px;
+  border-top: 1px solid #edf0f5;
+}
+
+.resource-header {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 12px;
+  margin-bottom: 10px;
+}
+
+.resource-header h3 {
+  margin: 0;
+  color: #101828;
+  font-size: 16px;
+}
+
+.resource-header span {
+  color: #98a2b3;
+  font-size: 12px;
+}
+
+.resource-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 8px;
+}
+
+.resource-item {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  min-height: 66px;
+  padding: 10px 12px;
+  text-align: left;
+  background: #ffffff;
+  border: 1px solid #edf0f5;
+  border-radius: 8px;
+  cursor: pointer;
+}
+
+.resource-item:hover {
+  border-color: #409eff;
+  background: #f7fbff;
+}
+
+.resource-item span {
+  color: #101828;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 1.35;
+}
+
+.resource-item small {
+  color: #667085;
+  font-size: 12px;
+}
+
 @media (max-width: 900px) {
   .video-page {
     padding: 16px;
diff --git a/src/main/java/com/learningplatform/controller/VideoController.java b/src/main/java/com/learningplatform/controller/VideoController.java
index 9b8bc3e..c361a3d 100644
--- a/src/main/java/com/learningplatform/controller/VideoController.java
+++ b/src/main/java/com/learningplatform/controller/VideoController.java
@@ -32,6 +32,11 @@ public Result<VideoResponse> getVideoDetail(@PathVariable Long id) {
         return Result.success(videoService.getVideoDetail(id));
     }
 
+    @GetMapping("/{id}/recommendations")
+    public Result<List<VideoResponse>> getRecommendedVideos(@PathVariable Long id) {
+        return Result.success(videoService.getRecommendedVideos(id));
+    }
+
     @PostMapping("/watch-record")
     public Result<VideoWatchRecordResponse> saveWatchRecord(@Valid @RequestBody VideoWatchRecordRequest request,
                                                             @RequestHeader(value = "X-User-Id", required = false) Long userId) {
diff --git a/src/main/java/com/learningplatform/dto/VideoResponse.java b/src/main/java/com/learningplatform/dto/VideoResponse.java
index 035af23..1958780 100644
--- a/src/main/java/com/learningplatform/dto/VideoResponse.java
+++ b/src/main/java/com/learningplatform/dto/VideoResponse.java
@@ -10,6 +10,7 @@ public class VideoResponse {
     private Long knowledgePointId;
     private String knowledgePointName;
     private String knowledgePointCode;
+    private String knowledgePointDifficulty;
     private String neo4jId;
     private String title;
     private String description;
diff --git a/src/main/java/com/learningplatform/service/GraphService.java b/src/main/java/com/learningplatform/service/GraphService.java
index 66667a5..a9837cf 100644
--- a/src/main/java/com/learningplatform/service/GraphService.java
+++ b/src/main/java/com/learningplatform/service/GraphService.java
@@ -1,5 +1,12 @@
 package com.learningplatform.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.learningplatform.entity.Exercise;
+import com.learningplatform.entity.KnowledgePoint;
+import com.learningplatform.entity.Video;
+import com.learningplatform.repository.ExerciseRepository;
+import com.learningplatform.repository.KnowledgePointRepository;
+import com.learningplatform.repository.VideoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.neo4j.core.Neo4jClient;
 import org.springframework.stereotype.Service;
@@ -12,6 +19,15 @@ public class GraphService {
     @Autowired
     private Neo4jClient neo4jClient;
 
+    @Autowired
+    private KnowledgePointRepository knowledgePointRepository;
+
+    @Autowired
+    private VideoRepository videoRepository;
+
+    @Autowired
+    private ExerciseRepository exerciseRepository;
+
     /**
      * 获取完整图谱数据：所有节点和关系
      */
@@ -127,6 +143,14 @@ public Map<String, Object> getNodeDetail(String nodeId) {
                 .all());
 
         node.put("relatedNodes", related);
+        KnowledgePoint mysqlKnowledgePoint = findKnowledgePointByNeo4jId(nodeId);
+        if (mysqlKnowledgePoint != null) {
+            node.put("relatedVideos", getRelatedVideos(mysqlKnowledgePoint.getId()));
+            node.put("relatedExercises", getRelatedExercises(mysqlKnowledgePoint.getId()));
+        } else {
+            node.put("relatedVideos", List.of());
+            node.put("relatedExercises", List.of());
+        }
         return node;
     }
 
@@ -168,6 +192,78 @@ private static Integer getInt(org.neo4j.driver.Record record, String key) {
         return val == null || val.isNull() ? null : val.asInt();
     }
 
+    private KnowledgePoint findKnowledgePointByNeo4jId(String neo4jId) {
+        KnowledgePoint point = knowledgePointRepository.selectOne(new QueryWrapper<KnowledgePoint>()
+                .eq("neo4j_id", neo4jId)
+                .last("LIMIT 1"));
+        if (point != null) {
+            return point;
+        }
+
+        List<String> codes = getCodesByNeo4jId(neo4jId);
+        if (codes.isEmpty()) {
+            return null;
+        }
+        return knowledgePointRepository.selectOne(new QueryWrapper<KnowledgePoint>()
+                .in("code", codes)
+                .last("LIMIT 1"));
+    }
+
+    private List<Map<String, Object>> getRelatedVideos(Long knowledgePointId) {
+        return videoRepository.selectList(new QueryWrapper<Video>()
+                        .eq("knowledge_point_id", knowledgePointId)
+                        .orderByAsc("sort_order")
+                        .orderByAsc("id")
+                        .last("LIMIT 5"))
+                .stream()
+                .map(video -> {
+                    Map<String, Object> item = new HashMap<>();
+                    item.put("id", video.getId());
+                    item.put("title", video.getTitle());
+                    item.put("description", video.getDescription());
+                    return item;
+                })
+                .toList();
+    }
+
+    private List<Map<String, Object>> getRelatedExercises(Long knowledgePointId) {
+        return exerciseRepository.selectList(new QueryWrapper<Exercise>()
+                        .eq("knowledge_point_id", knowledgePointId)
+                        .orderByAsc("sort_order")
+                        .orderByAsc("id")
+                        .last("LIMIT 5"))
+                .stream()
+                .map(exercise -> {
+                    Map<String, Object> item = new HashMap<>();
+                    item.put("id", exercise.getId());
+                    item.put("title", exercise.getTitle());
+                    item.put("type", exercise.getType());
+                    item.put("difficulty", exercise.getDifficulty());
+                    return item;
+                })
+                .toList();
+    }
+
+    private List<String> getCodesByNeo4jId(String neo4jId) {
+        Map<String, List<String>> reverseMap = Map.ofEntries(
+                Map.entry("KP_LL_001", List.of("LINEAR_LIST", "LINKED_LIST")),
+                Map.entry("KP_LL_002", List.of("STACK")),
+                Map.entry("KP_LL_004", List.of("QUEUE")),
+                Map.entry("KP_TREE_001", List.of("TREE")),
+                Map.entry("KP_TREE_002", List.of("BINARY_TREE")),
+                Map.entry("KP_TREE_007", List.of("B_TREE")),
+                Map.entry("KP_GRAPH_001", List.of("GRAPH")),
+                Map.entry("KP_GRAPH_002", List.of("GRAPH_REPRESENTATION", "GRAPH_STORAGE")),
+                Map.entry("KP_SEARCH_001", List.of("SEARCH")),
+                Map.entry("KP_SEARCH_002", List.of("SEQUENTIAL_SEARCH")),
+                Map.entry("KP_SEARCH_003", List.of("BINARY_SEARCH")),
+                Map.entry("KP_SEARCH_004", List.of("HASH_TABLE")),
+                Map.entry("KP_SORT_001", List.of("SORT", "SORTING")),
+                Map.entry("KP_SORT_003", List.of("SELECTION_SORT"))
+        );
+        return reverseMap.getOrDefault(neo4jId, List.of());
+    }
+
     @SuppressWarnings("unchecked")
     private static List<Map<String, Object>> toTypedList(Collection collection) {
         return ((Collection<Map<String, Object>>) collection).stream().toList();
diff --git a/src/main/java/com/learningplatform/service/VideoService.java b/src/main/java/com/learningplatform/service/VideoService.java
index cc85e21..50e0b37 100644
--- a/src/main/java/com/learningplatform/service/VideoService.java
+++ b/src/main/java/com/learningplatform/service/VideoService.java
@@ -14,12 +14,16 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.neo4j.core.Neo4jClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -38,6 +42,9 @@ public class VideoService {
     @Autowired
     private VideoWatchRecordRepository videoWatchRecordRepository;
 
+    @Autowired
+    private Neo4jClient neo4jClient;
+
     public List<VideoResponse> getVideoList(Long knowledgeId) {
         QueryWrapper<Video> queryWrapper = new QueryWrapper<>();
         if (knowledgeId != null) {
@@ -58,6 +65,46 @@ public VideoResponse getVideoDetail(Long videoId) {
         return convertToVideoResponse(video);
     }
 
+    public List<VideoResponse> getRecommendedVideos(Long videoId) {
+        Video currentVideo = videoRepository.selectById(videoId);
+        if (currentVideo == null) {
+            throw new BusinessException(1701, "video does not exist");
+        }
+
+        KnowledgePoint currentPoint = knowledgePointRepository.selectById(currentVideo.getKnowledgePointId());
+        if (currentPoint == null) {
+            return List.of();
+        }
+
+        String currentNeo4jId = resolveNeo4jId(currentPoint);
+        Set<Long> knowledgeIds = new LinkedHashSet<>();
+        knowledgeIds.add(currentPoint.getId());
+
+        if (currentNeo4jId != null) {
+            List<String> relatedNeo4jIds = getRelatedNeo4jIds(currentNeo4jId);
+            for (String relatedNeo4jId : relatedNeo4jIds) {
+                KnowledgePoint relatedPoint = findKnowledgePointByNeo4jId(relatedNeo4jId);
+                if (relatedPoint != null) {
+                    knowledgeIds.add(relatedPoint.getId());
+                }
+            }
+        }
+
+        if (knowledgeIds.isEmpty()) {
+            return List.of();
+        }
+
+        return videoRepository.selectList(new QueryWrapper<Video>()
+                        .in("knowledge_point_id", knowledgeIds)
+                        .ne("id", videoId)
+                        .orderByAsc("sort_order")
+                        .orderByAsc("id")
+                        .last("LIMIT 6"))
+                .stream()
+                .map(this::convertToVideoResponse)
+                .collect(Collectors.toList());
+    }
+
     public VideoWatchRecordResponse getWatchRecord(Long userId, Long videoId) {
         ensureVideoExists(videoId);
 
@@ -127,11 +174,64 @@ private VideoResponse convertToVideoResponse(Video video) {
         if (knowledgePoint != null) {
             response.setKnowledgePointName(knowledgePoint.getName());
             response.setKnowledgePointCode(knowledgePoint.getCode());
+            response.setKnowledgePointDifficulty(knowledgePoint.getDifficulty());
             response.setNeo4jId(resolveNeo4jId(knowledgePoint));
         }
         return response;
     }
 
+    private List<String> getRelatedNeo4jIds(String neo4jId) {
+        return neo4jClient.query(
+                        "MATCH (n:KnowledgePoint {neo4j_id: $id})-[r]-(m:KnowledgePoint) " +
+                                "RETURN m.neo4j_id AS id, coalesce(r.order, 999) AS sortOrder " +
+                                "ORDER BY sortOrder, m.level")
+                .bind(neo4jId).to("id")
+                .fetchAs(String.class)
+                .mappedBy((typeSystem, record) -> record.get("id").isNull() ? null : record.get("id").asString())
+                .all()
+                .stream()
+                .filter(id -> id != null && !id.isBlank())
+                .collect(Collectors.toList());
+    }
+
+    private KnowledgePoint findKnowledgePointByNeo4jId(String neo4jId) {
+        QueryWrapper<KnowledgePoint> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("neo4j_id", neo4jId);
+        queryWrapper.last("LIMIT 1");
+        KnowledgePoint point = knowledgePointRepository.selectOne(queryWrapper);
+        if (point != null) {
+            return point;
+        }
+
+        List<String> codes = getCodesByNeo4jId(neo4jId);
+        if (codes.isEmpty()) {
+            return null;
+        }
+        return knowledgePointRepository.selectOne(new QueryWrapper<KnowledgePoint>()
+                .in("code", codes)
+                .last("LIMIT 1"));
+    }
+
+    private List<String> getCodesByNeo4jId(String neo4jId) {
+        Map<String, List<String>> reverseMap = Map.ofEntries(
+                Map.entry("KP_LL_001", List.of("LINEAR_LIST", "LINKED_LIST")),
+                Map.entry("KP_LL_002", List.of("STACK")),
+                Map.entry("KP_LL_004", List.of("QUEUE")),
+                Map.entry("KP_TREE_001", List.of("TREE")),
+                Map.entry("KP_TREE_002", List.of("BINARY_TREE")),
+                Map.entry("KP_TREE_007", List.of("B_TREE")),
+                Map.entry("KP_GRAPH_001", List.of("GRAPH")),
+                Map.entry("KP_GRAPH_002", List.of("GRAPH_REPRESENTATION", "GRAPH_STORAGE")),
+                Map.entry("KP_SEARCH_001", List.of("SEARCH")),
+                Map.entry("KP_SEARCH_002", List.of("SEQUENTIAL_SEARCH")),
+                Map.entry("KP_SEARCH_003", List.of("BINARY_SEARCH")),
+                Map.entry("KP_SEARCH_004", List.of("HASH_TABLE")),
+                Map.entry("KP_SORT_001", List.of("SORT", "SORTING")),
+                Map.entry("KP_SORT_003", List.of("SELECTION_SORT"))
+        );
+        return new ArrayList<>(reverseMap.getOrDefault(neo4jId, List.of()));
+    }
+
     private String resolveNeo4jId(KnowledgePoint knowledgePoint) {
         Map<String, String> fallbackMap = Map.ofEntries(
                 Map.entry("LINEAR_LIST", "KP_LL_001"),