--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/videolibrary/FgVideoLookLibraryController.java

@@ -57,6 +57,5 @@ public class FgVideoLookLibraryController {
 	@GetMapping("/myCourse")
 	public CallBack<PageInfo<FgQueryCourseInfoForm>> myCourse(PageParam pageParam) {
 		return CallBack.success(fgVideoLookLibraryService.querybyLook(pageParam));
-		
 	}
 }

app/resource/src/main/java/com/zrqx/resource/fg/mapper/videolibrary/FgVideoLookLibraryMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.resource.commons.form.fg.courseLibrary.FgQueryCourseInfoForm;
 import com.zrqx.resource.commons.model.videolibrary.VideoLookLibrary;
 import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLookLibraryVO;
 /**
@@ -57,7 +58,16 @@ public interface FgVideoLookLibraryMapper extends BaseMapper<VideoLookLibrary> {
 				+ "  GROUP BY videoid) tt" 
 				+ "</script>")
 		BigDecimal queryTime(@Param("courseid")String courseid);
-
+		
+		
+		@Select("<script>"
+				+ " SELECT v.courseId as id,v.resourceType from res_video_look_library v "
+				+ " where 1=1 "
+				+ " eq(v.memberId,memberId)"
+				+ " GROUP BY v.courseId,v.resourceType "
+				+ " order by uploadTime desc "
+				+ "</script>")
+		List<FgQueryCourseInfoForm> page(@Param("memberId")Integer memberId);
 	
 	
 }

app/resource/src/main/java/com/zrqx/resource/fg/service/videolibrary/FgVideoLookLibrarySerivceImpl.java

 package com.zrqx.resource.fg.service.videolibrary;
 
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Scanner;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.mysql.fabric.xmlrpc.base.Array;
 import com.zrqx.core.client.form.order.GoodsForm;
 import com.zrqx.core.client.order.fg.FgOrderClient;
-import com.zrqx.core.client.vo.order.FgBuyOrderInfoPageVo;
 import com.zrqx.core.commons.model.member.Member;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
-import com.zrqx.core.util.JsonUtil.JsonUtil;
+import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.util.response.CallBack;
-import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.commons.form.fg.courseLibrary.FgQueryCourseInfoForm;
 import com.zrqx.resource.commons.form.fg.videolibrary.FgVideoLookForm;
 import com.zrqx.resource.commons.model.audiolibrary.AudioLibrary;
@@ -128,77 +117,55 @@ public class FgVideoLookLibrarySerivceImpl extends BaseServiceImpl<VideoLookLibr
 		List<FgQueryCourseInfoForm> listvo = new ArrayList<FgQueryCourseInfoForm>();
 		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());
 	
 		BigDecimal shi = new BigDecimal(0);//小时
 		BigDecimal fen = new BigDecimal(0);//分钟
 		BigDecimal miao = new BigDecimal(0);//秒
 		BigDecimal sum = new BigDecimal(0);//总时间
 		BigDecimal timeSpeed= new BigDecimal(0);//获取观看进度时间
-		PageInfo<GoodsForm> page = null;
-		if (goodsClient.isStatus()) {
-			
-			
-			page = goodsClient.getData();
-			
-			List<GoodsForm> list = page.getList();
-			System.out.println(list);
-			
+		if (ArrayUtils.isNotEmpty(list)) {
 			
 			//对视频音频加工
-			for (GoodsForm goodsForm : list) {
+			for (FgQueryCourseInfoForm goodsForm : list) {
 				// 进行对数据查询：5：视频 6：音频 9：课程
 				vo = new FgQueryCourseInfoForm();
-				if (goodsForm.getType().equals("5")) {
+				if (goodsForm.getResourceType().intValue() == 5) {
 					
 					// 查询视频数据
 					VideoLibrary video = fgVideoLibraryService.selectByPrimaryKey(goodsForm.getId());
-					vo.setId(video.getId());
-					vo.setCover(video.getCover());
-					vo.setName(video.getName());
-					vo.setResourceType(video.getResourceType());
-					// 时间转换
-					String time = video.getTimeLength();
-					if (time.indexOf("时") != -1) {
-						shi = shi.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("时") + 1)));
-					}
-					if (time.indexOf("分") != -1) {
-						fen = fen.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("分"))));
+					if(video != null) {
+						vo.setId(video.getId());
+						vo.setCover(video.getCover());
+						vo.setName(video.getName());
+						vo.setResourceType(video.getResourceType());
+						// 时间转换
+						String time = video.getTimeLength();
+						if (time.indexOf("时") != -1) {
+							shi = shi.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("时") + 1)));
+						}
+						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;
 					}
-					miao = miao.add(new BigDecimal(time.substring(time.indexOf("分") + 1, time.indexOf("秒"))));
 				}
-				if (goodsForm.getType().equals("6")) {
+				if (goodsForm.getResourceType().intValue() == 6) {
 					// 查询音频数据
 					AudioLibrary audio = fgAudioLibraryService.selectByPrimaryKey(goodsForm.getId());
-					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.substring(time.indexOf("时") + 1, time.indexOf("时") + 1)));
-					}
-					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("秒"))));
-				}
-				if (goodsForm.getType().equals("9")) {
-					// 查询课程
-					CourseLibrary course = fgCourseLibraryService.selectByPrimaryKey(goodsForm.getId());
-					vo.setId(course.getId());
-					vo.setCover(course.getCover());
-					vo.setName(course.getName());
-					vo.setResourceType(course.getResourceType());
-					// 查询当前课程那些视频
-					List<FgRelationResourceListVo> relationList = resourceRelationService
-							.queryByRrelationResource(course.getId());
-					
-					for (FgRelationResourceListVo relation : relationList) {
+					if(audio != null) {
+						vo.setId(audio.getId());
+						vo.setCover(audio.getCover());
+						vo.setName(audio.getName());
+						vo.setResourceType(audio.getResourceType());
 						// 时间转换
-						String time = relation.getTimeLength();
+						String time = audio.getTimeLength();
 						if (time.indexOf("时") != -1) {
 							shi = shi.add(new BigDecimal(time.substring(time.indexOf("时") + 1, time.indexOf("时") + 1)));
 						}
@@ -206,26 +173,51 @@ public class FgVideoLookLibrarySerivceImpl extends BaseServiceImpl<VideoLookLibr
 							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.getResourceType().intValue() == 9) {
+					// 查询课程
+					CourseLibrary course = fgCourseLibraryService.selectByPrimaryKey(goodsForm.getId());
+					if(course != null) {
+						vo.setId(course.getId());
+						vo.setCover(course.getCover());
+						vo.setName(course.getName());
+						vo.setResourceType(course.getResourceType());
+						// 查询当前课程那些视频
+						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.substring(time.indexOf("时") + 1, time.indexOf("时") + 1)));
+							}
+							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;
 					}
-					
 				}
 				//获取观看进度时间
 				timeSpeed = mapper.queryTime(goodsForm.getId());
 				System.out.println(timeSpeed);
 				//得到总时间
 				sum = miao.add(shi.multiply(new BigDecimal(3600)).add(fen.multiply(new BigDecimal(60))));
-				vo.setPercentage(Integer.parseInt(timeSpeed.multiply(new BigDecimal(100)).divide(sum, 0,BigDecimal.ROUND_HALF_UP).toString()));
-			    listvo.add(vo);
-			    System.out.println(listvo);
+				if(sum.intValue() > 0) {
+					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);
-		page1.setTotal(page.getTotal());
-		page1.setPages(page.getPages());
-		page1.setStartRow(page.getStartRow());
-		page1.setEndRow(page.getEndRow());
-		page1.setNextPage(page.getNextPage());
-		page1.setLastPage(page.getLastPage());
 		return  page1;
 	}
 }