BaiQi 1 vuosi sitten
vanhempi
commit
5c7e15470a

+ 1 - 0
src/main/java/com/njuzr/eaibackend/controller/CourseController.java

@@ -66,6 +66,7 @@ public class CourseController {
             @RequestParam(value = "size", defaultValue = "10") int pageSize,
             @RequestBody CourseQueryDTO courseQueryDTO
             ) {
+        log.info("查询课程控制器:{}, {}", currentPage, pageSize);
         Page<Course> page = new Page<>(currentPage, pageSize);
         IPage<CourseVO> courses =  courseService.findCoursesPage(page, courseQueryDTO);
 

+ 2 - 0
src/main/java/com/njuzr/eaibackend/dto/AssignmentQueryDTO.java

@@ -15,6 +15,8 @@ public class AssignmentQueryDTO {
 
     private Long teacherId;
 
+    private Long teacherPid;
+
     private Long courseId;
 
     private String assignmentName;

+ 1 - 1
src/main/java/com/njuzr/eaibackend/service/impl/AssignmentServiceImpl.java

@@ -118,7 +118,7 @@ public class AssignmentServiceImpl implements AssignmentService {
 
     @Override
     public IPage<AssignmentVO> findAssignmentPage(Page<Assignment> page, AssignmentQueryDTO assignmentQueryDTO) {
-
+        log.info("作业查询服务:{}", assignmentQueryDTO);
         QueryWrapper<Assignment> wrapper = new QueryWrapper<>();
 
         if (assignmentQueryDTO.getAssignmentId() != null) { // assignmentId直接判断是否相等

+ 8 - 5
src/main/java/com/njuzr/eaibackend/service/impl/CourseServiceImpl.java

@@ -82,10 +82,9 @@ public class CourseServiceImpl implements CourseService {
 
 
     @Override
-    @Cacheable(value = "coursePages", key = "#page.getPages() + '_' + #page.getSize() + '_' + #courseQueryDTO.isEmpty()", unless = "#page.getSize() <= 1 || !#courseQueryDTO.isEmpty()")
+    @Cacheable(value = "coursePages", key = "#page.getCurrent() + '_' + #page.getSize() + '_' + #courseQueryDTO.isEmpty()", unless = "#page.getSize() <= 1 || !#courseQueryDTO.isEmpty()")
     public IPage<CourseVO> findCoursesPage(Page<Course> page, CourseQueryDTO courseQueryDTO) {
         log.info("课程信息从数据库查询: {}", courseQueryDTO.toString());
-        log.info(String.valueOf(page.getSize() <= 1 || !courseQueryDTO.isEmpty()));
         QueryWrapper<Course> wrapper = getCourseQueryWrapper(courseQueryDTO);
 
         IPage<Course> courses = courseMapper.selectPage(page, wrapper);
@@ -103,12 +102,16 @@ public class CourseServiceImpl implements CourseService {
         if (courseQueryDTO.getCourseId() != null) { // courseId直接判断是否相等
             wrapper.eq("course_id", courseQueryDTO.getCourseId());
         }
+
         if (courseQueryDTO.getTeacherPid() != null) { // courseId直接判断是否相等
             wrapper.eq("teacher_portal_id", courseQueryDTO.getTeacherPid());
-        } else if (courseQueryDTO.getTeacherId() != null) { // 模糊匹配teacherIds中是否包含这个字段
-            wrapper.apply("FIND_IN_SET({0}, teacher_ids) > 0", courseQueryDTO.getTeacherId());
-            // wrapper.like("teacher_ids", "%" + courseQueryDTO.getTeacherId() + "%"); // 模糊匹配
         }
+
+//        if (courseQueryDTO.getTeacherId() != null) { // 模糊匹配teacherIds中是否包含这个字段
+//            wrapper.apply("FIND_IN_SET({0}, teacher_ids) > 0", courseQueryDTO.getTeacherId());
+//            // wrapper.like("teacher_ids", "%" + courseQueryDTO.getTeacherId() + "%"); // 模糊匹配
+//        }
+
         if (courseQueryDTO.getCourseName() != null) { // 模糊匹配课程名字
             wrapper.like("course_name", courseQueryDTO.getCourseName());
         }