1

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java

@@ -43,6 +43,13 @@ public interface TeacherOpenCourseMergeCourseInfoDao extends BaseMapper<TeacherO
         query.setCourseInfoStatus(1);
         return getValuesByQueryNotWithPermission(query);
     }
+    @Cacheable(value = "teacherOpenCourseMergeCourseInfoDao.getAllWithCacheWithTeacherOpenCourseId")
+    default List<TeacherOpenCourseMergeCourseInfo> getAllWithCacheWithTeacherOpenCourseId(@NotNull Long teacherOpenCourseId) {
+        TeacherOpenCourseMergeCourseInfoQuery query = new TeacherOpenCourseMergeCourseInfoQuery();
+        query.setCourseInfoStatus(1);
+        query.setTeacherOpenCourseId(teacherOpenCourseId);
+        return getValuesByQueryNotWithPermission(query);
+    }
     List<TeacherOpenCourseMergeCourseInfo> getValuesByQuery(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
     List<TeacherOpenCourseMergeCourseInfo> getValuesByQueryNotWithPermission(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);
     List<Map<String,Object>>getExcelValues(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery);

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -160,9 +160,10 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         try {
             for (String id : ids.split(",")) {
                 List<TeacherOpenCourseMergeCourseInfo> courseResources = getCourseResources(Long.valueOf(id));
-                List<TeacherOpenCourseMergeCourseInfo> courseResources2 = getCourseResourcesByList(Long.valueOf(id));
+                // TODO 这里要优化
+//                List<TeacherOpenCourseMergeCourseInfo> courseResources2 = getCourseResourcesByList(Long.valueOf(id));
 
-                int a = 1/0;
+//                int a = 1/0;
 
                 // 只匹配章节
                 Set<Long> idSet = courseResources.stream().filter(item -> Integer.valueOf(2).equals(item.getCourseInfoType()))
@@ -934,6 +935,20 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         return result;
     }
 
+    /**
+     * 根据课程（章节、小节）ID，获取该ID下的子集，返回一维集合
+     * 不包含他本身
+     * 从现有的集合数据中找关系。
+     *
+     * @param teacherOpenCourseMergeCourseInfoId      条件
+     * @return
+     */
+    public List<TeacherOpenCourseMergeCourseInfo> getCourseResourcesByList(@NotNull Long teacherOpenCourseMergeCourseInfoId, @NotNull Long teacherOpenCourseId){
+        ArrayList<TeacherOpenCourseMergeCourseInfo> result = new ArrayList<>();
+        getCourseResourcesByList(teacherOpenCourseMergeCourseInfoDao.getAllWithCacheWithTeacherOpenCourseId(teacherOpenCourseId), teacherOpenCourseMergeCourseInfoId, result);
+        return result;
+    }
+
 
     /**
      * 根据课程（章节、小节）ID，获取该ID下的子集，返回一维集合

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java

@@ -120,6 +120,17 @@ public class TeacherOpenCourseStudentSigninLogController{
         }
     }
 
+    /**
+     * 学生端-签到统一接口
+     * @param signinDTO     签到DTO
+     * @return
+     */
+    @PostMapping(API + "/signin.do")
+    public JsonResult signinDo(TeacherOpenCourseStudentSigninLogSigninDTO signinDTO) {
+        teacherOpenCourseStudentSigninLogService.signin(signinDTO);
+        return JsonResult.success();
+    }
+
     /**
      * 教师端-签到汇总
      * @param teacherOpenCourseId   开课ID