From fd6ec2e1566b30d6634014a18adc1d7922272295 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 9 Apr 2025 10:43:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=8D=95=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grp/service/impl/ExpensePluginServiceImpl.java | 10 +--------- .../src/test/java/com/hzya/frame/PluginTest.java | 4 +++- .../oerdjml/service/impl/OerDjmlExtServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java index 619b4c52..8aaf364e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/grp/service/impl/ExpensePluginServiceImpl.java @@ -44,15 +44,7 @@ public class ExpensePluginServiceImpl implements IExpensePluginService { Assert.notEmpty(dataSouceCode,"数据源编码不能为空"); logger.info("准备开始组装参数"); String param = oerDjmlExtService.saveExpensePrePlugin(json); - logger.info("准备过滤fileInfo参数66666"); - //这里为了方便打印参数，排除掉参数里的fileInfoList ，这个字段比较大，打印日志会卡死 - String paramNew = new String(param); - OerDjmlEntity oerDjmlEntity = JSON.parseObject(paramNew, OerDjmlEntity.class); - if (null != oerDjmlEntity && CollectionUtils.isNotEmpty(oerDjmlEntity.getFileInfoList())){ - oerDjmlEntity.setFileInfoList(null); - } - logger.info("过滤fileInfo参数完成77777"); - logger.info("OA单据组装好准备保存GRP的参数:{}",JSONObject.toJSON(oerDjmlEntity)); + logger.info("OA单据组装好准备保存GRP的参数:{}",param); JSONObject paramJSON = new JSONObject(); paramJSON.put("jsonStr",param); JsonResultEntity resultEntity = (JsonResultEntity) oerDjmlService.handleOerDjml(paramJSON); diff --git a/base-buildpackage/src/test/java/com/hzya/frame/PluginTest.java b/base-buildpackage/src/test/java/com/hzya/frame/PluginTest.java index c18358d3..722de7ed 100644 --- a/base-buildpackage/src/test/java/com/hzya/frame/PluginTest.java +++ b/base-buildpackage/src/test/java/com/hzya/frame/PluginTest.java @@ -11,6 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; +import java.io.File; import java.util.List; /** @@ -47,9 +48,10 @@ public class PluginTest { @Test public void fileDownloadTest(){ - List fileInfoDTOList = oerDjmlExtServiceImpl.fileDownload("3304665242408406647", "8000400011"); + List fileInfoDTOList = oerDjmlExtServiceImpl.fileDownloadV1("3304665242408406647", "8000400011"); String djmlStr = JSONObject.toJSONString(fileInfoDTOList); System.out.println(djmlStr); + File file = new File(fileInfoDTOList.get(0).getZip_file_path()); System.out.println(fileInfoDTOList.size()); } } diff --git a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java index 59c9238d..80beaf8c 100644 --- a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java +++ b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java @@ -709,7 +709,7 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService { try (FileInputStream fos = new FileInputStream(file); BufferedInputStream bis = new BufferedInputStream(fos)) { logger.info("=====压缩文件====="); - zos.putNextEntry(new ZipEntry(fileUrl+fileName )); + zos.putNextEntry(new ZipEntry(fileName )); int len; byte[] buf = new byte[1024]; while ((len = bis.read(buf, 0, 1024)) != -1) {