|
@@ -1240,10 +1240,15 @@ public class PatentStarApiService {
|
|
if (StringUtils.isNotEmpty(pdfUrlStr)) {
|
|
if (StringUtils.isNotEmpty(pdfUrlStr)) {
|
|
if (pdfUrlStr.contains("|http")) { //若包含公开和授权两个pdf
|
|
if (pdfUrlStr.contains("|http")) { //若包含公开和授权两个pdf
|
|
String[] pdfUrlArr = pdfUrlStr.split("\\|http");
|
|
String[] pdfUrlArr = pdfUrlStr.split("\\|http");
|
|
- pdfUrl1 = pdfUrlArr[0].substring(pdfUrlArr[0].indexOf("http"), pdfUrlArr[0].indexOf("?"));
|
|
|
|
pdfUrlArr[1] = "http" + pdfUrlArr[1];
|
|
pdfUrlArr[1] = "http" + pdfUrlArr[1];
|
|
- pdfUrl2 = pdfUrlArr[1].substring(pdfUrlArr[1].indexOf("http"), pdfUrlArr[1].indexOf("?"));
|
|
|
|
-
|
|
|
|
|
|
+ if (pdfUrlArr[0].contains("?") && pdfUrlArr[1].contains("?")) {
|
|
|
|
+ pdfUrl1 = pdfUrlArr[0].substring(pdfUrlArr[0].indexOf("http"), pdfUrlArr[0].indexOf("?"));
|
|
|
|
+ pdfUrl2 = pdfUrlArr[1].substring(pdfUrlArr[1].indexOf("http"), pdfUrlArr[1].indexOf("?"));
|
|
|
|
+ } else
|
|
|
|
+ {
|
|
|
|
+ pdfUrl1 = pdfUrlArr[0];
|
|
|
|
+ pdfUrl2 = pdfUrlArr[1];
|
|
|
|
+ }
|
|
if (pdfUrl1.contains("0A_CN_0.pdf")) {
|
|
if (pdfUrl1.contains("0A_CN_0.pdf")) {
|
|
|
|
|
|
InnerPatentPdfDTO dto = new InnerPatentPdfDTO();
|
|
InnerPatentPdfDTO dto = new InnerPatentPdfDTO();
|
|
@@ -1473,13 +1478,15 @@ public class PatentStarApiService {
|
|
if (!CollectionUtils.isEmpty(pdfList)) {
|
|
if (!CollectionUtils.isEmpty(pdfList)) {
|
|
List<InnerPatentPdfDTO> pdfDTOS = new ArrayList<>();
|
|
List<InnerPatentPdfDTO> pdfDTOS = new ArrayList<>();
|
|
for (InnerPatentPdfDTO innerPatentPdfDTO : pdfList) {
|
|
for (InnerPatentPdfDTO innerPatentPdfDTO : pdfList) {
|
|
- File file = FileUtils.getFileByUrl(innerPatentPdfDTO.getPdfGuid());
|
|
|
|
- List<String> guidList = fileManagerService.uploadFileGetGuid2(Collections.singletonList(file));
|
|
|
|
- if (!CollectionUtils.isEmpty(guidList)) {
|
|
|
|
- InnerPatentPdfDTO pdfDTO = new InnerPatentPdfDTO();
|
|
|
|
- pdfDTO.setPdfGuid(guidList.get(0));
|
|
|
|
- pdfDTO.setType(innerPatentPdfDTO.getType());
|
|
|
|
- pdfDTOS.add(pdfDTO);
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(innerPatentPdfDTO.getPdfGuid())) {
|
|
|
|
+ File file = FileUtils.getFileByUrl(innerPatentPdfDTO.getPdfGuid());
|
|
|
|
+ List<String> guidList = fileManagerService.uploadFileGetGuid2(Collections.singletonList(file));
|
|
|
|
+ if (!CollectionUtils.isEmpty(guidList)) {
|
|
|
|
+ InnerPatentPdfDTO pdfDTO = new InnerPatentPdfDTO();
|
|
|
|
+ pdfDTO.setPdfGuid(guidList.get(0));
|
|
|
|
+ pdfDTO.setType(innerPatentPdfDTO.getType());
|
|
|
|
+ pdfDTOS.add(pdfDTO);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
dto.setPdfDTOS(pdfDTOS);
|
|
dto.setPdfDTOS(pdfDTOS);
|