From b09bb44a0ac05cb8e6057a36d8798722961cffd2 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 20 Oct 2023 08:54:08 +0800 Subject: [PATCH] =?UTF-8?q?FileFtransitUtil=E5=8E=BB=E6=8E=89=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=9A=84=E9=9D=99=E6=80=81=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/service/impl/GammaServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 8c61626c..07223d3b 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -83,6 +83,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi @Autowired private GammaFileUtil gammaFileUtil; @Autowired + private FileFtransitUtil fileFtransitUtil; + @Autowired private DBUtil dbUtil; @Autowired private UserTaskUtil userTaskUtil; @@ -4498,14 +4500,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi imsFile = File.createTempFile("betaGamma", null); inputStream = file.getInputStream(); FileUtils.copyInputStreamToFile(inputStream, imsFile); - if(!FileFtransitUtil.ReadIMS(imsFile, datas)) { + if(!fileFtransitUtil.ReadIMS(imsFile, datas)) { String Warning = "Read "+ImsName+" failed!\n"+ "Possible Reason:\n"+ "1、The file is unreadable;\n"+ "2、The format of file is error."; return; } - String iecValue = FileFtransitUtil.WriteIEC(datas); + String iecValue = fileFtransitUtil.WriteIEC(datas); //设置响应类型 response.setContentType("application/octet-stream"); //解决中文不能生成文件 @@ -4543,14 +4545,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi iecFile = File.createTempFile("betaGamma", null); inputStream = file.getInputStream(); FileUtils.copyInputStreamToFile(inputStream, iecFile); - if(!FileFtransitUtil.ReadIEC(iecFile, datas)) { + if(!fileFtransitUtil.ReadIEC(iecFile, datas)) { String Warning = "Read "+IecName+" failed!\n"+ "Possible Reason:\n"+ "1、The file is unreadable;\n"+ "2、The format of file is error."; return; } - String imsValue = FileFtransitUtil.WriteIMS(datas); + String imsValue = fileFtransitUtil.WriteIMS(datas); //设置响应类型 response.setContentType("application/octet-stream"); //解决中文不能生成文件