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

beta功能缓存数据增加部分字段

Browse Source 
PHDFileUtil解析文件方法新增部分存储信息
beta功能删除接口修改，去掉多余参数
beta功能加载数据接口返回内容缺少文件名称字段增加
This commit is contained in:
qiaoqinzheng 2023-11-07 14:57:17 +08:00
parent 85ee7e609a
commit a7ef47a358
5 changed files with 79 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -151,6 +151,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
seriseData.setY(count);
gammaOriginalSeriseData.add(seriseData);
}
map.put("gammaOriginalData", gammaOriginalSeriseData);
//Gamma Spectrum Projected
List<Long> gammaProjectedData = new LinkedList<>();
@ -255,15 +256,23 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (type.equalsIgnoreCase("sample")) {
betaDataFile.setSampleSpectrumData(spectrumData);
betaDataFile.setSampleBoundary(boundaryList);
betaDataFile.setSampleHistogramDataList(histogramDataList);
betaDataFile.setSampleHistogramDataDList(histogramDataDList);
} else if (type.equalsIgnoreCase("gas")) {
betaDataFile.setGasSpectrumData(spectrumData);
betaDataFile.setGasBoundary(boundaryList);
betaDataFile.setGasHistogramDataList(histogramDataList);
betaDataFile.setGasHistogramDataDList(histogramDataDList);
} else if (type.equalsIgnoreCase("det")) {
betaDataFile.setDetSpectrumData(spectrumData);
betaDataFile.setDetBoundary(boundaryList);
betaDataFile.setDetHistogramDataList(histogramDataList);
betaDataFile.setDetHistogramDataDList(histogramDataDList);
} else if (type.equalsIgnoreCase("qc")) {
betaDataFile.setQcSpectrumData(spectrumData);
betaDataFile.setQcBoundary(boundaryList);
betaDataFile.setQcHistogramDataList(histogramDataList);
betaDataFile.setQcHistogramDataDList(histogramDataDList);
}
} catch (ParseException e) {
throw new RuntimeException(e);
@ -1326,10 +1335,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.s_b_fitting_c_e.size() > 0) {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(2)))));
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1338,10 +1347,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.s_b_fitting_e_c.size() > 0) {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(2)))));
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1356,10 +1365,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.s_g_fitting_c_e.size() > 0) {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(2)))));
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1368,10 +1377,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.s_g_fitting_e_c.size() > 0) {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(2)))));
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1426,10 +1435,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2)))));
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
@ -1439,10 +1448,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.d_b_fitting_e_c.size() > 0) {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2)))));
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1457,10 +1466,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2)))));
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1469,10 +1478,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2)))));
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1522,10 +1531,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2)))));
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1534,10 +1543,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2)))));
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1552,10 +1561,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2)))));
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());
@ -1564,10 +1573,10 @@ public class PHDFileUtil extends AbstractLogOrReport {
if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2)))));
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
} else {
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
}
//换行
out.append(System.lineSeparator());

4
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
View File

@ -57,8 +57,8 @@ public class SpectrumAnalysesController {
@DeleteMapping("deleteSpectrumCacheData")
@ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
public void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request) {
spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, qcFileName, request);
public void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request) {
spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request);
}
@GetMapping("viewComment")

28
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BetaDataFile.java
View File

@ -112,6 +112,30 @@ public class BetaDataFile implements Serializable {
private SpectrumData qcSpectrumData;
private List<String> betaFittingParaOld;
private List<String> betaFittingParaToUiOld;
private List<String> gammaFittingParaOld;
private List<String> gammaFittingParaToUiOld;
private List<HistogramData> sampleHistogramDataList;
private List<HistogramData> sampleHistogramDataDList;
private List<HistogramData> gasHistogramDataList;
private List<HistogramData> gasHistogramDataDList;
private List<HistogramData> detHistogramDataList;
private List<HistogramData> detHistogramDataDList;
private List<HistogramData> qcHistogramDataList;
private List<HistogramData> qcHistogramDataDList;
//存储分析结果信息
private List<GardsXeResults> xeDataList;
private List<GardsCalibrationSpectrum> gammaCalibrationSpectrumList;
@ -157,6 +181,10 @@ public class BetaDataFile implements Serializable {
gasSpectrumData = new SpectrumData();
detSpectrumData = new SpectrumData();
qcSpectrumData = new SpectrumData();
betaFittingParaOld = new LinkedList<>();
betaFittingParaToUiOld = new LinkedList<>();
gammaFittingParaOld = new LinkedList<>();
gammaFittingParaToUiOld = new LinkedList<>();
}
}

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
View File

@ -24,7 +24,7 @@ public interface ISpectrumAnalysisService {
Result getFileSpectrumChart(String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request);
void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request);
void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request);
Result viewComment(Integer sampleId, String sampleFileName, HttpServletRequest request);

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

