diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java index a93e159c..cd6ac57d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java @@ -83,8 +83,13 @@ public class CourseContent extends BaseEntity { * */ @Column(name = "duration") private Integer duration; - - + + /** + * 视频播放进度 + * */ + @Column(name = "progress_video") + private Float progressVideo; + /**用于学习时的状态显示,非存储字段*/ @Transient private Integer status; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java index 4e5e2f83..f1f7d543 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java @@ -82,4 +82,7 @@ public interface ICourseContentService{ * @return */ CourseAssess getAssess(String ccid); + + void updateProcessVideo(String contentId, String courseId, Float processVideo); + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java index c2cc351d..6137e027 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java @@ -141,6 +141,14 @@ public class CourseContentServiceImpl implements ICourseContentService { return assess; } + @Override + public void updateProcessVideo(String id, String courseId, Float processVideo) { + CourseContent cc= new CourseContent(); + cc.setProgressVideo(processVideo); + String sql = "update boe_course_content set progress_video="+ processVideo+" where id="+id+" and course_id="+courseId+" "; + ccDao.sqlUpdate(sql); + } + @Override @Transactional public void updateName(String id, String name) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index e5688d40..046434e1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -529,7 +529,7 @@ public class StudyCourseApi extends ApiBaseController{ * @return */ @PostMapping("/study-video-time") - public JsonResponse study(String studyId,String itemId,Integer videoTime,Float processVideo){ + public JsonResponse study(String itemId,Integer videoTime,String contentId , String courseId,Float processVideo){ if(StringUtils.isBlank(itemId)){ return error("参数错误"); @@ -539,7 +539,8 @@ public class StudyCourseApi extends ApiBaseController{ } //检查是否已存在 try { - studyService.updateLastTime(itemId,videoTime,getCurrent().getAccountId(),processVideo); + studyService.updateLastTime(itemId,videoTime,getCurrent().getAccountId()); + contentService.updateProcessVideo(contentId,courseId,processVideo); return success(true); }catch(Exception e) { log.error("记录最后学习时间错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java index da5b3f8b..09fad657 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java @@ -121,12 +121,6 @@ public class StudyCourseItem extends IdEntity { * */ @Column(name = "progress") private Integer progress; - - /* - * 视频播放进度 - * */ - @Column(name = "progress_video") - private Integer progressVideo; /** * 学习状态,当前未使用 ,以学习进度100来定义是否已学完 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java index e77a9a84..9b25520f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java @@ -38,7 +38,7 @@ public interface IStudyService { * @param lastStudyTime * @param aid */ - void updateLastTime(String studyContentId,int lastStudyTime,String aid,Float processVideo); + void updateLastTime(String studyContentId,int lastStudyTime,String aid); /** * 资源学习记录 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index c640f8ce..d6cc2110 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -219,7 +219,7 @@ public class StudyServiceImpl implements IStudyService{ // 更新 前端传输已学习时长 @Override @Transactional - public void updateLastTime(String studyContentId, int lastStudyTime,String aid,Float processVideo) { + public void updateLastTime(String studyContentId, int lastStudyTime,String aid) { // 更新最后的学习时间点 LocalDateTime now=LocalDateTime.now(); UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class); @@ -228,7 +228,6 @@ public class StudyServiceImpl implements IStudyService{ update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime)); update.addUpdateField("lastStudyTime", lastStudyTime); update.addUpdateField("lastTime", now); - update.addUpdateField("processVideo", processVideo); scItemDao.update(update.builder()); //增加用户的学习时长,在api中调用 }