提交 aaf3c018 authored 作者: zhouzhigang's avatar zhouzhigang

--no commit message

上级 02c8aa84
...@@ -21,6 +21,7 @@ import com.zrqx.core.service.BaseServiceImpl; ...@@ -21,6 +21,7 @@ import com.zrqx.core.service.BaseServiceImpl;
import com.zrqx.core.util.datatype.ArrayUtils; import com.zrqx.core.util.datatype.ArrayUtils;
import com.zrqx.core.util.page.PageInfo; import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam; import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.resource.commons.form.fg.courseLibrary.FgQueryCourseInfoForm; import com.zrqx.resource.commons.form.fg.courseLibrary.FgQueryCourseInfoForm;
import com.zrqx.resource.commons.form.fg.videolibrary.FgVideoLookForm; import com.zrqx.resource.commons.form.fg.videolibrary.FgVideoLookForm;
import com.zrqx.resource.commons.model.audiolibrary.AudioLibrary; import com.zrqx.resource.commons.model.audiolibrary.AudioLibrary;
...@@ -173,95 +174,73 @@ public class FgVideoLookLibrarySerivceImpl extends BaseServiceImpl<VideoLookLibr ...@@ -173,95 +174,73 @@ public class FgVideoLookLibrarySerivceImpl extends BaseServiceImpl<VideoLookLibr
FgQueryCourseInfoForm vo = null; FgQueryCourseInfoForm vo = null;
//查询学习记录列表 //查询学习记录列表
//CallBack<PageInfo<GoodsForm>> goodsClient = orderclient.listBuy2(pageParam); CallBack<PageInfo<GoodsForm>> goodsClient = orderclient.listBuy2(pageParam);
//查询学习记录列表 //查询学习记录列表
List<FgQueryCourseInfoForm> list = mapper.page(redis.getMember().getId()); //List<FgQueryCourseInfoForm> list = mapper.page(redis.getMember().getId());
startPage(pageParam); startPage(pageParam);
PageInfo<GoodsForm> page = null;
if (goodsClient.isStatus()) {
if (ArrayUtils.isNotEmpty(list)) {
//对视频音频加工
for (int i = list.size() - 1; i >= 0; i--) { page = goodsClient.getData();
FgQueryCourseInfoForm goodsForm = list.get(i);
BigDecimal shi = new BigDecimal(0);//小时 List<GoodsForm> list = page.getList();
BigDecimal fen = new BigDecimal(0);//分钟 System.out.println(list);
BigDecimal miao = new BigDecimal(0);//秒
BigDecimal sum = new BigDecimal(0);//总时间
BigDecimal timeSpeed1 = new BigDecimal(0);//获取观看进度时间 if (ArrayUtils.isNotEmpty(list)) {
// 进行对数据查询:5:视频 6:音频 9:课程
vo = new FgQueryCourseInfoForm(); //对视频音频加工
if (goodsForm.getResourceType().intValue() == 5) { for (int i = list.size() - 1; i >= 0; i--) {
GoodsForm goodsForm = list.get(i);
// 查询视频数据 BigDecimal shi = new BigDecimal(0);//小时
VideoLibrary video = fgVideoLibraryService.selectByPrimaryKey(goodsForm.getId()); BigDecimal fen = new BigDecimal(0);//分钟
if(video != null) { BigDecimal miao = new BigDecimal(0);//秒
if("2".equals(video.getStatus().toString())) { BigDecimal sum = new BigDecimal(0);//总时间
list.remove(i); BigDecimal timeSpeed1 = new BigDecimal(0);//获取观看进度时间
continue; // 进行对数据查询:5:视频 6:音频 9:课程
} vo = new FgQueryCourseInfoForm();
vo.setId(video.getId()); if (goodsForm.getType().equals("5")) {
vo.setCover(video.getCover());
vo.setName(video.getName()); // 查询视频数据
vo.setResourceType(video.getResourceType()); VideoLibrary video = fgVideoLibraryService.selectByPrimaryKey(goodsForm.getId());
// 时间转换 if(video != null) {
String time = video.getTimeLength(); if("2".equals(video.getStatus().toString())) {
if (time.indexOf("时") != -1) { list.remove(i);
shi = shi.add(new BigDecimal(time.split("时")[0])); continue;
} }
if (time.indexOf("分") != -1) { vo.setId(video.getId());
fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分")))); vo.setCover(video.getCover());
} vo.setName(video.getName());
miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒")))); vo.setResourceType(video.getResourceType());
}else { // 时间转换
continue; String time = video.getTimeLength();
} if (time.indexOf("时") != -1) {
} shi = shi.add(new BigDecimal(time.split("时")[0]));
if (goodsForm.getResourceType().intValue() == 6) { }
// 查询音频数据 if (time.indexOf("分") != -1) {
AudioLibrary audio = fgAudioLibraryService.selectByPrimaryKey(goodsForm.getId()); fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分"))));
if(audio != null) { }
if("2".equals(audio.getStatus().toString())) { miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒"))));
list.remove(i); }else {
continue; continue;
} }
vo.setId(audio.getId());
vo.setCover(audio.getCover());
vo.setName(audio.getName());
vo.setResourceType(audio.getResourceType());
// 时间转换
String time = audio.getTimeLength();
if (time.indexOf("时") != -1) {
shi = shi.add(new BigDecimal(time.split("时")[0]));
}
if (time.indexOf("分") != -1) {
fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分"))));
}
miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒"))));
}else {
continue;
} }
} if (goodsForm.getType().equals("6")) {
if (goodsForm.getResourceType().intValue() == 9) { // 查询音频数据
// 查询课程 AudioLibrary audio = fgAudioLibraryService.selectByPrimaryKey(goodsForm.getId());
CourseLibrary course = fgCourseLibraryService.selectByPrimaryKey(goodsForm.getId()); if(audio != null) {
if(course != null) { if("2".equals(audio.getStatus().toString())) {
if("2".equals(course.getStatus().toString())) { list.remove(i);
list.remove(i); continue;
continue; }
} vo.setId(audio.getId());
vo.setId(course.getId()); vo.setCover(audio.getCover());
vo.setCover(course.getCover()); vo.setName(audio.getName());
vo.setName(course.getName()); vo.setResourceType(audio.getResourceType());
vo.setResourceType(course.getResourceType());
// 查询当前课程那些视频
List<FgRelationResourceListVo> relationList = resourceRelationService
.queryByRrelationResource(course.getId());
for (FgRelationResourceListVo relation : relationList) {
// 时间转换 // 时间转换
String time = relation.getTimeLength(); String time = audio.getTimeLength();
if (time.indexOf("时") != -1) { if (time.indexOf("时") != -1) {
shi = shi.add(new BigDecimal(time.split("时")[0])); shi = shi.add(new BigDecimal(time.split("时")[0]));
} }
...@@ -269,26 +248,61 @@ public class FgVideoLookLibrarySerivceImpl extends BaseServiceImpl<VideoLookLibr ...@@ -269,26 +248,61 @@ public class FgVideoLookLibrarySerivceImpl extends BaseServiceImpl<VideoLookLibr
fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分")))); fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分"))));
} }
miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒")))); miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒"))));
}else {
continue;
} }
}else {
continue;
} }
} if (goodsForm.getType().equals("9")) {
//获取观看进度时间 // 查询课程
timeSpeed1 = mapper.queryTime(goodsForm.getId()); CourseLibrary course = fgCourseLibraryService.selectByPrimaryKey(goodsForm.getId());
BigDecimal timeSpeed = timeSpeed1 == null ? new BigDecimal(0) : timeSpeed1; if(course != null) {
System.out.println(timeSpeed); if("2".equals(course.getStatus().toString())) {
//得到总时间 list.remove(i);
sum = miao.add(shi.multiply(new BigDecimal(3600)).add(fen.multiply(new BigDecimal(60)))); continue;
if(sum.intValue() > 0) { }
Integer percentage = Integer.parseInt(timeSpeed.multiply(new BigDecimal(100)).divide(sum, 0,BigDecimal.ROUND_HALF_UP).toString()); vo.setId(course.getId());
System.out.println(percentage); vo.setCover(course.getCover());
vo.setPercentage(Integer.parseInt(timeSpeed.multiply(new BigDecimal(100)).divide(sum, 0,BigDecimal.ROUND_HALF_UP).toString())); vo.setName(course.getName());
listvo.add(vo); vo.setResourceType(course.getResourceType());
System.out.println(listvo); // 查询当前课程那些视频
List<FgRelationResourceListVo> relationList = resourceRelationService
.queryByRrelationResource(course.getId());
for (FgRelationResourceListVo relation : relationList) {
// 时间转换
String time = relation.getTimeLength();
if (time.indexOf("时") != -1) {
shi = shi.add(new BigDecimal(time.split("时")[0]));
}
if (time.indexOf("分") != -1) {
fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分"))));
}
miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒"))));
}
}else {
continue;
}
}
//获取观看进度时间
timeSpeed1 = mapper.queryTime(goodsForm.getId());
BigDecimal timeSpeed = timeSpeed1 == null ? new BigDecimal(0) : timeSpeed1;
System.out.println(timeSpeed);
//得到总时间
sum = miao.add(shi.multiply(new BigDecimal(3600)).add(fen.multiply(new BigDecimal(60))));
if(sum.intValue() > 0) {
Integer percentage = Integer.parseInt(timeSpeed.multiply(new BigDecimal(100)).divide(sum, 0,BigDecimal.ROUND_HALF_UP).toString());
System.out.println(percentage);
vo.setPercentage(Integer.parseInt(timeSpeed.multiply(new BigDecimal(100)).divide(sum, 0,BigDecimal.ROUND_HALF_UP).toString()));
listvo.add(vo);
System.out.println(listvo);
}
} }
} }
}
}
PageInfo<FgQueryCourseInfoForm> page1 = new PageInfo<>(listvo); PageInfo<FgQueryCourseInfoForm> page1 = new PageInfo<>(listvo);
return page1; return page1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论