@ -27,6 +27,7 @@ import org.jeecg.common.properties.SpectrumPathProperties;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.*;
import org.jeecg.modules.base.abstracts.AbstractLogOrReport;
import org.jeecg.modules.base.bizVo.BetaRLR;
import org.jeecg.modules.base.dto.ESStructDto;
import org.jeecg.modules.base.dto.ROIChannelsDto;
@ -68,7 +69,7 @@ import static org.jeecg.modules.base.enums.ExportTemplate.*;
@Service("spectrumAnalysisService")
@DS("ora")
public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements ISpectrumAnalysisService {
@Autowired
private SpectrumAnalysisMapper spectrumAnalysisMapper;
@ -398,6 +399,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(sampleTmp.getAbsolutePath());
betaDataFile.setSampleStruct(struct);
sampleMap = phdFileUtil.getSourceData(struct, sample.getSampleId(), sample.getStatus(), "sample", betaDataFile);
sampleMap.put("fileName", betaDataFile.getSampleFileName());
resultMap.put("sample",sampleMap);
}
}
@ -410,6 +412,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(gasTmp.getAbsolutePath());
betaDataFile.setGasStruct(struct);
gasBgMap = phdFileUtil.getSourceData(struct, gasBg.getSampleId(), gasBg.getStatus(), "gas", betaDataFile);
gasBgMap.put("fileName", betaDataFile.getGasFileName());
resultMap.put("gasBg",gasBgMap);
}
}
@ -422,6 +425,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(detTmp.getAbsolutePath());
betaDataFile.setDetStruct(struct);
detBgMap = phdFileUtil.getSourceData(struct, detBg.getSampleId(), detBg.getStatus(), "det", betaDataFile);
detBgMap.put("fileName", betaDataFile.getDetFileName());
resultMap.put("detBg",detBgMap);
}
}
@ -434,6 +438,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(qcTmp.getAbsolutePath());
betaDataFile.setQcStruct(struct);
qcMap = phdFileUtil.getSourceData(struct, qc.getSampleId(), qc.getStatus(), "qc", betaDataFile);
qcMap.put("fileName", betaDataFile.getQcFileName());
resultMap.put("qc",qcMap);
}
}
@ -535,6 +540,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
betaDataFile.setSampleFilePathName(sampleFilePath);
betaDataFile.setSampleFileName(sampleFileName);
sampleMap = phdFileUtil.getSourceData(struct, null, null, "sample", betaDataFile);
sampleMap.put("fileName", betaDataFile.getSampleFileName());
resultMap.put("sample", sampleMap);
}
}
@ -545,6 +551,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
betaDataFile.setGasFilePathName(gasBgFilePath);
betaDataFile.setGasFileName(gasFileName);
gasBgMap = phdFileUtil.getSourceData(struct, null, null, "gas", betaDataFile);
gasBgMap.put("fileName", betaDataFile.getGasFileName());
resultMap.put("gasBg", gasBgMap);
}
}
@ -555,6 +562,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
betaDataFile.setDetFilePathName(detBgFilePath);
betaDataFile.setDetFileName(detFileName);
detBgMap = phdFileUtil.getSourceData(struct, null, null, "det", betaDataFile);
detBgMap.put("fileName", betaDataFile.getDetFileName());
resultMap.put("detBg", detBgMap);
}
}
@ -565,6 +573,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
betaDataFile.setQcFilePathName(dbQcFilePath);
betaDataFile.setQcFileName(qcFileName);
qcMap = phdFileUtil.getSourceData(struct, null, null, "qc", betaDataFile);
qcMap.put("fileName", betaDataFile.getQcFileName());
resultMap.put("qc", qcMap);
}
}
@ -653,7 +662,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
}
@Override
public void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request) {
public void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request) {
String userName = JwtUtil.getUserNameByToken(request);
String betaKey = sampleFileName + "-" + userName;
betaCache.deleteBetaCache(betaKey);
@ -1617,6 +1626,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
betaDataFile.setGammaList(oldScatterSeries);
betaDataFile.setGammaFittingPara(fittingParaStr);
betaDataFile.setGammaFittingParaToUi(fittingParaToUiStr);
betaDataFile.setGammaFittingParaOld(fittingParaStr);
betaDataFile.setGammaFittingParaToUiOld(fittingParaToUiStr);
}
result.setSuccess(true);
result.setResult(map);
@ -1723,6 +1734,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
betaDataFile.setBetaList(oldScatterSeries);
betaDataFile.setBetaFittingPara(fittingParaStr);
betaDataFile.setBetaFittingParaToUi(fittingParaToUiStr);
betaDataFile.setBetaFittingParaOld(fittingParaStr);
betaDataFile.setBetaFittingParaToUiOld(fittingParaToUiStr);
}
result.setSuccess(true);
result.setResult(map);