--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/client/file/FileCilentHystric.java

+package com.zrqx.sysuser.bg.client.file;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.zrqx.core.model.file.FileInfo;
+import com.zrqx.core.util.response.CallBack;
+
+@Component
+public class FileCilentHystric implements FileClient {
+
+	private static final Logger logger = LoggerFactory.getLogger(FileCilentHystric.class);
+
+	@Override
+	public CallBack<FileInfo> getFileInfo(String fileName) {
+		logger.info("调用文件服务失败");
+		return CallBack.fail();
+	}
+
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/client/file/FileClient.java

+package com.zrqx.sysuser.bg.client.file;
+
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.zrqx.core.model.file.FileInfo;
+import com.zrqx.core.util.response.CallBack;
+
+
+@FeignClient(value="file",fallback=FileCilentHystric.class)
+public interface FileClient {
+	
+	/**
+	 * 根据id查询到pdf路径
+	 * @param form
+	 * @return
+	 * @author rjy
+	 * @date: 2019年9月17日 上午14:43:27
+	 */
+	@GetMapping("/getFileInfo")
+	public CallBack<FileInfo> getFileInfo(String fileName);
+
+}
\ No newline at end of file

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java

@@ -19,7 +19,7 @@ import com.zrqx.core.vo.sysuser.bg.statistics.UserStatisticsListVo;
 public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	
 	@Select("<script>" 
-			+ "select a.id, a.name, a.source, a.timeLength,a.size,a.video,a.image,a.uploadTime,a.status,a.userId,a.resourceType, user.userName,user.name realName,d.departmentName  "
+			+ "select a.id, a.name, a.source, a.timeLength,a.size,a.video,a.image,a.uploadTime,a.status,a.userId,a.resourceType,a.recommendNum,a.videoText,a.taskText,a.textFile,a.eafFile, user.userName,user.name realName,d.departmentName  "
 			+ "from res_Video_Library a "
 			+ "left join sys_user user on a.userId = user.userid "
 			+ "LEFT JOIN sys_user_department ud ON a.userid = ud.userid "

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/resource/VideoLibrarySerivceImpl.java

 package com.zrqx.sysuser.bg.service.resource;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,27 +14,30 @@ import com.github.pagehelper.PageHelper;
 import com.zrqx.core.enums.resource.LibraryStatusEnum;
 import com.zrqx.core.enums.sysuser.UserTypeEnum;
 import com.zrqx.core.enums.sysuser.contribute.ContributeEnum;
-import com.zrqx.core.form.resource.bg.videolibrary.SaveSignLanguageForm;
 import com.zrqx.core.form.sysuser.bg.statistics.QueryStatisticsForm;
-import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.file.FileInfo;
+import com.zrqx.core.model.resource.videolibrary.VideoCommentRelation;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.model.sysuser.comment.Comment;
 import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
 import com.zrqx.core.model.sysuser.contribute.Contribute;
 import com.zrqx.core.model.sysuser.user.User;
 import com.zrqx.core.service.BaseServiceImpl;
-import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.file.FileUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryOneVO;
 import com.zrqx.core.vo.sysuser.bg.statistics.StatisticsListVo;
 import com.zrqx.core.vo.sysuser.bg.statistics.UserStatisticsListVo;
+import com.zrqx.sysuser.bg.client.file.FileClient;
 import com.zrqx.sysuser.bg.mapper.comment.CommentMapper;
 import com.zrqx.sysuser.bg.mapper.content.SignLanguageUserRelationMapper;
 import com.zrqx.sysuser.bg.mapper.contribute.ContributeMapper;
+import com.zrqx.sysuser.bg.mapper.resource.VideoCommentRelationMapper;
 import com.zrqx.sysuser.bg.mapper.resource.VideoLibraryMapper;
 import com.zrqx.sysuser.commons.redis.Redis;
 
@@ -47,6 +50,8 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	@Autowired
 	private VideoLibraryMapper mapper;
 	@Autowired
+	private VideoCommentRelationMapper videoCommentRelationMapper;
+	@Autowired
 	private SignLanguageUserRelationMapper signLanguageUserRelationMapper;
 	@Autowired
 	private CommentMapper commentMapper;
@@ -54,6 +59,9 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	private Redis redis;
 	@Autowired
 	private ContributeMapper contributeMapper;
+	@Autowired
+	private FileClient fileClient;
+	
 	@Override
 	public BaseMapper<VideoLibrary> getMapper() {
 		return mapper;
@@ -92,6 +100,26 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 				}
 			}
 		}
+		// 获取点评
+		VideoCommentRelation c = new VideoCommentRelation();
+		c.setVideoId(oid);
+		List<VideoCommentRelation> cls = videoCommentRelationMapper.select(c);
+		if(ArrayUtils.isNotEmpty(cls)) {
+			vo.setVideoComment(cls.get(0).getComment());
+		}
+		// 获取文件名
+		if(StringUtils.isNotBlank(vo.getTextFile())){
+			CallBack<FileInfo> result = fileClient.getFileInfo(vo.getTextFile());
+			if(result.hasEntity()){
+				vo.setTextFile_zh(result.getData().getOriginalFileName());
+			}
+		}
+		if(StringUtils.isNotBlank(vo.getEafFile())){
+			CallBack<FileInfo> result = fileClient.getFileInfo(vo.getEafFile());
+			if(result.hasEntity()){
+				vo.setEafFile_zh(result.getData().getOriginalFileName());
+			}
+		}
 		return vo;
 	}