From 87e5dd81f8abcf32e4cb5fb5178c318b21d64af3 Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Mon, 31 Mar 2025 11:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=BE=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=AD=A6=E4=B9=A0=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E8=BF=9B=E5=BA=A6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE=E8=BF=9B=E5=BA=A6=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/study/api/StudyCourseApi.java | 2 +- .../com/xboe/school/study/entity/StudyCourseItem.java | 6 ++++++ .../com/xboe/school/study/service/IStudyService.java | 5 +++-- .../xboe/school/study/service/impl/StudyServiceImpl.java | 9 ++++----- 4 files changed, 14 insertions(+), 8 deletions(-) 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 40b4c09b..72830e71 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 @@ -555,7 +555,7 @@ public class StudyCourseApi extends ApiBaseController{ } //检查是否已存在 try { - studyService.updateLastTime(itemId,videoTime, getCurrent().getAccountId()); + studyService.updateLastTime(itemId,videoTime, getCurrent().getAccountId(), progressVideo); if (contentId != null && courseId != null && progressVideo != null){ contentService.updateProcessVideo(contentId, courseId, progressVideo); } 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 09fad657..e6eb1c88 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 @@ -128,5 +128,11 @@ public class StudyCourseItem extends IdEntity { */ @Column(name = "status",length=1) private Integer status; + + /** + * 视频播放进度 + * */ + @Column(name = "progress_video") + private Float progressVideo; } 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 2d25fd37..7f2598d6 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 @@ -7,7 +7,6 @@ import com.xboe.common.PageList; import com.xboe.school.study.dto.StudyContentDto; import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudyTime; -import com.xboe.system.user.entity.User; /** * 学习情况处理,比较综合一个处理类 @@ -35,11 +34,13 @@ public interface IStudyService { /** * 更新最后的学习时间，及学习时间点 + * * @param studyContentId * @param lastStudyTime * @param aid + * @param progressVideo */ - void updateLastTime(String studyContentId,int lastStudyTime,String aid); + void updateLastTime(String studyContentId, int lastStudyTime, String aid, Float progressVideo); /** * 资源学习记录 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 9351fdd1..ce2e6085 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 @@ -9,10 +9,6 @@ import java.util.Map; import javax.transaction.Transactional; -import com.xboe.module.article.entity.Article; -import com.xboe.module.interaction.entity.Shares; -import com.xboe.school.study.entity.StudyCourse; -import com.xboe.system.user.entity.User; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -325,7 +321,7 @@ public class StudyServiceImpl implements IStudyService{ // 更新 前端传输已学习时长 @Override @Transactional - public void updateLastTime(String studyContentId, int lastStudyTime,String aid) { + public void updateLastTime(String studyContentId, int lastStudyTime, String aid, Float progressVideo) { // 更新最后的学习时间点 LocalDateTime now=LocalDateTime.now(); UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class); @@ -334,6 +330,9 @@ public class StudyServiceImpl implements IStudyService{ update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime)); update.addUpdateField("lastStudyTime", lastStudyTime); update.addUpdateField("lastTime", now); + if(progressVideo!=null) { + update.addUpdateField("progressVideo", progressVideo); + } scItemDao.update(update.builder()); //增加用户的学习时长,在api中调用 }