From 7bbd610392f46cad8612cc06502de6de43e76802 Mon Sep 17 00:00:00 2001 From: yf <770153798@qq.com> Date: Mon, 20 Jan 2025 10:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=8F=AA=E5=AF=BC?= =?UTF-8?q?=E5=87=BAhtml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleorder/SaleOrderServiceImpl.java | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 509bc66..63efbb2 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -1225,9 +1225,6 @@ public class SaleOrderServiceImpl implements SaleOrderService { System.out.println("创建目录:"+pathUrl); file1.mkdirs(); } - // 主机地址 - String targetPath = pdfPath + "/dsf"; - targetPath = targetPath.replaceAll("//", "/"); List files = new ArrayList<>(); List delFiles = new ArrayList<>(); for (SaleOrderSkuDO skuDO : skuDOS) { @@ -1247,28 +1244,11 @@ public class SaleOrderServiceImpl implements SaleOrderService { e.printStackTrace(); } - //宿主机pdf生成路径 - String ouput = StrUtil.format(targetPath + "/{}_{}.pdf",(s+"_"+orderQty),name); - // 宿主机html地址 - String inputPath = StrUtil.format(targetPath + "/{}_{}.html",(s+"_"+orderQty),name); - - String htmlText = HttpUtil.get(sourceFile); FileUtil.writeString(htmlText, templatePath2, "UTF-8"); - //请求wkapp - JSONObject params = new JSONObject(); - params.put("input_html_path", inputPath); - params.put("output_pdf_path", ouput); - System.out.println("params"+params); - log.info("稿件导出 请求wkapp接口url：" + wkappUrl + "/exehtmltopdf"); - String result = HttpUtil.post(wkappUrl + "/exehtmltopdf", params, 5 * 60 * 1000); - log.info("稿件导出 请求wkapp接口返回结果：" + result); - //WKHtmlToPdfUtil.convert(templatePath, pdfPath); - File file = FileUtil.file(ouput); - System.out.println("ouput:"+ouput); + File file = FileUtil.file(templatePath2); files.add(file); -// delFiles.add(ouput); -// delFiles.add(templatePath2); + delFiles.add(templatePath2); } } if(FuncUtil.isEmpty(files)){ @@ -1276,7 +1256,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { } System.out.println("files:"+files); - String zipFileName = StrUtil.format(targetPath + "/订单稿件_{}.zip", new Date().getTime()); + String zipFileName = StrUtil.format(pathUrl + "/订单稿件_{}.zip", new Date().getTime()); // 压缩到的位置 File zipFile = new File(zipFileName);