--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/communtiy/FgExcellentVideoListVo.java

+package com.zrqx.core.vo.sysuser.fg.communtiy;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "FgExcellentVideoListVo", description = "查询内容详情的实体")
+public class FgExcellentVideoListVo {
+	@ApiModelProperty("id")
+	private String id;
+	@ApiModelProperty("采集内容")
+	private String content;
+	@ApiModelProperty("内容")
+	private String text;
+	@ApiModelProperty("上传时间")
+	private Date uploadTime;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("评论数")
+	private Integer commentNum;
+	@ApiModelProperty("支持数")
+	private Integer supportNum;
+	@ApiModelProperty("反对数")
+	private Integer oppositionNum;
+	@ApiModelProperty("采集内容id")
+	private String signId;
+	/**用户信息*/
+	@ApiModelProperty("提交人Id（用户）")
+	private String userId;
+	@ApiModelProperty("提交人")
+	private String userName;
+	@ApiModelProperty(value="头像")
+	private String img;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/communtiy/FgExcellentVideoOneVo.java

@@ -10,19 +10,29 @@ import lombok.Data;
 @ApiModel(value = "FgExcellentVideoOneVo", description = "查询内容详情的实体")
 public class FgExcellentVideoOneVo {
 	
-	@ApiModelProperty("标题")
-	private String title;
+	@ApiModelProperty("采集内容")
+	private String content;
 	@ApiModelProperty("内容")
 	private String text;
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
 	@ApiModelProperty("视频")
-	private String video;
-	@ApiModelProperty("点评")
-	private String commentary;
+	private String videoPath;
+	@ApiModelProperty("评论数")
+	private Integer commentNum;
+	@ApiModelProperty("支持数")
+	private Integer supportNum;
+	@ApiModelProperty("反对数")
+	private Integer oppositionNum;
+	@ApiModelProperty("采集id")
+	private String signId;
 	/**用户信息*/
+	@ApiModelProperty("提交人Id（用户）")
+	private String userId;
 	@ApiModelProperty("提交人")
 	private String userName;
 	@ApiModelProperty(value="头像")
 	private String img;
+	@ApiModelProperty("点评")
+	private String commentary;
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/community/FgExcellentVideoController.java

 package com.zrqx.sysuser.fg.controller.community;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,24 +16,24 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.exception.LoginValidateException;
 import com.zrqx.core.exception.ParameterValidateException;
-import com.zrqx.core.form.sysuser.bg.comment.QueryCommentAgreeForm;
 import com.zrqx.core.form.sysuser.bg.community.QueryVideoAgreeForm;
 import com.zrqx.core.form.sysuser.fg.community.FgSaveVideoAgreeForm;
 import com.zrqx.core.model.community.ExcellentVideo;
-import com.zrqx.core.model.community.Forum;
 import com.zrqx.core.model.community.VideoAgree;
+import com.zrqx.core.model.sysuser.content.SignLanguage;
 import com.zrqx.core.model.sysuser.user.User;
+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.core.vo.sysuser.bg.community.ExcellentVideoListVo;
-import com.zrqx.core.vo.sysuser.bg.community.ExcellentVideoOneVo;
-import com.zrqx.sysuser.bg.service.community.VideoAgreeService;
-import com.zrqx.sysuser.bg.service.dept.DepartmentService;
+import com.zrqx.core.vo.sysuser.fg.communtiy.FgExcellentVideoListVo;
+import com.zrqx.core.vo.sysuser.fg.communtiy.FgExcellentVideoOneVo;
 import com.zrqx.sysuser.bg.service.user.UserService;
 import com.zrqx.sysuser.commons.redis.Redis;
+import com.zrqx.sysuser.fg.client.file.FgFileInfoClient;
 import com.zrqx.sysuser.fg.service.communtiy.FgExcellentVideoService;
 import com.zrqx.sysuser.fg.service.communtiy.FgVideoAgreeService;
+import com.zrqx.sysuser.fg.service.content.FgSignLanguageService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,20 +56,41 @@ public class FgExcellentVideoController {
 	private UserService userService;
 	@Autowired
 	private Redis redis;
+	@Autowired
+	private FgFileInfoClient fileInfoClient;
+	@Autowired
+	private FgSignLanguageService fgSignLanguageService;
+	
+	
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping(value = SysUserRequestPath.PAGE)
-	public CallBack<PageInfo<ExcellentVideoListVo>> page(PageParam pageParam) {
+	public CallBack<PageInfo<FgExcellentVideoListVo>> page(PageParam pageParam) {
 		return CallBack.success(excellentVideoService.page(pageParam));
 	}
 	@ApiOperation(value = "根据ID查看内容详情", notes = "根据ID查看内容详情")
 	@GetMapping(value = SysUserRequestPath.OID)
-	public CallBack<ExcellentVideoOneVo> selectById(@PathVariable String oid) {
+	public CallBack<FgExcellentVideoOneVo> selectById(@PathVariable String oid) {
 		ExcellentVideo video = excellentVideoService.selectByPrimaryKey(oid);
-		ExcellentVideoOneVo vo = new ExcellentVideoOneVo();
+		FgExcellentVideoOneVo vo = new FgExcellentVideoOneVo();
 		BeanUtils.copyProperties(video, vo);
 		User user = userService.selectByPrimaryKey(video.getUserId());
-		vo.setImg(user.getImg());
-		vo.setName(user.getName());
+		vo.setUserName(user.getName());
+		List<String> fileNameList = Arrays.asList(user.getImg());
+		CallBack<List<String>> result = fileInfoClient.getFilePath(fileNameList);
+		if (result.hasEntity() && ArrayUtils.isNotEmpty(result.getData())) {
+			vo.setImg(result.getData().get(0));
+		}
+		SignLanguage language = fgSignLanguageService.selectByPrimaryKey(vo.getSignId());
+		if(language!=null) {
+			if(language.getContent()!=null) {
+				vo.setContent(language.getContent());
+			}
+		}
+		List<String> fileNameVideo = Arrays.asList(video.getVideo());
+		CallBack<List<String>> resultVideo = fileInfoClient.getFilePath(fileNameVideo);
+		if (result.hasEntity() && ArrayUtils.isNotEmpty(resultVideo.getData())) {
+				vo.setVideoPath(resultVideo.getData().get(0));
+		}
 		/*//查询当前用户所属区域部门
 		Integer deptId = userService.getDeptIdByUserId(video.getUserId()).get(0);
 		if(deptId != null) {

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/communtiy/FgExcellentVideoMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.community.ExcellentVideo;
-import com.zrqx.core.vo.sysuser.bg.community.ExcellentVideoListVo;
+import com.zrqx.core.vo.sysuser.fg.communtiy.FgExcellentVideoListVo;
 
 /**
  * 论坛
@@ -17,7 +17,7 @@ public interface FgExcellentVideoMapper extends BaseMapper<ExcellentVideo> {
 	@Select("<script>" 
 			+ "SELECT * FROM sys_excellent_video cc where 1=1 and cc.status=1"
 			+ "</script>")
-	List<ExcellentVideoListVo> page();
+	List<FgExcellentVideoListVo> page();
 
 	
 	

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/communtiy/FgExcellentVideoService.java

@@ -4,7 +4,7 @@ import com.zrqx.core.model.community.ExcellentVideo;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.vo.sysuser.bg.community.ExcellentVideoListVo;
+import com.zrqx.core.vo.sysuser.fg.communtiy.FgExcellentVideoListVo;
 
  /** 
   * 优秀视频库
@@ -13,7 +13,7 @@ import com.zrqx.core.vo.sysuser.bg.community.ExcellentVideoListVo;
   */
 public interface FgExcellentVideoService extends BaseService<ExcellentVideo,String>{
 
-	PageInfo<ExcellentVideoListVo> page(PageParam pageParam);
+	PageInfo<FgExcellentVideoListVo> page(PageParam pageParam);
 
 	
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/communtiy/FgExcellentVideoServiceImpl.java

 package com.zrqx.sysuser.fg.service.communtiy;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.enums.OnLineStateEnum;
-import com.zrqx.core.form.sysuser.bg.community.QueryExcellentVideoForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.community.ExcellentVideo;
+import com.zrqx.core.model.sysuser.content.SignLanguage;
+import com.zrqx.core.model.sysuser.user.User;
 import com.zrqx.core.service.BaseServiceImpl;
+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.core.vo.sysuser.bg.community.ExcellentVideoListVo;
+import com.zrqx.core.vo.sysuser.fg.communtiy.FgExcellentVideoListVo;
+import com.zrqx.core.vo.sysuser.fg.contribute.FgContributeListVo;
+import com.zrqx.sysuser.fg.client.file.FgFileInfoClient;
 import com.zrqx.sysuser.fg.mapper.communtiy.FgExcellentVideoMapper;
+import com.zrqx.sysuser.fg.mapper.content.FgSignLanguageMapper;
+import com.zrqx.sysuser.fg.mapper.user.FgUserMapper;
+import com.zrqx.sysuser.fg.service.user.FgUserService;
 
 /**
  * 论坛管理
@@ -26,21 +37,46 @@ public class FgExcellentVideoServiceImpl extends BaseServiceImpl<ExcellentVideo,
 
 	@Autowired
 	private FgExcellentVideoMapper mapper;
-
+	@Autowired
+	private FgSignLanguageMapper fgSignLanguageMapper;
+	@Autowired
+	private FgUserMapper fgUserMapper;
+	@Autowired
+	private FgFileInfoClient fileInfoClient;
 	@Override
 	public BaseMapper<ExcellentVideo> getMapper() {
 		return mapper;
 	}
 
 	@Override
-	public PageInfo<ExcellentVideoListVo> page(PageParam pageParam) {
+	public PageInfo<FgExcellentVideoListVo> page(PageParam pageParam) {
 		if(pageParam.getOrderBy()==null) {
 			pageParam.setOrderBy("uploadTime desc ");
 		}
 		startPage(pageParam);
-		List<ExcellentVideoListVo> list = mapper.page();
-		list.stream().forEach(li -> li.setStatus_zh(OnLineStateEnum.getName(li.getStatus())));
-		return new PageInfo<ExcellentVideoListVo>(list);
+		List<FgExcellentVideoListVo> list = mapper.page();
+		for (FgExcellentVideoListVo vo : list) {
+			SignLanguage language = fgSignLanguageMapper.selectByPrimaryKey(vo.getSignId());
+			User user = fgUserMapper.selectByPrimaryKey(vo.getUserId());
+			if(language!=null) {
+				if(language.getContent()!=null) {
+					vo.setContent(language.getContent());
+				}
+			}
+			List<String> fileNameList = Arrays.asList(user.getImg());
+			CallBack<List<String>> result = fileInfoClient.getFilePath(fileNameList);
+			if (result.hasEntity() && ArrayUtils.isNotEmpty(result.getData())) {
+				vo.setImg(result.getData().get(0));
+			}
+		}
+		List<String> fileNameList = list.stream().map(FgExcellentVideoListVo :: getVideo).collect(Collectors.toList());
+		CallBack<List<String>> result = fileInfoClient.getFilePath(fileNameList);
+		if (result.hasEntity() && ArrayUtils.isNotEmpty(result.getData())) {
+			for(int i =0; i < list.size(); i++) {
+				list.get(i).setVideo(result.getData().get(i));
+			}
+		}
+		return new PageInfo<FgExcellentVideoListVo>(list);
 	}