diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index 3ca1a22..52acba3 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -1051,8 +1051,15 @@ public class CommomService { try { + String osName = System.getProperty("os.name").toLowerCase(); + String costPath =""; + if (osName.contains("linux")) { + costPath = "/mnt/share/cost"; + }else{ + costPath = costPdfPath; + } //解析压缩包文件上传并解压,返回存放pdf的全路径 - String saveFileName = UploadUtil.resolveCompressUploadFile(request, multipartFile, costPdfPath); + String saveFileName = UploadUtil.resolveCompressUploadFile(request, multipartFile, costPath); //获取pdf文件名 List pdfNameList = Pdf2ImgUtil.getPdfName(saveFileName); //导出失败病案号,出院日期数组 diff --git a/src/main/java/com/emr/util/Pdf2ImgUtil.java b/src/main/java/com/emr/util/Pdf2ImgUtil.java index 0420adb..a8df7a2 100644 --- a/src/main/java/com/emr/util/Pdf2ImgUtil.java +++ b/src/main/java/com/emr/util/Pdf2ImgUtil.java @@ -24,7 +24,7 @@ public class Pdf2ImgUtil { public static List pdfToPic(String fileAddress, String filename, String type, String picPath) throws IOException { //long startTime = System.currentTimeMillis(); // 将文件地址和文件名拼接成路径 注意:线上环境不能使用\\拼接 - File file = new File(fileAddress + "\\" + filename + ".pdf"); + File file = new File(fileAddress + File.separator + filename + ".pdf"); List picNameList = new ArrayList<>(); PDDocument doc = null; try { @@ -36,7 +36,7 @@ public class Pdf2ImgUtil { // dpi为144,越高越清晰,转换越慢 BufferedImage image = renderer.renderImageWithDPI(i, 150); // Windows native DPI // 将图片写出到该路径下 - ImageIO.write(image, type, new File(picPath + "\\" + "FY_" + filename + "_" + String.format("%04d",i + 1)+ "." + type)); + ImageIO.write(image, type, new File(picPath + File.separator + "FY_" + filename + "_" + String.format("%04d",i + 1)+ "." + type)); picNameList.add("FY_" + filename + "_" + String.format("%04d",i + 1)+ "." + type); }