存储GARDS_ROI_RESULTS表数据
This commit is contained in:
parent
7f85af2360
commit
238444ff05
|
|
@ -38,10 +38,7 @@ import org.jeecg.modules.exception.CAnalyseException;
|
||||||
import org.jeecg.modules.exception.FileNotExistException;
|
import org.jeecg.modules.exception.FileNotExistException;
|
||||||
import org.jeecg.modules.file.FileOperation;
|
import org.jeecg.modules.file.FileOperation;
|
||||||
import org.jeecg.modules.native_jni.EnergySpectrumHandler;
|
import org.jeecg.modules.native_jni.EnergySpectrumHandler;
|
||||||
import org.jeecg.modules.native_jni.struct.BgBoundary;
|
import org.jeecg.modules.native_jni.struct.*;
|
||||||
import org.jeecg.modules.native_jni.struct.CalcBgBoundaryParam;
|
|
||||||
import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
|
|
||||||
import org.jeecg.modules.native_jni.struct.SelfBgAnalyseResult;
|
|
||||||
import org.jeecgframework.core.util.ApplicationContextUtil;
|
import org.jeecgframework.core.util.ApplicationContextUtil;
|
||||||
import org.springframework.dao.DuplicateKeyException;
|
import org.springframework.dao.DuplicateKeyException;
|
||||||
import org.springframework.transaction.TransactionStatus;
|
import org.springframework.transaction.TransactionStatus;
|
||||||
|
|
@ -606,6 +603,10 @@ public class Sample_C_Analysis {
|
||||||
saveGardsCalibration(sampleId, idAnalysis);
|
saveGardsCalibration(sampleId, idAnalysis);
|
||||||
/* gards_Xe_results数据表XE_131m、XE_133、XE_133m、XE_135数据 */
|
/* gards_Xe_results数据表XE_131m、XE_133、XE_133m、XE_135数据 */
|
||||||
saveXeResult(sampleId, idAnalysis);
|
saveXeResult(sampleId, idAnalysis);
|
||||||
|
/**GARDS_ROI_RESULTS**/
|
||||||
|
saveRoiResults(sampleId, idAnalysis);
|
||||||
|
|
||||||
|
|
||||||
//提交事务
|
//提交事务
|
||||||
serviceQuotes.getTransactionManager().commit(transactionStatus);
|
serviceQuotes.getTransactionManager().commit(transactionStatus);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
@ -619,6 +620,11 @@ public class Sample_C_Analysis {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void saveRoiResults(Integer sampleId, Integer idAnalysis) {
|
||||||
|
List<GardsROIResultsSpectrum> roiResult = SelfBaseUtil.getRoiResult(this.analyseResult.getXeResults());
|
||||||
|
serviceQuotes.getRoiResultsService().create(roiResult, sampleId, idAnalysis);
|
||||||
|
}
|
||||||
|
|
||||||
private void writeLog(GStoreMiddleProcessData... middleDatas) {
|
private void writeLog(GStoreMiddleProcessData... middleDatas) {
|
||||||
for (GStoreMiddleProcessData middleData : middleDatas) {
|
for (GStoreMiddleProcessData middleData : middleDatas) {
|
||||||
writeLog(middleData.getAnalyses_LogPath(), middleData);
|
writeLog(middleData.getAnalyses_LogPath(), middleData);
|
||||||
|
|
@ -641,6 +647,7 @@ public class Sample_C_Analysis {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成日志文件
|
* 生成日志文件
|
||||||
|
*
|
||||||
* @param logFilePath
|
* @param logFilePath
|
||||||
* @param middleData
|
* @param middleData
|
||||||
*/
|
*/
|
||||||
|
|
@ -805,10 +812,8 @@ public class Sample_C_Analysis {
|
||||||
infoMap = new LinkedHashMap<>();
|
infoMap = new LinkedHashMap<>();
|
||||||
int idPeakSize = middleData.peaks_idPeak.size();
|
int idPeakSize = middleData.peaks_idPeak.size();
|
||||||
double peaksUsed = 0;
|
double peaksUsed = 0;
|
||||||
for(int m=0;m<middleData.peaks_Nuclide_name.size();m++)
|
for (int m = 0; m < middleData.peaks_Nuclide_name.size(); m++) {
|
||||||
{
|
if (!middleData.peaks_Nuclide_name.get(m).isEmpty()) {
|
||||||
if(!middleData.peaks_Nuclide_name.get(m).isEmpty())
|
|
||||||
{
|
|
||||||
peaksUsed++;
|
peaksUsed++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -850,12 +855,10 @@ public class Sample_C_Analysis {
|
||||||
// Nuclide Identified.....
|
// Nuclide Identified.....
|
||||||
writes.add(MyLogFormatUtil.getHeaderFormat(MyLogFormatUtil.GGetPeakSearchResult));
|
writes.add(MyLogFormatUtil.getHeaderFormat(MyLogFormatUtil.GGetPeakSearchResult));
|
||||||
StringBuilder qsNuclidesName = new StringBuilder();
|
StringBuilder qsNuclidesName = new StringBuilder();
|
||||||
for(int m = 0; m < middleData.nucl_ided_Nuclidename.size() -1; m++)
|
for (int m = 0; m < middleData.nucl_ided_Nuclidename.size() - 1; m++) {
|
||||||
{
|
|
||||||
qsNuclidesName.append(middleData.nucl_ided_Nuclidename.get(m)).append(",");
|
qsNuclidesName.append(middleData.nucl_ided_Nuclidename.get(m)).append(",");
|
||||||
}
|
}
|
||||||
if(middleData.nucl_ided_Nuclidename.size() > 1)
|
if (middleData.nucl_ided_Nuclidename.size() > 1) {
|
||||||
{
|
|
||||||
qsNuclidesName.append(middleData.nucl_ided_Nuclidename.get(middleData.nucl_ided_Nuclidename.size() - 1));
|
qsNuclidesName.append(middleData.nucl_ided_Nuclidename.get(middleData.nucl_ided_Nuclidename.size() - 1));
|
||||||
}
|
}
|
||||||
infoMap = new LinkedHashMap<>();
|
infoMap = new LinkedHashMap<>();
|
||||||
|
|
@ -1027,8 +1030,10 @@ public class Sample_C_Analysis {
|
||||||
}
|
}
|
||||||
// GARDS_CALIBRATION_PAIRS 汇总保存
|
// GARDS_CALIBRATION_PAIRS 汇总保存
|
||||||
List<GardsCalibrationPairs> allPairs = new ArrayList<>();
|
List<GardsCalibrationPairs> allPairs = new ArrayList<>();
|
||||||
allPairs.addAll(pairsE);allPairs.addAll(pairsEF);
|
allPairs.addAll(pairsE);
|
||||||
allPairs.addAll(pairsR);allPairs.addAll(pairsT);
|
allPairs.addAll(pairsEF);
|
||||||
|
allPairs.addAll(pairsR);
|
||||||
|
allPairs.addAll(pairsT);
|
||||||
return allPairs;
|
return allPairs;
|
||||||
}
|
}
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user