xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FileFtransitUtil去掉方法的静态关键字

Browse Source
This commit is contained in:
qiaoqinzheng 2023-10-20 08:54:08 +08:00
parent c5f4b20183
commit b09bb44a0a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
View File

@ -83,6 +83,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
@Autowired @Autowired
private GammaFileUtil gammaFileUtil; private GammaFileUtil gammaFileUtil;
@Autowired @Autowired
private FileFtransitUtil fileFtransitUtil;
@Autowired
private DBUtil dbUtil; private DBUtil dbUtil;
@Autowired @Autowired
private UserTaskUtil userTaskUtil; private UserTaskUtil userTaskUtil;
@ -4498,14 +4500,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
imsFile = File.createTempFile("betaGamma", null); imsFile = File.createTempFile("betaGamma", null);
inputStream = file.getInputStream(); inputStream = file.getInputStream();
FileUtils.copyInputStreamToFile(inputStream, imsFile); FileUtils.copyInputStreamToFile(inputStream, imsFile);
if(!FileFtransitUtil.ReadIMS(imsFile, datas)) { if(!fileFtransitUtil.ReadIMS(imsFile, datas)) {
String Warning = "Read "+ImsName+" failed!\n"+ String Warning = "Read "+ImsName+" failed!\n"+
"Possible Reason:\n"+ "Possible Reason:\n"+
"1、The file is unreadable;\n"+ "1、The file is unreadable;\n"+
"2、The format of file is error."; "2、The format of file is error.";
return; return;
} }
String iecValue = FileFtransitUtil.WriteIEC(datas); String iecValue = fileFtransitUtil.WriteIEC(datas);
//设置响应类型 //设置响应类型
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
//解决中文不能生成文件 //解决中文不能生成文件
@ -4543,14 +4545,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
iecFile = File.createTempFile("betaGamma", null); iecFile = File.createTempFile("betaGamma", null);
inputStream = file.getInputStream(); inputStream = file.getInputStream();
FileUtils.copyInputStreamToFile(inputStream, iecFile); FileUtils.copyInputStreamToFile(inputStream, iecFile);
if(!FileFtransitUtil.ReadIEC(iecFile, datas)) { if(!fileFtransitUtil.ReadIEC(iecFile, datas)) {
String Warning = "Read "+IecName+" failed!\n"+ String Warning = "Read "+IecName+" failed!\n"+
"Possible Reason:\n"+ "Possible Reason:\n"+
"1、The file is unreadable;\n"+ "1、The file is unreadable;\n"+
"2、The format of file is error."; "2、The format of file is error.";
return; return;
} }
String imsValue = FileFtransitUtil.WriteIMS(datas); String imsValue = fileFtransitUtil.WriteIMS(datas);
//设置响应类型 //设置响应类型
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
//解决中文不能生成文件 //解决中文不能生成文件