zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时长信息转到video主体 增加多线程获取时间方法

Browse Source
This commit is contained in:
wangjinlei
2024-04-26 10:44:48 +08:00
parent 6b2e37b29b
commit 5c7d424f5e
11 changed files with 154 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/entity/CourseCatalogueChapterVideoEntity.java
View File

@@ -23,6 +23,8 @@ public class CourseCatalogueChapterVideoEntity {
private Integer sort;
private Integer duration;
private Date createTime;
@TableLogic

5
src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
View File

@@ -43,4 +43,9 @@ public class CourseCatalogueEntity{
*/
@TableField(exist = false)
private Integer isBuy;
/**
* 完成度百分比
*/
@TableField(exist = false)
private int completion;
}

2
src/main/java/com/peanut/modules/common/entity/UserCourseVideoPositionEntity.java
View File

@@ -20,8 +20,6 @@ public class UserCourseVideoPositionEntity {
private Integer position;
private Integer duration;
private Date createTime;
@TableLogic

65
src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
View File

@@ -4,6 +4,7 @@ import com.aliyun.vod20170321.models.GetVideoPlayAuthResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.peanut.common.service.AsyncService;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.common.utils.SpdbUtil;
import com.peanut.modules.common.dao.*;
@@ -30,11 +31,13 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
private UserToCourseDao userToCourseDao;
@Autowired
private UserCourseVideoPositionDao userCourseVideoPositionDao;
@Autowired
private AsyncService asyncService;
@Override
public Page getCourseCatalogueChapterVideoList(ParamTo param) {
LambdaQueryWrapper<CourseCatalogueChapterVideoEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CourseCatalogueChapterVideoEntity::getChapterId,param.getId());
wrapper.eq(CourseCatalogueChapterVideoEntity::getChapterId, param.getId());
wrapper.orderByAsc(CourseCatalogueChapterVideoEntity::getSort);
Page<CourseCatalogueChapterVideoEntity> page = this.page(new Page<>(param.getPage(), param.getLimit()), wrapper);
return page;
@@ -42,17 +45,21 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
@Override
public CourseCatalogueChapterVideoEntity checkVideo(CourseCatalogueChapterVideoEntity video) throws Exception {
public CourseCatalogueChapterVideoEntity checkVideo(CourseCatalogueChapterVideoEntity videoEntity) throws Exception {
CourseCatalogueChapterVideoEntity video = this.getById(videoEntity.getId());
if (video.getDuration() == 0) {
asyncService.pushDurationToVideo(video.getId());
}
CourseCatalogueChapterEntity courseCatalogueChapterEntity = courseCatalogueChapterDao.selectById(video.getChapterId());
CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectById(courseCatalogueChapterEntity.getCatalogueId());
Integer uId = ShiroUtils.getUId();
List<UserToCourseEntity> userToCourseEntities = userToCourseDao.selectList(new LambdaQueryWrapper<UserToCourseEntity>().eq(UserToCourseEntity::getUserId, uId).eq(UserToCourseEntity::getCourseId, courseCatalogueEntity.getCourseId()));
//用户课程足迹
if(userToCourseEntities.size()!=0){
if (userToCourseEntities.size() != 0) {
UserToCourseEntity userToCourseEntity = userToCourseEntities.get(0);
userToCourseEntity.setUpdateTime(new Date());
userToCourseDao.updateById(userToCourseEntity);
}else{
} else {
UserToCourseEntity userToCourseEntity = new UserToCourseEntity();
userToCourseEntity.setUserId(uId);
userToCourseEntity.setCourseId(courseCatalogueEntity.getCourseId());
@@ -61,61 +68,45 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
userToCourseDao.insert(userToCourseEntity);
}
//加密视频组装playauth
if(video.getType()==1){
if (video.getType() == 1) {
GetVideoPlayAuthResponse p = SpdbUtil.getPlayAuth(video.getVideo());
String playAuth = p.getBody().getPlayAuth();
video.setPlayAuth(playAuth);
//获取播放记录
UserCourseVideoPositionEntity videoPosition = getVideoPosition(video, uId, p.getBody().getVideoMeta().getDuration().intValue());
video.setUserCourseVideoPositionEntity(videoPosition);
}else{
UserCourseVideoPositionEntity videoPosition = getVideoPosition(video, uId, 0);
video.setUserCourseVideoPositionEntity(videoPosition);
}
UserCourseVideoPositionEntity videoPosition = getVideoPosition(video, uId);
video.setUserCourseVideoPositionEntity(videoPosition);
return video;
}
@Override
public void saveCoursePosition(int uId, int videoId, int position) {
LambdaQueryWrapper<UserCourseVideoPositionEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(UserCourseVideoPositionEntity::getUserId,uId);
wrapper.eq(UserCourseVideoPositionEntity::getVideoId,videoId);
wrapper.eq(UserCourseVideoPositionEntity::getUserId, uId);
wrapper.eq(UserCourseVideoPositionEntity::getVideoId, videoId);
List<UserCourseVideoPositionEntity> userCourseVideoPositionEntities = userCourseVideoPositionDao.selectList(wrapper);
if(userCourseVideoPositionEntities.size()==0){
if (userCourseVideoPositionEntities.size() == 0) {
UserCourseVideoPositionEntity userCourseVideoPositionEntity = new UserCourseVideoPositionEntity();
userCourseVideoPositionEntity.setUserId(uId);
userCourseVideoPositionEntity.setVideoId(videoId);
userCourseVideoPositionDao.insert(userCourseVideoPositionEntity);
}else {
} else {
UserCourseVideoPositionEntity userCourseVideoPositionEntity = userCourseVideoPositionEntities.get(0);
userCourseVideoPositionEntity.setPosition(position);
userCourseVideoPositionDao.updateById(userCourseVideoPositionEntity);
}
}
private UserCourseVideoPositionEntity getVideoPosition(CourseCatalogueChapterVideoEntity video, int userId, int duration){
private UserCourseVideoPositionEntity getVideoPosition(CourseCatalogueChapterVideoEntity video, int userId) {
List<UserCourseVideoPositionEntity> userCourseVideoPositionEntities = userCourseVideoPositionDao.selectList(new LambdaQueryWrapper<UserCourseVideoPositionEntity>().eq(UserCourseVideoPositionEntity::getUserId, userId).eq(UserCourseVideoPositionEntity::getVideoId, video.getId()));
if(video.getType()==0){
if(userCourseVideoPositionEntities.size()>0){
return userCourseVideoPositionEntities.get(0);
}else{
UserCourseVideoPositionEntity userCourseVideoPositionEntity = new UserCourseVideoPositionEntity();
userCourseVideoPositionEntity.setUserId(userId);
userCourseVideoPositionEntity.setVideoId(video.getId());
userCourseVideoPositionDao.insert(userCourseVideoPositionEntity);
return userCourseVideoPositionEntity;
}
}else{//加密视频
if(userCourseVideoPositionEntities.size()>0){
return userCourseVideoPositionEntities.get(0);
}else{
UserCourseVideoPositionEntity userCourseVideoPositionEntity = new UserCourseVideoPositionEntity();
userCourseVideoPositionEntity.setUserId(userId);
userCourseVideoPositionEntity.setVideoId(video.getId());
userCourseVideoPositionEntity.setDuration(duration);
userCourseVideoPositionDao.insert(userCourseVideoPositionEntity);
return userCourseVideoPositionEntity;
}
if (userCourseVideoPositionEntities.size() > 0) {
return userCourseVideoPositionEntities.get(0);
} else {
UserCourseVideoPositionEntity userCourseVideoPositionEntity = new UserCourseVideoPositionEntity();
userCourseVideoPositionEntity.setUserId(userId);
userCourseVideoPositionEntity.setVideoId(video.getId());
userCourseVideoPositionEntity.setPosition(0);
userCourseVideoPositionDao.insert(userCourseVideoPositionEntity);
return userCourseVideoPositionEntity;
}
}
}

5
src/main/java/com/peanut/modules/sociology/controller/CourseController.java
View File

@@ -17,6 +17,8 @@ import com.peanut.modules.master.service.CourseCatalogueChapterVideoService;
import com.peanut.modules.sociology.service.CourseCatalogueChapterService;
import com.peanut.modules.sociology.service.CourseService;
import lombok.extern.slf4j.Slf4j;
import org.bytedeco.javacv.FFmpegFrameGrabber;
import org.bytedeco.javacv.FrameGrabber;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -112,12 +114,13 @@ public class CourseController {
return R.ok().put("playAuth",playAuth);
}
@RequestMapping("/saveCoursePosition")
public R saveCoursePosition(@RequestBody Map<String,Integer> map){
Integer uId = ShiroUtils.getUId();
Integer videoId = map.get("videoId");
Integer position = map.get("position");
courseCatalogueChapterVideoService.saveCoursePosition(uId,videoId,position);
return null;
return R.ok();
}
/**
* 验证video权限，并解决足迹，加密视频签名问题

2
src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java
View File

@@ -38,4 +38,6 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl<CourseCatalog
flag.put("videos",courseCatalogueChapterVideoEntities);
return flag;
}
}

29
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -17,6 +17,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@Service("sociologyCourseService")
@@ -30,6 +31,12 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
private CourseCatalogueDao courseCatalogueDao;
@Autowired
private UserCourseBuyDao userCourseBuyDao;
@Autowired
private CourseCatalogueChapterDao courseCatalogueChapterDao;
@Autowired
private CourseCatalogueChapterVideoDao courseCatalogueChapterVideoDao;
@Autowired
private UserCourseVideoPositionDao userCourseVideoPositionDao;
//根据标签获取课程列表
@@ -77,15 +84,37 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Override
public Map<String, Object> getCourseDetail(Integer id) {
Map<String, Object> flag = new HashMap<>();
//基础信息
CourseEntity course = this.getById(id);
flag.put("course",course);
//目录信息
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id));
Integer uId = ShiroUtils.getUId();
for (CourseCatalogueEntity c :courseCatalogueEntities){
Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId()));
c.setIsBuy(integer>0?1:0);
c.setCompletion(catalogueCompletion(c));
}
flag.put("catalogues",courseCatalogueEntities);
return flag;
}
private Integer catalogueCompletion(CourseCatalogueEntity c){
List<CourseCatalogueChapterEntity> courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterEntity>().eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()));
Integer act = 0;
for (CourseCatalogueChapterEntity cc : courseCatalogueChapterEntities){
List<CourseCatalogueChapterVideoEntity> courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterVideoEntity>().eq(CourseCatalogueChapterVideoEntity::getChapterId, cc.getId()));
List<Integer> collect = courseCatalogueChapterVideoEntities.stream().map(CourseCatalogueChapterVideoEntity::getId).collect(Collectors.toList());
if(collect.size()==0){
continue;
}
Integer integer = userCourseVideoPositionDao.selectCount(new LambdaQueryWrapper<UserCourseVideoPositionEntity>().eq(UserCourseVideoPositionEntity::getUserId, ShiroUtils.getUId()).in(UserCourseVideoPositionEntity::getVideoId, collect));
if (integer>0){
act++;
}
}
return courseCatalogueChapterEntities.size()==0?0:act * 100 / courseCatalogueChapterEntities.size();
}
}