|
@@ -447,6 +447,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
if (fileUrl.contains("$$$")) {
|
|
if (fileUrl.contains("$$$")) {
|
|
fileUrl = fileUrl.substring(0, fileUrl.indexOf("$$$"));
|
|
fileUrl = fileUrl.substring(0, fileUrl.indexOf("$$$"));
|
|
}
|
|
}
|
|
|
|
+ fileUrl = fileUrl.trim();
|
|
if (frontUrl.contains("$$$")) {
|
|
if (frontUrl.contains("$$$")) {
|
|
fileId = frontUrl.substring(frontUrl.indexOf("$$$") + 3);
|
|
fileId = frontUrl.substring(frontUrl.indexOf("$$$") + 3);
|
|
} else {
|
|
} else {
|
|
@@ -2887,11 +2888,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
// urlList.add(frontUrls[1]);
|
|
// urlList.add(frontUrls[1]);
|
|
// }
|
|
// }
|
|
if (StringUtils.isNotEmpty(front)) {
|
|
if (StringUtils.isNotEmpty(front)) {
|
|
- urlList.add(front);
|
|
|
|
|
|
+ urlList.add(front.trim());
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isNotEmpty(cataLog)) {
|
|
if (StringUtils.isNotEmpty(cataLog)) {
|
|
- urlList.add(cataLog);
|
|
|
|
|
|
+ urlList.add(cataLog.trim());
|
|
}
|
|
}
|
|
|
|
|
|
urlList.addAll(fileUrls);
|
|
urlList.addAll(fileUrls);
|
|
@@ -2901,11 +2902,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
// urlList.add(frontUrls[3]);
|
|
// urlList.add(frontUrls[3]);
|
|
// }
|
|
// }
|
|
if (StringUtils.isNotEmpty(spare)) {
|
|
if (StringUtils.isNotEmpty(spare)) {
|
|
- urlList.add(spare);
|
|
|
|
|
|
+ urlList.add(spare.trim());
|
|
}
|
|
}
|
|
|
|
|
|
if (StringUtils.isNotEmpty(back)) {
|
|
if (StringUtils.isNotEmpty(back)) {
|
|
- urlList.add(back);
|
|
|
|
|
|
+ urlList.add(back.trim());
|
|
}
|
|
}
|
|
String fileName = SnowFlakeUtil.getId().toString();
|
|
String fileName = SnowFlakeUtil.getId().toString();
|
|
url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
|
|
url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
|