diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfBaseUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfBaseUtil.java index 2f38c13..0565c2f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfBaseUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfBaseUtil.java @@ -8,6 +8,7 @@ import com.itextpdf.text.pdf.*; import com.itextpdf.text.pdf.draw.LineSeparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.io.File; @@ -27,7 +28,8 @@ public class PdfBaseUtil { private static final Logger logger = LoggerFactory.getLogger(PdfBaseUtil.class); - private static final String fileDir="D:/hxhq/uploadPath"; + + private static String localFilePath="D:/hxhq/uploadPath"; /** @@ -48,7 +50,7 @@ public class PdfBaseUtil { String timestamp = timestampFormat.format(now)+UUID.randomUUID(); // 2. 构建文件夹路径 - String folderPath = fileDir + File.separator + year + File.separator + month + File.separator + day; + String folderPath = localFilePath + File.separator + year + File.separator + month + File.separator + day; // 3. 确保目录存在 File dir = new File(folderPath); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfExportUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfExportUtil.java index 7b1d4e1..a949b01 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfExportUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/PdfExportUtil.java @@ -56,7 +56,9 @@ public class PdfExportUtil { */ public static String export(String className, String methodName, Object... params) { try { - return (String) invokeMethod(className, methodName, params); + String path= (String) invokeMethod(className, methodName, params); + return path.replace("D:\\hxhq\\uploadPath", "") + .replace("\\", "/"); } catch (Exception ex) { logger.error(ex.getMessage()); throw new ServiceException(ex.getMessage()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Resource/Drug.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Resource/Drug.java index 890f6ea..51ecea6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Resource/Drug.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Resource/Drug.java @@ -31,10 +31,10 @@ public class Drug { * @param mjy * @return */ - public static String exportDetail(Mjy mjy) { + public String exportDetail(Mjy mjy) { Document document = null; FileOutputStream fos = null; - String filePath = PdfBaseUtil.getFilePath(); + String filePath =PdfBaseUtil.getFilePath(); try { document = PdfBaseUtil.init(document, fos, filePath, SecurityUtils.getNickName(), mjy.getMc()); // 基本信息 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Template/Sp/Sp001.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Template/Sp/Sp001.java index 23210e0..cde5cad 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Template/Sp/Sp001.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/Pdf/Template/Sp/Sp001.java @@ -24,7 +24,7 @@ public class Sp001 { public static String exportDetail( String headerText,String signText) { Document document = null; FileOutputStream fos = null; - String filePath = PdfBaseUtil.getFilePath(); + String filePath = new PdfBaseUtil().getFilePath(); try { document=PdfBaseUtil.init(document,fos,filePath,signText,headerText); Map formData = new LinkedHashMap<>();