--no commit message

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

@@ -5,6 +5,7 @@ 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.model.file.FileInfo;
 import com.zrqx.core.util.response.CallBack;
 
 /**
@@ -34,4 +35,14 @@ public interface FileInfoClient {
 	 */
 	@RequestMapping(value = "/getFilePath", method = RequestMethod.GET)
 	CallBack<String> downLoad(@RequestParam(value = "fileName") String fileName) ;
+	
+	/**
+	 * 查询文件详细信息
+	 * @param fileName
+	 * @return
+	 * @author ycw
+	 * @date: 2020年7月8日 上午9:26:50
+	 */
+	@RequestMapping(value = "/getInfo", method = RequestMethod.GET)
+	CallBack<FileInfo> getInfo(@RequestParam(value = "fileName") String fileName);
 }

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

@@ -4,6 +4,7 @@ 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
@@ -21,4 +22,10 @@ public class FileInfoClientHystric implements FileInfoClient {
 		logger.info("通过fileName:"+ fileName +"调用文件服务获取文件地址失败");
 		return CallBack.fail();
 	}
+	
+	@Override
+	public CallBack<FileInfo> getInfo(String fileName){
+		logger.info("通过fileName:"+ fileName +"调用文件服务获取文件信息失败");
+		return CallBack.fail();
+	}
 }

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

@@ -33,6 +33,7 @@ import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryRecommedArticleForm;
 import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryRelatedArticleForm;
 import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.file.FileInfo;
 import com.zrqx.core.model.order.OrderInfo;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
@@ -163,10 +164,10 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 		boolean isComplete = false;	// 是否补全
 		List<FgArticleLibraryListVO> lis = new ArrayList<FgArticleLibraryListVO>();	// 补充数据
 		List<FgArticleLibraryListVO> list = new ArrayList<FgArticleLibraryListVO>();
+		PageInfo<FgArticleLibraryListVO> page = new PageInfo<FgArticleLibraryListVO>(list);
 		if(ArrayUtils.isNotEmpty(ids)){
 			startPage(pageParam);
 			list = mapper.queryRecommendArticleByIds(ids);	
-		}
 			// 判断数量是否满足，不满足，需要补全
 			if(list.size() < pageParam.getPageSize()){
 				int num = pageParam.getPageSize() - list.size();
@@ -182,15 +183,28 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 					isComplete = true;
 				}
 			}
-		/*if(list.size() == 0){
+			page = new PageInfo<FgArticleLibraryListVO>(list);
+			if(isComplete){
+				page.setSize(list.size());
+				page.setTotal(page.getTotal() + lis.size());
+			}
+		} else{
 			int num = 6;
 			PageHelper.startPage(1, num, "uploadTime desc ,a.id desc");
 			FgQueryRecommedArticleForm form = new FgQueryRecommedArticleForm();
 			form.setIds(ids);
 			form.setResourceType(ArticleTypeEnum.ANLI.getCode());
 			list = mapper.queryOtherRecommendArticle(form);
-			list = BeanUtils.copyList(list, FgArticleLibraryListVO.class);
-		}*/
+			page = new PageInfo<FgArticleLibraryListVO>(list);
+			page.setSize(list.size());
+			page.setTotal(list.size());
+			page.setHasNextPage(false);
+			page.setIsLastPage(true);
+			page.setNavigateLastPage(1);
+			page.setLastPage(1);
+			page.setNextPage(0);
+			page.setPages(1);
+		}
 		this.isPdf(list);
 		this.regEx(list);
 		// 获取权限判断
@@ -201,11 +215,6 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 				li.setMessageCode(one.getMessageCode());
 			}
 		});
-		PageInfo<FgArticleLibraryListVO> page = new PageInfo<FgArticleLibraryListVO>(list);
-		if(isComplete){
-			page.setSize(list.size());
-			page.setTotal(page.getTotal() + lis.size());
-		}
 		return page;
 	}
 	
@@ -289,7 +298,18 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			if(result.hasEntity()){
 				vo.setPdfPath("/sc/" + result.getData());
 			}else{
-				logger.info("查询pdf地址失败");
+				logger.error("查询pdf地址失败");
+			}
+		}else{
+			vo.setIsPdf(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
+		}
+		if(StringUtils.isNotBlank(vo.getAudio())){
+			// 查询pdf地址
+			CallBack<FileInfo> result = fileInfoClient.getInfo(vo.getAudio());
+			if(result.hasEntity()){
+				vo.setTimeLength(result.getData().getTime() + "");
+			}else{
+				logger.error("查询音频信息失败");
 			}
 		}else{
 			vo.setIsPdf(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
@@ -315,7 +335,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			if(result.hasEntity()){
 				vo.setIsCollection(result.getData());
 			}else{
-				logger.info("跨服务查询收藏失败");
+				logger.error("跨服务查询收藏失败");
 				vo.setIsCollection(0);
 			}
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/resource/FgResourceLibraryServiceImpl.java

@@ -617,7 +617,10 @@ public class FgResourceLibraryServiceImpl implements FgResourceLibraryService {
 					String text = this.regEx1(solrDocument.get("text").toString(), solrDocument.get("name").toString());
 					Integer totalCount = text.length();
 					Integer count = totalCount / 2;
-					text = HtmlUtil.subStringHTML(text, count) + "...";
+					text = HtmlUtil.subStringHTML(text, count);
+					if(StringUtils.isNotBlank(text)){
+						text = text + "...";
+					}
 					resultMap.put("text",text);
 				}else{
 					resultMap.put("text",null);