Эх сурвалжийг харах

打开影音图像的预览

huangtf 2 жил өмнө
parent
commit
a2af757966

+ 8 - 2
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -1770,17 +1770,23 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			}
 		}
 		List<String> fileUrls =new ArrayList<>();
-		if (!archivesAuto.isMedia()) {
+		//if (!archivesAuto.isMedia())
+		if (true)
+		{
 			List<ArchiveFile> result = this.archiveFileClient.getArchiveFileByArchivesId(archivesAuto.getId().toString(),"");
 			if(result != null && result.size() > 0){
 				//循环访问result,如果pdfpageurl不为空则取出,否则取pdffileurl
 				for (ArchiveFile archiveFile : result) {
 					String pdfPageUrl = archiveFile.getPdfPageUrl();
 					if (StringUtils.isEmpty(pdfPageUrl)) {
-						fileUrls.add(archiveFile.getPdfFileUrl());
+						pdfPageUrl = archiveFile.getPdfFileUrl();
 					}else{
 						fileUrls.add(pdfPageUrl);
 					}
+					if (StringUtils.isEmpty(pdfPageUrl) || !pdfPageUrl.contains("pdf")) {
+						continue;
+					}
+					fileUrls.add(pdfPageUrl);
 				}
 			}
 		}