Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

检测报告下载地址修改

Browse Source
This commit is contained in:
wurui
2023-03-20 14:53:45 +08:00
parent 306e0ba3d8
commit b1bc145e57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
View File

@@ -210,7 +210,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
}
}else{
String time="[(]((([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29))[)]";
boolean matches1 = Pattern.matches("^[A-Za-z0-9\\u4e00-\\u9fa5]*-检测报告"+time+"$", originalFilename);
boolean matches1 = Pattern.matches("^[A-Za-z0-9\\u4e00-\\u9fa5]*-检测报告"+time+".docx$", originalFilename);
if(!matches1){
continue;
}
@@ -303,7 +303,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
if (StrUtil.isBlank(terminal.getInspectionReport())) {
throw new BusinessException(OssResponseEnum.DOWNLOAD_FILE_ERROR, "下载检测报告文件URL不存在，请检查数据");
}
InputStream fileStream = fileStorageUtil.getFileStream(terminal.getOriginalReport());
InputStream fileStream = fileStorageUtil.getFileStream(terminal.getInspectionReport());
return new InputStreamResource(fileStream);
}
if (StrUtil.isBlank(terminal.getOriginalReport())) {