Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc
This commit is contained in:
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service("sociologyCourseCatalogueChapterService")
|
@Service("sociologyCourseCatalogueChapterService")
|
||||||
@@ -71,7 +72,10 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl<CourseCatalog
|
|||||||
}
|
}
|
||||||
|
|
||||||
flag.put("videos",courseCatalogueChapterVideoEntities);
|
flag.put("videos",courseCatalogueChapterVideoEntities);
|
||||||
//
|
|
||||||
|
|
||||||
|
flag.put("current",getCurrentVideo(chapterId));
|
||||||
|
|
||||||
List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, byId.getCatalogueId()));
|
List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, byId.getCatalogueId()));
|
||||||
if (userCourseBuyEntities.size()==1){
|
if (userCourseBuyEntities.size()==1){
|
||||||
flag.put("buy",userCourseBuyEntities.get(0));
|
flag.put("buy",userCourseBuyEntities.get(0));
|
||||||
@@ -81,4 +85,22 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl<CourseCatalog
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private int getCurrentVideo(Integer chapterId){
|
||||||
|
MPJLambdaWrapper<CourseCatalogueChapterVideoEntity> wrapper = new MPJLambdaWrapper<>();
|
||||||
|
wrapper.leftJoin(UserCourseVideoPositionEntity.class,UserCourseVideoPositionEntity::getVideoId,CourseCatalogueChapterVideoEntity::getId);
|
||||||
|
wrapper.selectAll(CourseCatalogueChapterVideoEntity.class);
|
||||||
|
wrapper.eq(CourseCatalogueChapterVideoEntity::getChapterId,chapterId);
|
||||||
|
wrapper.orderByDesc(UserCourseVideoPositionEntity::getUpdateTime);
|
||||||
|
List<CourseCatalogueChapterVideoEntity> courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectJoinList(CourseCatalogueChapterVideoEntity.class, wrapper);
|
||||||
|
if(courseCatalogueChapterVideoEntities.size()>0){
|
||||||
|
return courseCatalogueChapterVideoEntities.get(0).getId();
|
||||||
|
}else {
|
||||||
|
List<CourseCatalogueChapterVideoEntity> courseCatalogueChapterVideoEntities1 = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterVideoEntity>()
|
||||||
|
.eq(CourseCatalogueChapterVideoEntity::getChapterId, chapterId).orderByAsc(CourseCatalogueChapterVideoEntity::getSort));
|
||||||
|
return courseCatalogueChapterVideoEntities1.size()>0?courseCatalogueChapterVideoEntities1.get(0).getId():0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user