'合并'

src/main/java/com/futu/course/es/Service/impl/ESCourseService.java

@@ -6,6 +6,7 @@ import com.futu.course.course.service.impl.CourseServiceImpl;
 import com.futu.course.es.Service.ESService;
 import com.futu.course.es.domain.ESCourse;
 import com.futu.course.es.domain.MongoDBCourse;
+import com.futu.course.user.domain.User;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
@@ -33,9 +34,11 @@ import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
@@ -390,11 +393,15 @@ public class ESCourseService {
      * @author: 杨旭朋
      * @date: 2025/5/11 18:58
      */
+
+    @Resource
+    private RedisTemplate redisTemplate;
     public List<MongoDBCourse> searchLogs(){
+        User user = (User) redisTemplate.opsForValue().get("user");
         List<MongoDBCourse> all = esService.findAll();
         List<MongoDBCourse> mongoDBCourses = new ArrayList<>();
         for (MongoDBCourse mongoDBCourse : all) {
-            if (mongoDBCourse.getUid().equals(1L)){
+            if (mongoDBCourse.getUid().equals(user.getId())){
                 mongoDBCourses.add(mongoDBCourse);
             }
         }

src/main/java/com/futu/course/es/controller/ESCourseController.java

@@ -2,12 +2,16 @@ package com.futu.course.es.controller;
 
 import com.futu.course.es.Service.impl.ESCourseService;
 import com.futu.course.es.domain.ESCourse;
+import com.futu.course.es.domain.MongoDBCourse;
+import com.futu.course.es.dto.CourseDto;
+import com.futu.course.es.dto.SearchDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 
 /**
  * @author "杨旭朋"