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

fix：exportSampleInformation

Browse Source
This commit is contained in:
nieziyan 2023-11-08 15:24:09 +08:00
parent b89295f1e1
commit 8cf1294ffe
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1315,17 +1315,17 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
@Override @Override
public void exportSampleInformation(Integer sampleId, String sampleFileName, HttpServletRequest request, HttpServletResponse response) { public void exportSampleInformation(Integer sampleId, String sampleFileName,
Result<StringBuffer> result = viewSampleInformation(sampleId, sampleFileName, request); HttpServletRequest request, HttpServletResponse response) {
StringBuffer buffer = result.getResult(); Result<String> result = viewSampleInformation(sampleId, sampleFileName, request);
if (ObjectUtil.isNull(buffer)) return; String sampleInfo = result.getResult();
String sampleInfo = buffer.toString(); if (StrUtil.isBlank(sampleInfo)) return;
String colon = SymbolConstant.COLON; String colon = SymbolConstant.COLON;
String space = SymbolConstant.SPACE; String space = SymbolConstant.SPACE;
String line = SymbolConstant.LINE; String line = SymbolConstant.LINE;
List<String> sampleInfos = ListUtil.toList(sampleInfo.split(line)).stream() List<String> sampleInfos = ListUtil.toList(sampleInfo.split(line)).stream()
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)
.filter(item -> StrUtil.contains(item,colon)) .filter(item -> StrUtil.contains(item, colon))
.collect(Collectors.toList()); .collect(Collectors.toList());
Map<String,Object> dataMap = new HashMap<>(); Map<String,Object> dataMap = new HashMap<>();
for (String s : sampleInfos) { for (String s : sampleInfos) {
@ -3954,7 +3954,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
export = StrUtil.replace(sampleFileName, ".PHD", ".xls"); export = StrUtil.replace(sampleFileName, ".PHD", ".xls");
} }
String template = SAVETOEXCEL.getName(); String template = SAVETOEXCEL.getName();
ExportUtil.exportXls(response, template, analyze,export); ExportUtil.exportXls(response, template, analyze, export);
} }
@Override @Override