From 4cbfaec72361475c8c6e13dd8eb5ff81be336948 Mon Sep 17 00:00:00 2001 From: zhanghai <120228220@qq.com> Date: Thu, 16 Nov 2023 11:43:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E5=90=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/docus/sw/fenpan/FenpanService.java | 4 ++-- .../java/com/docus/sw/souyin/SuoyinService.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/docus/sw/fenpan/FenpanService.java b/src/main/java/com/docus/sw/fenpan/FenpanService.java index b93f49e..64ee64b 100644 --- a/src/main/java/com/docus/sw/fenpan/FenpanService.java +++ b/src/main/java/com/docus/sw/fenpan/FenpanService.java @@ -30,13 +30,13 @@ public class FenpanService { List plateList = new ArrayList<>(); Zong zong = zongMap.get(key); List rollList = zong.getRollList(); - Plate plate = new Plate(Integer.parseInt(Config.getParam("plate.size")), "盘" + i++); + Plate plate = new Plate(Integer.parseInt(Config.getParam("plate.size")), String.format("%04d", i++)); for (Roll roll : rollList) { Boolean put = plate.put(roll); if (!put) { //磁盘放不进去了 plateList.add(plate); - plate = new Plate(Integer.parseInt(Config.getParam("plate.size")), "盘" + i++); + plate = new Plate(Integer.parseInt(Config.getParam("plate.size")), String.format("%04d", i++)); plate.put(roll); } } diff --git a/src/main/java/com/docus/sw/souyin/SuoyinService.java b/src/main/java/com/docus/sw/souyin/SuoyinService.java index cc8083e..016ec57 100644 --- a/src/main/java/com/docus/sw/souyin/SuoyinService.java +++ b/src/main/java/com/docus/sw/souyin/SuoyinService.java @@ -175,11 +175,11 @@ public class SuoyinService { mesEasyExcels.add(MesEasyExcel.create(indexPageRowTemp)); } - EasyExcel.write(indexPlate.getAbsolutePath()+"\\index.xls", MesEasyExcel.class).sheet("test").doWrite(mesEasyExcels); + EasyExcel.write(indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".xls", MesEasyExcel.class).sheet("test").doWrite(mesEasyExcels); - ExcelUtil.toPdf(indexPlate.getAbsolutePath()+"\\index.xls",indexPlate.getAbsolutePath()+"\\index.pdf"); + ExcelUtil.toPdf(indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".xls",indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".pdf"); - Integer page = PdfUtil.getPage(indexPlate.getAbsolutePath() + "\\index.pdf"); + Integer page = PdfUtil.getPage(indexPlate.getAbsolutePath() +"/"+ indexPlate.getName()+".pdf"); @@ -194,15 +194,15 @@ public class SuoyinService { mesEasyExcels.add(MesEasyExcel.create(indexPageRowTemp)); } - EasyExcel.write(indexPlate.getAbsolutePath()+"\\index.xls", MesEasyExcel.class).sheet("test").doWrite(mesEasyExcels); + EasyExcel.write(indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".xls", MesEasyExcel.class).sheet("test").doWrite(mesEasyExcels); - ExcelUtil.toPdf(indexPlate.getAbsolutePath()+"\\index.xls",indexPlate.getAbsolutePath()+"\\index.pdf"); + ExcelUtil.toPdf(indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".xls",indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".pdf"); //写入文件夹。 - PdfToPic.toPic(indexPlate.getAbsolutePath()+"\\index.pdf",indexPlate.getAbsolutePath()+"/片头","0000","jpg"); + PdfToPic.toPic(indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".pdf",indexPlate.getAbsolutePath()+"/片头","0000","jpg"); - PdfToPic.toPicDesc(indexPlate.getAbsolutePath()+"\\index.pdf",indexPlate.getAbsolutePath()+"/片尾","0010","jpg"); + PdfToPic.toPicDesc(indexPlate.getAbsolutePath()+"/"+indexPlate.getName()+".pdf",indexPlate.getAbsolutePath()+"/片尾","0010","jpg"); //再重算一次索引，以及将文件进行替换。