--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/client/file/FileInfoClient.java

+package com.zrqx.resource.fg.client.file;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.zrqx.core.util.response.CallBack;
+
+/**
+ * 文件远程调用
+ * @author ycw
+ * @date 2019年6月27日下午7:03:43
+ */
+@FeignClient(value="file1",fallback=FileInfoClientHystric.class,path = "/file")
+public interface FileInfoClient {
+
+	/**
+	 * 获取视频切片地址
+	 * @param fileName
+	 * @return
+	 * @author ycw
+	 * @date: 2019年6月27日 下午7:05:59
+	 */
+	@RequestMapping(value = "/getVideoImg", method = RequestMethod.GET)
+	CallBack<String> getFilePath(@RequestParam(value = "fileName") String fileName);
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/client/file/FileInfoClientHystric.java

+package com.zrqx.resource.fg.client.file;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import com.zrqx.core.util.response.CallBack;
+
+@Component
+public class FileInfoClientHystric implements FileInfoClient {
+	private static final Logger logger = LoggerFactory.getLogger(FileInfoClientHystric.class);
+
+	@Override
+	public CallBack<String> getFilePath(String fileName) {
+		logger.info("通过fileName:"+ fileName +"调用文件服务失败");
+		return CallBack.fail();
+	}
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -138,16 +138,18 @@ public class FgResourceLibraryController {
 		QueryResponse sr;
 		try {
 			sr = client.query(sq);
-			
-			SolrDocumentList doclist = sr.getResults();
-			for (SolrDocument solrDocument : doclist) {
-				if(solrDocument.get("name").toString().contains(name)) {
-					set.add(solrDocument.get("name"));
-				}
-				if(solrDocument.get("bookName").toString().contains(name)) {
-					set.add(solrDocument.get("bookName"));
+			if(sr!=null) {
+				SolrDocumentList doclist = sr.getResults();
+				for (SolrDocument solrDocument : doclist) {
+					if(solrDocument.get("name").toString().contains(name)) {
+						set.add(solrDocument.get("name"));
+					}
+					if(solrDocument.get("bookName").toString().contains(name)) {
+						set.add(solrDocument.get("bookName"));
+					}
 				}
 			}
+			
 		} catch (SolrServerException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -41,13 +41,12 @@ import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO;
 import com.zrqx.core.vo.resource.fg.recommend.FgTypeToResourceListVo;
 import com.zrqx.resource.commons.Redis;
+import com.zrqx.resource.fg.client.file.FileInfoClient;
 import com.zrqx.resource.fg.client.member.FgMemberCollectionClient;
-import com.zrqx.resource.fg.client.member.MemberClient;
 import com.zrqx.resource.fg.client.order.OrderClient;
 import com.zrqx.resource.fg.client.organ.OrganClient;
 import com.zrqx.resource.fg.mapper.articlelibrary.FgArticleLibraryDiyTypeMapper;
 import com.zrqx.resource.fg.mapper.articlelibrary.FgArticleLibraryMapper;
-import com.zrqx.resource.fg.mapper.ebook.FgBookMapper;
 import com.zrqx.resource.fg.mapper.ebook.FgEbookDiyTypeMapper;
 
 
@@ -75,6 +74,8 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 	private OrganClient organClient;
 	@Autowired
 	private FgMemberCollectionClient fgMemberCollectionClient;
+	@Autowired
+	private FileInfoClient fileInfoClient;
 	@Override
 	public BaseMapper<ArticleLibrary> getMapper() {
 		return mapper;
@@ -168,6 +169,8 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		}else{
 			vo.setIsPdf(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
 		}
+		// 获取视频切片地址
+		this.getFilePath(vo);
 		if(!redis.isExistMember()){
 			// 未登录
 			vo.setIsCollection(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
@@ -555,5 +558,22 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		List<FgArticleLibraryListVO> list = BeanUtils.copyList(mapper.select(article),FgArticleLibraryListVO.class);
 		return list;
 	}
-	
+	/**
+	 * 获取视频切片地址
+	 * @param list
+	 * @author ycw
+	 * @date: 2019年6月27日 下午8:58:52
+	 */
+	private void getFilePath(FgArticleLibraryOneVO vo){
+			if(StringUtils.isNotBlank(vo.getVideo())){
+				// 查询视频切片地址
+				CallBack<String> result = fileInfoClient.getFilePath(vo.getVideo());
+				if(result.hasEntity()){
+					vo.setImgPath(result.getData());
+				}else{
+					logger.info("查询微课视频切片地址失败");
+				}
+			}
+		
+	}
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/information/FgInformationController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import tk.mybatis.mapper.entity.Example;
 
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
+import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.exception.LoginValidateException;
@@ -53,6 +54,8 @@ public class FgInformationController {
 	/** 留言*/
 	@Autowired
 	private FgMessageService messageService;
+	@Autowired
+	private Redis redisManage;
 	
 	@ApiOperation(value = "查询栏目列表", notes = "根据栏目名数组查询公告")
 	@GetMapping(value = SysUserRequestPath.BULLETIN + SysUserRequestPath.LIST)
@@ -73,6 +76,20 @@ public class FgInformationController {
 	@GetMapping(value = SysUserRequestPath.BULLETIN_CONTENT + SysUserRequestPath.OID)
 	public CallBack<BulletinContent> getById(@PathVariable Integer oid) {
 		BulletinContent vo = service.selectByPrimaryKey(oid);
+		// 设置是否已点赞
+		vo.setIsAgree(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
+		String userId = null;
+		if(redisManage.isExistMember()){
+			userId = redisManage.getMember().getId().toString();
+			//对每条资讯，判断是否已点赞
+			// 设置回复数量
+			BulletinAgree ca = new BulletinAgree();
+			ca.setBulletinId(vo.getId());
+			ca.setUserId(redisManage.getMember().getId().toString());
+			if(!agreeService.select(ca).isEmpty()){
+				vo.setIsAgree(Integer.parseInt(BooleanStatusEnum.YES.getCode()));
+			}
+		}
 		// 更新浏览量
 		service.updateBrowseNum(oid);
 		//读取上一条记录：