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

存储GARDS_ROI_RESULTS表数据

Browse Source
This commit is contained in:
duwenyuan 2025-12-17 12:56:54 +08:00
parent 7f85af2360
commit 238444ff05
1 changed files with 1194 additions and 1189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

357
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_C_Analysis.java
View File

@ -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;
@ -73,7 +70,7 @@ public class Sample_C_Analysis {
private static final String ARR_FILE_SUFFIX = ".txt"; private static final String ARR_FILE_SUFFIX = ".txt";
private static final String ARR_FILE_NAME_TAIL = "_rpt"; private static final String ARR_FILE_NAME_TAIL = "_rpt";
private final Map<String,String> fieldMap = fieldMap(); private final Map<String, String> fieldMap = fieldMap();
private AbstractS_D_Q_G_SpectrumHandler spectrumHandler; private AbstractS_D_Q_G_SpectrumHandler spectrumHandler;
@ -174,11 +171,11 @@ public class Sample_C_Analysis {
this.parsingProcessLog = spectrumHandler.parsingProcessLog; this.parsingProcessLog = spectrumHandler.parsingProcessLog;
this.sampleInputFilename = sampleData.getInputFileName(); this.sampleInputFilename = sampleData.getInputFileName();
this.sampleFilename = StringUtils.substring(sampleData.getInputFileName(), this.sampleFilename = StringUtils.substring(sampleData.getInputFileName(),
sampleData.getInputFileName().lastIndexOf((StringConstant.SLASH))+1); sampleData.getInputFileName().lastIndexOf((StringConstant.SLASH)) + 1);
this.spectrumFileRelativePath = spectrumHandler.getFileSaveRelativePath(); this.spectrumFileRelativePath = spectrumHandler.getFileSaveRelativePath();
} }
public void analysis() throws CAnalyseException, AnalySpectrumException{ public void analysis() throws CAnalyseException, AnalySpectrumException {
log.info("SelfStaion自动处理分析--Start"); log.info("SelfStaion自动处理分析--Start");
try { try {
this.startAnalysisTime = new Date(); this.startAnalysisTime = new Date();
@ -243,14 +240,14 @@ public class Sample_C_Analysis {
this.analyseResult.setS_b_fitting_e_c(s_b_fitting_e_c); this.analyseResult.setS_b_fitting_e_c(s_b_fitting_e_c);
List<Double> channel = new LinkedList<>(); List<Double> channel = new LinkedList<>();
for (int i = 0; i < numBChannel - 1 ; ++i) { for (int i = 0; i < numBChannel - 1; ++i) {
channel.add(Double.valueOf(i)); channel.add(Double.valueOf(i));
} }
List<Double> energy = EnergySpectrumHandler.GetFileFittingData(channel, fittingPara); List<Double> energy = EnergySpectrumHandler.GetFileFittingData(channel, fittingPara);
//E to C //E to C
List<Double> fittingParaToUi = EnergySpectrumHandler.GetFileFittingPara(energy, channel); List<Double> fittingParaToUi = EnergySpectrumHandler.GetFileFittingPara(energy, channel);
List<Double> s_g_fitting_e_c = new LinkedList<>(); List<Double> s_g_fitting_e_c = new LinkedList<>();
for (Double para:fittingParaToUi) { for (Double para : fittingParaToUi) {
s_g_fitting_e_c.add(para); s_g_fitting_e_c.add(para);
} }
analyseResult.setS_g_fitting_e_c(s_g_fitting_e_c); analyseResult.setS_g_fitting_e_c(s_g_fitting_e_c);
@ -276,8 +273,8 @@ public class Sample_C_Analysis {
finalReportPath.append(this.spectrumFileRelativePath); finalReportPath.append(this.spectrumFileRelativePath);
// finalReportPath.append(arrFilePath); // finalReportPath.append(arrFilePath);
finalReportPath.append(File.separator); finalReportPath.append(File.separator);
String arrFileTail = ARR_FILE_NAME_TAIL+ARR_FILE_SUFFIX; String arrFileTail = ARR_FILE_NAME_TAIL + ARR_FILE_SUFFIX;
finalReportPath.append(this.sampleFilename.replace(DataType.SAMPLEPHD.getSuffix(),arrFileTail)); finalReportPath.append(this.sampleFilename.replace(DataType.SAMPLEPHD.getSuffix(), arrFileTail));
// gamma数据插入数据库 // gamma数据插入数据库
this.storageDataToDatabase(mdcInfoMap, finalReportPath.toString(), null, this.storageDataToDatabase(mdcInfoMap, finalReportPath.toString(), null,
@ -298,15 +295,15 @@ public class Sample_C_Analysis {
ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), phdFile1.getAnalyMessage(), this.sampleFilename)); ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), phdFile1.getAnalyMessage(), this.sampleFilename));
throw new AnalySpectrumException(phdFile1.getAnalyMessage()); throw new AnalySpectrumException(phdFile1.getAnalyMessage());
} }
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("Sample_C_Analysis", e); log.error("Sample_C_Analysis", e);
if (e instanceof DuplicateKeyException) { if (e instanceof DuplicateKeyException) {
throw new CAnalyseException("Sample Analyse Error at "+DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"), true); throw new CAnalyseException("Sample Analyse Error at " + DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"), true);
} else if (e instanceof AnalySpectrumException) { } else if (e instanceof AnalySpectrumException) {
throw new AnalySpectrumException(e.getMessage()); throw new AnalySpectrumException(e.getMessage());
} else { } else {
throw new CAnalyseException("Sample Analyse Error at "+DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss")); throw new CAnalyseException("Sample Analyse Error at " + DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
} }
} }
log.info("SelfStaion自动处理分析--End"); log.info("SelfStaion自动处理分析--End");
@ -315,7 +312,7 @@ public class Sample_C_Analysis {
/* /*
* 根据自建台站样品谱生成4个Gamma谱 * 根据自建台站样品谱生成4个Gamma谱
* */ * */
public void create4PHD(){ public void create4PHD() {
// 计算边界值 // 计算边界值
List<Double> gEnergy = sampleStruct.g_energy; List<Double> gEnergy = sampleStruct.g_energy;
List<Double> gCentroidChannel = sampleStruct.g_centroid_channel; List<Double> gCentroidChannel = sampleStruct.g_centroid_channel;
@ -395,7 +392,7 @@ public class Sample_C_Analysis {
phdFile4.setXmlFilePath(parameterProperties.getFilePath()); phdFile4.setXmlFilePath(parameterProperties.getFilePath());
} }
public String savePath(){ public String savePath() {
//measurement_id切割后的字符数组 //measurement_id切割后的字符数组
String[] arr = this.sampleStruct.measurement_id.split(StringConstant.DASH); String[] arr = this.sampleStruct.measurement_id.split(StringConstant.DASH);
//切割后第一个，元素是年，第二个是月 //切割后第一个，元素是年，第二个是月
@ -415,7 +412,7 @@ public class Sample_C_Analysis {
/* /*
* 获取savefile全路径 不包含文件名 * 获取savefile全路径 不包含文件名
* */ * */
public String saveFullPath(){ public String saveFullPath() {
spectrumPathProperties = SpringContextUtils.getBean(SpectrumPathProperties.class); spectrumPathProperties = SpringContextUtils.getBean(SpectrumPathProperties.class);
String rootPath = spectrumPathProperties.getRootPath(); String rootPath = spectrumPathProperties.getRootPath();
String saveFilePath = spectrumPathProperties.getSaveFilePath(); String saveFilePath = spectrumPathProperties.getSaveFilePath();
@ -431,11 +428,11 @@ public class Sample_C_Analysis {
this.detSampleData = serviceQuotes.getSampleDataService().getSampleIdAndInputFileName(detectorBkMeasurementId, DataTypeAbbr.DETBKPHD.getType(), this.sampleStruct.system_type); this.detSampleData = serviceQuotes.getSampleDataService().getSampleIdAndInputFileName(detectorBkMeasurementId, DataTypeAbbr.DETBKPHD.getType(), this.sampleStruct.system_type);
//如果找不到sample、det谱文件数据则解析失败修改记录状态 //如果找不到sample、det谱文件数据则解析失败修改记录状态
if(StringUtils.isEmpty(this.sampleData.getInputFileName()) || Objects.isNull(this.detSampleData) || StringUtils.isEmpty(this.detSampleData.getInputFileName())){ if (StringUtils.isEmpty(this.sampleData.getInputFileName()) || Objects.isNull(this.detSampleData) || StringUtils.isEmpty(this.detSampleData.getInputFileName())) {
parsingProcessLog.setFileNotExist(true); parsingProcessLog.setFileNotExist(true);
this.serviceQuotes.getSampleDataService().updateStatus(SampleStatus.FAIL.getValue(),this.sampleData.getInputFileName()); this.serviceQuotes.getSampleDataService().updateStatus(SampleStatus.FAIL.getValue(), this.sampleData.getInputFileName());
ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), ErrorType.GAS_OR_DET_ERROR,this.sampleFilename)); ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), ErrorType.GAS_OR_DET_ERROR, this.sampleFilename));
throw new FileNotExistException("gas or det file is no exist or is error.."); throw new FileNotExistException("gas or det file is no exist or is error..");
} }
} }
@ -453,13 +450,13 @@ public class Sample_C_Analysis {
detFileFinalPath.append(detSampleData.getInputFileName()); detFileFinalPath.append(detSampleData.getInputFileName());
this.detFileFinalPath = detFileFinalPath.toString(); this.detFileFinalPath = detFileFinalPath.toString();
File detFile = new File(this.detFileFinalPath); File detFile = new File(this.detFileFinalPath);
if(!detFile.exists()){ if (!detFile.exists()) {
flag = true; flag = true;
} }
if(flag){ if (flag) {
parsingProcessLog.setFileNotExist(true); parsingProcessLog.setFileNotExist(true);
ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), ErrorType.GAS_OR_DET_ERROR,this.sampleFilename)); ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), ErrorType.GAS_OR_DET_ERROR, this.sampleFilename));
throw new FileNotExistException("gas or det file is no exist or is error.."); throw new FileNotExistException("gas or det file is no exist or is error..");
} }
// this.detStruct = EnergySpectrumHandler.getSourceData(this.detFileFinalPath); // this.detStruct = EnergySpectrumHandler.getSourceData(this.detFileFinalPath);
@ -475,7 +472,7 @@ public class Sample_C_Analysis {
if (ArrayUtil.isEmpty(phdFiles)) return mdcInfoMap; if (ArrayUtil.isEmpty(phdFiles)) return mdcInfoMap;
String systemType = phdFiles[0].getHeader().getSystem_type(); String systemType = phdFiles[0].getHeader().getSystem_type();
//配置文件路径 //配置文件路径
String filePath = parameterProperties.getFilePath()+ File.separator + "MDCParameter.xml"; String filePath = parameterProperties.getFilePath() + File.separator + "MDCParameter.xml";
try { try {
//创建一个文档解析器工厂 //创建一个文档解析器工厂
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@ -483,7 +480,7 @@ public class Sample_C_Analysis {
DocumentBuilder documentBuilder = factory.newDocumentBuilder(); DocumentBuilder documentBuilder = factory.newDocumentBuilder();
//读取xml文件生成一个文档 //读取xml文件生成一个文档
Document document = documentBuilder.parse(filePath); Document document = documentBuilder.parse(filePath);
if (Objects.nonNull(document)){ if (Objects.nonNull(document)) {
//获取文档的根元素 //获取文档的根元素
Element element = document.getDocumentElement(); Element element = document.getDocumentElement();
//获取根元素的子节点 //获取根元素的子节点
@ -491,14 +488,14 @@ public class Sample_C_Analysis {
//判断文件内的节点是否大于0 //判断文件内的节点是否大于0
if (Objects.nonNull(docChildNodes) && docChildNodes.getLength() > 0) { if (Objects.nonNull(docChildNodes) && docChildNodes.getLength() > 0) {
//遍历文件节点读取内容 //遍历文件节点读取内容
for (int i=0; i<docChildNodes.getLength(); i++) { for (int i = 0; i < docChildNodes.getLength(); i++) {
//获取节点信息 //获取节点信息
Node node = docChildNodes.item(i); Node node = docChildNodes.item(i);
if (node.getNodeName().equalsIgnoreCase(systemType)) { if (node.getNodeName().equalsIgnoreCase(systemType)) {
NodeList childNodes = node.getChildNodes(); NodeList childNodes = node.getChildNodes();
if (Objects.nonNull(childNodes) && childNodes.getLength() > 0) { if (Objects.nonNull(childNodes) && childNodes.getLength() > 0) {
//遍历子节点信息 //遍历子节点信息
for (int j=0; j< childNodes.getLength(); j++) { for (int j = 0; j < childNodes.getLength(); j++) {
//获取子节点信息 //获取子节点信息
Node childNode = childNodes.item(j); Node childNode = childNodes.item(j);
//判断节点名称是否是item //判断节点名称是否是item
@ -509,7 +506,7 @@ public class Sample_C_Analysis {
if (Objects.nonNull(attributes)) { if (Objects.nonNull(attributes)) {
CalMDCInfo info = new CalMDCInfo(); CalMDCInfo info = new CalMDCInfo();
//遍历属性信息 //遍历属性信息
for (int k=0; k<attributes.getLength(); k++) { for (int k = 0; k < attributes.getLength(); k++) {
//根据顺序读取属性 //根据顺序读取属性
Node attribute = attributes.item(k); Node attribute = attributes.item(k);
if (attribute.getNodeName().equalsIgnoreCase("nuclide_name")) { if (attribute.getNodeName().equalsIgnoreCase("nuclide_name")) {
@ -543,12 +540,12 @@ public class Sample_C_Analysis {
/** /**
* 分析成功数据发送到Redis * 分析成功数据发送到Redis
*/ */
private void pushToRedis(GStoreMiddleProcessData middleData){ private void pushToRedis(GStoreMiddleProcessData middleData) {
try { try {
Info info = new Info(); Info info = new Info();
info.setStationId(this.sampleData.getStationId().toString()); info.setStationId(this.sampleData.getStationId().toString());
info.setSampleId(middleData.sample_id); info.setSampleId(middleData.sample_id);
info.setSampleName(middleData.analyses_save_filePath.substring(middleData.analyses_save_filePath.lastIndexOf(StringPool.SLASH)+1)); info.setSampleName(middleData.analyses_save_filePath.substring(middleData.analyses_save_filePath.lastIndexOf(StringPool.SLASH) + 1));
final Instant instant = DateUtils.parseDate(middleData.sample_collection_start).toInstant(); final Instant instant = DateUtils.parseDate(middleData.sample_collection_start).toInstant();
final LocalDateTime collectTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime(); final LocalDateTime collectTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
info.setCollectionDate(collectTime); info.setCollectionDate(collectTime);
@ -556,8 +553,8 @@ public class Sample_C_Analysis {
info.setFullOrPrel(this.sampleData.getSpectralQualifie()); info.setFullOrPrel(this.sampleData.getSpectralQualifie());
// todo 需要更换为自建台站类型 // todo 需要更换为自建台站类型
info.setBetaOrGamma(SampleType.GAMMA.getType()); info.setBetaOrGamma(SampleType.GAMMA.getType());
Map<String,String> nuclides = Maps.newHashMap(); Map<String, String> nuclides = Maps.newHashMap();
for (int i=0; i<middleData.nucl_ided_Nuclidename.size(); i++) { for (int i = 0; i < middleData.nucl_ided_Nuclidename.size(); i++) {
nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i)); nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i));
} }
info.setNuclides(nuclides); info.setNuclides(nuclides);
@ -569,10 +566,10 @@ public class Sample_C_Analysis {
} }
public void storageDataToDatabase(Map<String, CalMDCInfo> mdcInfoMap, String reportPath, String logFilePath, public void storageDataToDatabase(Map<String, CalMDCInfo> mdcInfoMap, String reportPath, String logFilePath,
GStoreMiddleProcessData... middleDatas){ GStoreMiddleProcessData... middleDatas) {
// 如果数据已经存储 不再重复存储 // 如果数据已经存储 不再重复存储
Integer idAnalysis = serviceQuotes.getAnalysesService().getIdAnalysis(this.sampleData.getSampleId()); Integer idAnalysis = serviceQuotes.getAnalysesService().getIdAnalysis(this.sampleData.getSampleId());
if(ObjectUtil.isNotNull(idAnalysis)) return; if (ObjectUtil.isNotNull(idAnalysis)) return;
DataSourceSwitcher.switchToOracle(); DataSourceSwitcher.switchToOracle();
final TransactionStatus transactionStatus = serviceQuotes.getTransactionManager().getTransaction(serviceQuotes.getTransactionDefinition()); final TransactionStatus transactionStatus = serviceQuotes.getTransactionManager().getTransaction(serviceQuotes.getTransactionDefinition());
try { try {
@ -600,12 +597,16 @@ public class Sample_C_Analysis {
/* Gards_Qc_Check_ROI 数据表保存 */ /* Gards_Qc_Check_ROI 数据表保存 */
// saveQcCheckROI(sampleId, qcItems); // saveQcCheckROI(sampleId, qcItems);
/* GARDS_MDC_ROI 数据表保存 */ /* GARDS_MDC_ROI 数据表保存 */
saveMDCROI(sampleId, idAnalysis,mdcInfoMap); saveMDCROI(sampleId, idAnalysis, mdcInfoMap);
/* 存储gards_calibration表数据sample谱B_Energy和G_Energy块数据 */ /* 存储gards_calibration表数据sample谱B_Energy和G_Energy块数据 */
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
*/ */
@ -663,7 +670,7 @@ public class Sample_C_Analysis {
AttributeItemVo item = null; AttributeItemVo item = null;
item = new AttributeItemVo("Channel", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_E_xValue(), 3)); item = new AttributeItemVo("Channel", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_E_xValue(), 3));
data.add(item); data.add(item);
item = new AttributeItemVo("Energy", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_E_yValue(),3)); item = new AttributeItemVo("Energy", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_E_yValue(), 3));
data.add(item); data.add(item);
item = new AttributeItemVo("Error", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_E_uncYValue(), 3)); item = new AttributeItemVo("Error", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_E_uncYValue(), 3));
data.add(item); data.add(item);
@ -685,9 +692,9 @@ public class Sample_C_Analysis {
data.clear(); data.clear();
item = new AttributeItemVo("Channel", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_R_xValue(), 3)); item = new AttributeItemVo("Channel", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_R_xValue(), 3));
data.add(item); data.add(item);
item = new AttributeItemVo("Energy", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_R_yValue(),3)); item = new AttributeItemVo("Energy", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_R_yValue(), 3));
data.add(item); data.add(item);
item = new AttributeItemVo("Error", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_R_uncYValue(),3)); item = new AttributeItemVo("Error", MyLogFormatUtil.getValuePoint(middleData.getCalibration_pairs_S_R_uncYValue(), 3));
data.add(item); data.add(item);
writes.addAll(MyLogFormatUtil.getBlockContext(data)); writes.addAll(MyLogFormatUtil.getBlockContext(data));
@ -722,7 +729,7 @@ public class Sample_C_Analysis {
writes.add(MyLogFormatUtil.getTitleFormat(MyLogFormatUtil.GTitleCalibration)); writes.add(MyLogFormatUtil.getTitleFormat(MyLogFormatUtil.GTitleCalibration));
// Energy Calibration [%1 ] // Energy Calibration [%1 ]
if(middleData.calibration_pairs_E_idCalPoint.size()>0) { if (middleData.calibration_pairs_E_idCalPoint.size() > 0) {
infoMap = new LinkedHashMap<>(); infoMap = new LinkedHashMap<>();
infoMap.put("Energy Calibration [%1 ]".replace("%1", middleData.calibration_pairs_R_Input), ""); infoMap.put("Energy Calibration [%1 ]".replace("%1", middleData.calibration_pairs_R_Input), "");
infoMap.put("Function", middleData.calibration_E_functionTypeDef); infoMap.put("Function", middleData.calibration_E_functionTypeDef);
@ -734,9 +741,9 @@ public class Sample_C_Analysis {
} }
// Resolution Calibration [%1 ] // Resolution Calibration [%1 ]
if(middleData.calibration_pairs_R_idCalPoint.size()>0) { if (middleData.calibration_pairs_R_idCalPoint.size() > 0) {
infoMap = new LinkedHashMap<>(); infoMap = new LinkedHashMap<>();
infoMap.put("Resolution Calibration [%1 ]".replace("%1", middleData.calibration_pairs_R_Input) , ""); infoMap.put("Resolution Calibration [%1 ]".replace("%1", middleData.calibration_pairs_R_Input), "");
infoMap.put("Function", middleData.calibration_R_functionTypeDef); infoMap.put("Function", middleData.calibration_R_functionTypeDef);
infoMap.put("E", middleData.calibration_R_functionDef); infoMap.put("E", middleData.calibration_R_functionDef);
infoMap.put("P", middleData.calibration_R_coeff_string); infoMap.put("P", middleData.calibration_R_coeff_string);
@ -746,7 +753,7 @@ public class Sample_C_Analysis {
} }
// Efficiency Calibration [PHD ] // Efficiency Calibration [PHD ]
if(middleData.calibration_pairs_EF_idCalPoint.size()>0) { if (middleData.calibration_pairs_EF_idCalPoint.size() > 0) {
infoMap = new LinkedHashMap<>(); infoMap = new LinkedHashMap<>();
infoMap.put("Efficiency Calibration [%1 ]".replace("%1", middleData.calibration_pairs_EF_Input), ""); infoMap.put("Efficiency Calibration [%1 ]".replace("%1", middleData.calibration_pairs_EF_Input), "");
infoMap.put("Function", middleData.calibration_pairs_EF_Input); infoMap.put("Function", middleData.calibration_pairs_EF_Input);
@ -757,7 +764,7 @@ public class Sample_C_Analysis {
writes.addAll(MyLogFormatUtil.getBlockContext(infoMap)); writes.addAll(MyLogFormatUtil.getBlockContext(infoMap));
} }
if(middleData.calibration_pairs_T_idCalPoint.size()>0) { if (middleData.calibration_pairs_T_idCalPoint.size() > 0) {
infoMap = new LinkedHashMap<>(); infoMap = new LinkedHashMap<>();
infoMap.put("Tot_efficiency Calibration [%1 ]".replace("%1", middleData.calibration_pairs_T_Input), ""); infoMap.put("Tot_efficiency Calibration [%1 ]".replace("%1", middleData.calibration_pairs_T_Input), "");
infoMap.put("Function", middleData.calibration_pairs_T_Input); infoMap.put("Function", middleData.calibration_pairs_T_Input);
@ -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++;
} }
} }
@ -816,7 +821,7 @@ public class Sample_C_Analysis {
infoMap.put("%1 peaks reported".replace("%1", idPeakSize + ""), ""); infoMap.put("%1 peaks reported".replace("%1", idPeakSize + ""), "");
infoMap.put("%1 peaks with ID (%2%)" infoMap.put("%1 peaks with ID (%2%)"
.replace("%1", peaksUsed+"") .replace("%1", peaksUsed + "")
.replace("%2", (peaksUsed / idPeakSize * 100) + ""), ""); .replace("%2", (peaksUsed / idPeakSize * 100) + ""), "");
infoMap.put("%1 peaks without ID(%2%)" infoMap.put("%1 peaks without ID(%2%)"
@ -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<>();
@ -914,7 +917,7 @@ public class Sample_C_Analysis {
} }
} }
public void saveAnalysisROI(Integer sampleId, Integer idAnalysis, GStoreMiddleProcessData... middleDatas){ public void saveAnalysisROI(Integer sampleId, Integer idAnalysis, GStoreMiddleProcessData... middleDatas) {
List<GardsAnalysisRoi> analysisRois = new ArrayList<>(); List<GardsAnalysisRoi> analysisRois = new ArrayList<>();
for (int i = 0; i < middleDatas.length; i++) { for (int i = 0; i < middleDatas.length; i++) {
GStoreMiddleProcessData middleData = middleDatas[i]; GStoreMiddleProcessData middleData = middleDatas[i];
@ -942,7 +945,7 @@ public class Sample_C_Analysis {
serviceQuotes.getAnalysisRoiAutoService().saveBatch(analysisRois); serviceQuotes.getAnalysisRoiAutoService().saveBatch(analysisRois);
} }
public void middleDataTable(Integer idAnalysis, GStoreMiddleProcessData... middleDatas){ public void middleDataTable(Integer idAnalysis, GStoreMiddleProcessData... middleDatas) {
List<GardsAnalysisRoi> analysisRois = serviceQuotes.getAnalysisRoiAutoService().analysisRoi(idAnalysis); List<GardsAnalysisRoi> analysisRois = serviceQuotes.getAnalysisRoiAutoService().analysisRoi(idAnalysis);
Map<Integer, GStoreMiddleProcessData> middleDataMap = new LinkedHashMap<>(); Map<Integer, GStoreMiddleProcessData> middleDataMap = new LinkedHashMap<>();
for (int i = 0; i < analysisRois.size(); i++) { for (int i = 0; i < analysisRois.size(); i++) {
@ -954,7 +957,7 @@ public class Sample_C_Analysis {
} }
public List<GardsCalibrationPairs> saveCalibrationPairs(Integer sampleId, Integer IdAnalysis, public List<GardsCalibrationPairs> saveCalibrationPairs(Integer sampleId, Integer IdAnalysis,
Integer roiId, GStoreMiddleProcessData middleData){ Integer roiId, GStoreMiddleProcessData middleData) {
String pairsSampleType = middleData.getCalibration_pairs_sample_type(); String pairsSampleType = middleData.getCalibration_pairs_sample_type();
GardsCalibrationPairs pairs = new GardsCalibrationPairs(); GardsCalibrationPairs pairs = new GardsCalibrationPairs();
// GARDS_CALIBRATION_PAIRS (Energy) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS // GARDS_CALIBRATION_PAIRS (Energy) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS
@ -994,7 +997,7 @@ public class Sample_C_Analysis {
// GARDS_CALIBRATION_PAIRS (Resolution) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS // GARDS_CALIBRATION_PAIRS (Resolution) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS
String base_R_Paris = "calibration_pairs_R_idCalPoint"; String base_R_Paris = "calibration_pairs_R_idCalPoint";
PairsRDto pairsRDto = new PairsRDto(); PairsRDto pairsRDto = new PairsRDto();
BeanUtil.copyProperties(middleData,pairsRDto); BeanUtil.copyProperties(middleData, pairsRDto);
List<GardsCalibrationPairs> pairsR = Lists.newArrayList(); List<GardsCalibrationPairs> pairsR = Lists.newArrayList();
if (!pairsRDto.getCalibration_pairs_R_idCalPoint().isEmpty()) { if (!pairsRDto.getCalibration_pairs_R_idCalPoint().isEmpty()) {
pairsR = mapFields(pairsRDto, pairs, base_R_Paris, fieldMap); pairsR = mapFields(pairsRDto, pairs, base_R_Paris, fieldMap);
@ -1011,7 +1014,7 @@ public class Sample_C_Analysis {
// GARDS_CALIBRATION_PAIRS (TotalEfficiency) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS // GARDS_CALIBRATION_PAIRS (TotalEfficiency) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS
String base_T_Paris = "calibration_pairs_T_idCalPoint"; String base_T_Paris = "calibration_pairs_T_idCalPoint";
PairsTDto pairsTDto = new PairsTDto(); PairsTDto pairsTDto = new PairsTDto();
BeanUtil.copyProperties(middleData,pairsTDto); BeanUtil.copyProperties(middleData, pairsTDto);
List<GardsCalibrationPairs> pairsT = Lists.newArrayList(); List<GardsCalibrationPairs> pairsT = Lists.newArrayList();
if (!pairsTDto.getCalibration_pairs_T_idCalPoint().isEmpty()) { if (!pairsTDto.getCalibration_pairs_T_idCalPoint().isEmpty()) {
pairsT = mapFields(pairsTDto, pairs, base_T_Paris, fieldMap); pairsT = mapFields(pairsTDto, pairs, base_T_Paris, fieldMap);
@ -1027,12 +1030,14 @@ 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;
} }
public void saveCalibrationPairs(Integer sampleId, Integer IdAnalysis){ public void saveCalibrationPairs(Integer sampleId, Integer IdAnalysis) {
List<GardsCalibrationPairs> pairsRois = new ArrayList<>(); List<GardsCalibrationPairs> pairsRois = new ArrayList<>();
Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet(); Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet();
for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) { for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) {
@ -1045,7 +1050,7 @@ public class Sample_C_Analysis {
} }
public List<GardsCalibrationRoi> saveCalibrationROI(Integer sampleId, Integer IdAnalysis, Integer roiId, public List<GardsCalibrationRoi> saveCalibrationROI(Integer sampleId, Integer IdAnalysis, Integer roiId,
GStoreMiddleProcessData middleData){ GStoreMiddleProcessData middleData) {
String calibrationSampleType = middleData.getCalibration_sample_type(); String calibrationSampleType = middleData.getCalibration_sample_type();
List<String> pairsEIdCalPoint = middleData.getCalibration_pairs_E_idCalPoint(); List<String> pairsEIdCalPoint = middleData.getCalibration_pairs_E_idCalPoint();
List<String> pairsEFIdCalPoint = middleData.getCalibration_pairs_EF_idCalPoint(); List<String> pairsEFIdCalPoint = middleData.getCalibration_pairs_EF_idCalPoint();
@ -1053,23 +1058,23 @@ public class Sample_C_Analysis {
List<String> pairsTIdCalPoint = middleData.getCalibration_pairs_T_idCalPoint(); List<String> pairsTIdCalPoint = middleData.getCalibration_pairs_T_idCalPoint();
List<GardsCalibrationRoi> calibrations = new ArrayList<>(); List<GardsCalibrationRoi> calibrations = new ArrayList<>();
// GARDS_CALIBRATION (E) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (E) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsEIdCalPoint)){ if (CollUtil.isNotEmpty(pairsEIdCalPoint)) {
GardsCalibrationRoi calibration = new GardsCalibrationRoi(); GardsCalibrationRoi calibration = new GardsCalibrationRoi();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setRoiId(roiId); calibration.setRoiId(roiId);
calibration.setIdAnalysis(IdAnalysis); calibration.setIdAnalysis(IdAnalysis);
calibration.setSampleType(calibrationSampleType); calibration.setSampleType(calibrationSampleType);
calibration.setCalType(middleData.getCalibration_E_Caltype()); calibration.setCalType(middleData.getCalibration_E_Caltype());
calibration.setFunction((int)middleData.getCalibration_E_function()); calibration.setFunction((int) middleData.getCalibration_E_function());
calibration.setFunctionDef(middleData.getCalibration_E_functionDef()); calibration.setFunctionDef(middleData.getCalibration_E_functionDef());
calibration.setStartOfRange((int)middleData.getCalibration_E_startOfRange()); calibration.setStartOfRange((int) middleData.getCalibration_E_startOfRange());
calibration.setEndOfRange((int)middleData.getCalibration_E_endOfRange()); calibration.setEndOfRange((int) middleData.getCalibration_E_endOfRange());
calibration.setCoeffString(middleData.getCalibration_E_coeff_string()); calibration.setCoeffString(middleData.getCalibration_E_coeff_string());
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
} }
// GARDS_CALIBRATION (EF) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (EF) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsEFIdCalPoint)){ if (CollUtil.isNotEmpty(pairsEFIdCalPoint)) {
GardsCalibrationRoi calibration = new GardsCalibrationRoi(); GardsCalibrationRoi calibration = new GardsCalibrationRoi();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setRoiId(roiId); calibration.setRoiId(roiId);
@ -1082,16 +1087,16 @@ public class Sample_C_Analysis {
double efEndOfRange = middleData.getCalibration_EF_endOfRange(); double efEndOfRange = middleData.getCalibration_EF_endOfRange();
String efCoeffString = middleData.getCalibration_EF_coeff_string(); String efCoeffString = middleData.getCalibration_EF_coeff_string();
calibration.setCalType(efCaltype); calibration.setCalType(efCaltype);
calibration.setFunction((int)efFunction); calibration.setFunction((int) efFunction);
calibration.setFunctionDef(efFunctionDef); calibration.setFunctionDef(efFunctionDef);
calibration.setStartOfRange((int)efStartOfRange); calibration.setStartOfRange((int) efStartOfRange);
calibration.setEndOfRange((int)efEndOfRange); calibration.setEndOfRange((int) efEndOfRange);
calibration.setCoeffString(efCoeffString); calibration.setCoeffString(efCoeffString);
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
} }
// GARDS_CALIBRATION (R) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (R) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsRIdCalPoint)){ if (CollUtil.isNotEmpty(pairsRIdCalPoint)) {
GardsCalibrationRoi calibration = new GardsCalibrationRoi(); GardsCalibrationRoi calibration = new GardsCalibrationRoi();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setRoiId(roiId); calibration.setRoiId(roiId);
@ -1104,16 +1109,16 @@ public class Sample_C_Analysis {
double rEndOfRange = middleData.getCalibration_R_endOfRange(); double rEndOfRange = middleData.getCalibration_R_endOfRange();
String rCoeffString = middleData.getCalibration_R_coeff_string(); String rCoeffString = middleData.getCalibration_R_coeff_string();
calibration.setCalType(rCaltype); calibration.setCalType(rCaltype);
calibration.setFunction((int)rFunction); calibration.setFunction((int) rFunction);
calibration.setFunctionDef(rFunctionDef); calibration.setFunctionDef(rFunctionDef);
calibration.setStartOfRange((int)rStartOfRange); calibration.setStartOfRange((int) rStartOfRange);
calibration.setEndOfRange((int)rEndOfRange); calibration.setEndOfRange((int) rEndOfRange);
calibration.setCoeffString(rCoeffString); calibration.setCoeffString(rCoeffString);
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
} }
// GARDS_CALIBRATION (T) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (T) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsTIdCalPoint)){ if (CollUtil.isNotEmpty(pairsTIdCalPoint)) {
GardsCalibrationRoi calibration = new GardsCalibrationRoi(); GardsCalibrationRoi calibration = new GardsCalibrationRoi();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setRoiId(roiId); calibration.setRoiId(roiId);
@ -1126,10 +1131,10 @@ public class Sample_C_Analysis {
double tEndOfRange = middleData.getCalibration_T_endOfRange(); double tEndOfRange = middleData.getCalibration_T_endOfRange();
String tCoeffString = middleData.getCalibration_T_coeff_string(); String tCoeffString = middleData.getCalibration_T_coeff_string();
calibration.setCalType(tCaltype); calibration.setCalType(tCaltype);
calibration.setFunction((int)middleData.getCalibration_T_function()); calibration.setFunction((int) middleData.getCalibration_T_function());
calibration.setFunctionDef(tFunctionDef); calibration.setFunctionDef(tFunctionDef);
calibration.setStartOfRange((int)tStartOfRange); calibration.setStartOfRange((int) tStartOfRange);
calibration.setEndOfRange((int)tEndOfRange); calibration.setEndOfRange((int) tEndOfRange);
calibration.setCoeffString(tCoeffString); calibration.setCoeffString(tCoeffString);
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
@ -1138,7 +1143,7 @@ public class Sample_C_Analysis {
} }
public List<GardsCalibration> saveCalibration(Integer sampleId, Integer IdAnalysis, Integer roiId, public List<GardsCalibration> saveCalibration(Integer sampleId, Integer IdAnalysis, Integer roiId,
GStoreMiddleProcessData middleData){ GStoreMiddleProcessData middleData) {
String calibrationSampleType = middleData.getCalibration_sample_type(); String calibrationSampleType = middleData.getCalibration_sample_type();
List<String> pairsEIdCalPoint = middleData.getCalibration_pairs_E_idCalPoint(); List<String> pairsEIdCalPoint = middleData.getCalibration_pairs_E_idCalPoint();
List<String> pairsEFIdCalPoint = middleData.getCalibration_pairs_EF_idCalPoint(); List<String> pairsEFIdCalPoint = middleData.getCalibration_pairs_EF_idCalPoint();
@ -1146,22 +1151,22 @@ public class Sample_C_Analysis {
List<String> pairsTIdCalPoint = middleData.getCalibration_pairs_T_idCalPoint(); List<String> pairsTIdCalPoint = middleData.getCalibration_pairs_T_idCalPoint();
List<GardsCalibration> calibrations = new ArrayList<>(); List<GardsCalibration> calibrations = new ArrayList<>();
// GARDS_CALIBRATION (E) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (E) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsEIdCalPoint)){ if (CollUtil.isNotEmpty(pairsEIdCalPoint)) {
GardsCalibration calibration = new GardsCalibration(); GardsCalibration calibration = new GardsCalibration();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setIdAnalysis(IdAnalysis); calibration.setIdAnalysis(IdAnalysis);
calibration.setSampleType(calibrationSampleType); calibration.setSampleType(calibrationSampleType);
calibration.setCalType(middleData.getCalibration_E_Caltype()); calibration.setCalType(middleData.getCalibration_E_Caltype());
calibration.setFunction((int)middleData.getCalibration_E_function()); calibration.setFunction((int) middleData.getCalibration_E_function());
calibration.setFunctionDef(middleData.getCalibration_E_functionDef()); calibration.setFunctionDef(middleData.getCalibration_E_functionDef());
calibration.setStartOfRange((int)middleData.getCalibration_E_startOfRange()); calibration.setStartOfRange((int) middleData.getCalibration_E_startOfRange());
calibration.setEndOfRange((int)middleData.getCalibration_E_endOfRange()); calibration.setEndOfRange((int) middleData.getCalibration_E_endOfRange());
calibration.setCoeffString(middleData.getCalibration_E_coeff_string()); calibration.setCoeffString(middleData.getCalibration_E_coeff_string());
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
} }
// GARDS_CALIBRATION (EF) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (EF) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsEFIdCalPoint)){ if (CollUtil.isNotEmpty(pairsEFIdCalPoint)) {
GardsCalibration calibration = new GardsCalibration(); GardsCalibration calibration = new GardsCalibration();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setIdAnalysis(IdAnalysis); calibration.setIdAnalysis(IdAnalysis);
@ -1173,16 +1178,16 @@ public class Sample_C_Analysis {
double efEndOfRange = middleData.getCalibration_EF_endOfRange(); double efEndOfRange = middleData.getCalibration_EF_endOfRange();
String efCoeffString = middleData.getCalibration_EF_coeff_string(); String efCoeffString = middleData.getCalibration_EF_coeff_string();
calibration.setCalType(efCaltype); calibration.setCalType(efCaltype);
calibration.setFunction((int)efFunction); calibration.setFunction((int) efFunction);
calibration.setFunctionDef(efFunctionDef); calibration.setFunctionDef(efFunctionDef);
calibration.setStartOfRange((int)efStartOfRange); calibration.setStartOfRange((int) efStartOfRange);
calibration.setEndOfRange((int)efEndOfRange); calibration.setEndOfRange((int) efEndOfRange);
calibration.setCoeffString(efCoeffString); calibration.setCoeffString(efCoeffString);
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
} }
// GARDS_CALIBRATION (R) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (R) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsRIdCalPoint)){ if (CollUtil.isNotEmpty(pairsRIdCalPoint)) {
GardsCalibration calibration = new GardsCalibration(); GardsCalibration calibration = new GardsCalibration();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setIdAnalysis(IdAnalysis); calibration.setIdAnalysis(IdAnalysis);
@ -1194,16 +1199,16 @@ public class Sample_C_Analysis {
double rEndOfRange = middleData.getCalibration_R_endOfRange(); double rEndOfRange = middleData.getCalibration_R_endOfRange();
String rCoeffString = middleData.getCalibration_R_coeff_string(); String rCoeffString = middleData.getCalibration_R_coeff_string();
calibration.setCalType(rCaltype); calibration.setCalType(rCaltype);
calibration.setFunction((int)rFunction); calibration.setFunction((int) rFunction);
calibration.setFunctionDef(rFunctionDef); calibration.setFunctionDef(rFunctionDef);
calibration.setStartOfRange((int)rStartOfRange); calibration.setStartOfRange((int) rStartOfRange);
calibration.setEndOfRange((int)rEndOfRange); calibration.setEndOfRange((int) rEndOfRange);
calibration.setCoeffString(rCoeffString); calibration.setCoeffString(rCoeffString);
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
} }
// GARDS_CALIBRATION (T) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION // GARDS_CALIBRATION (T) ==> INSERT INTO RNAUTO.GARDS_CALIBRATION
if (CollUtil.isNotEmpty(pairsTIdCalPoint)){ if (CollUtil.isNotEmpty(pairsTIdCalPoint)) {
GardsCalibration calibration = new GardsCalibration(); GardsCalibration calibration = new GardsCalibration();
calibration.setSampleId(sampleId); calibration.setSampleId(sampleId);
calibration.setIdAnalysis(IdAnalysis); calibration.setIdAnalysis(IdAnalysis);
@ -1215,10 +1220,10 @@ public class Sample_C_Analysis {
double tEndOfRange = middleData.getCalibration_T_endOfRange(); double tEndOfRange = middleData.getCalibration_T_endOfRange();
String tCoeffString = middleData.getCalibration_T_coeff_string(); String tCoeffString = middleData.getCalibration_T_coeff_string();
calibration.setCalType(tCaltype); calibration.setCalType(tCaltype);
calibration.setFunction((int)middleData.getCalibration_T_function()); calibration.setFunction((int) middleData.getCalibration_T_function());
calibration.setFunctionDef(tFunctionDef); calibration.setFunctionDef(tFunctionDef);
calibration.setStartOfRange((int)tStartOfRange); calibration.setStartOfRange((int) tStartOfRange);
calibration.setEndOfRange((int)tEndOfRange); calibration.setEndOfRange((int) tEndOfRange);
calibration.setCoeffString(tCoeffString); calibration.setCoeffString(tCoeffString);
calibration.setModdate(new Date()); calibration.setModdate(new Date());
calibrations.add(calibration); calibrations.add(calibration);
@ -1226,7 +1231,7 @@ public class Sample_C_Analysis {
return calibrations; return calibrations;
} }
public void saveCalibrationROI(Integer sampleId, Integer IdAnalysis){ public void saveCalibrationROI(Integer sampleId, Integer IdAnalysis) {
List<GardsCalibration> calibrationRois = new ArrayList<>(); List<GardsCalibration> calibrationRois = new ArrayList<>();
Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet(); Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet();
for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) { for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) {
@ -1240,7 +1245,7 @@ public class Sample_C_Analysis {
} }
public List<GardsPeaksRoi> savePeaksROI(Integer sampleId, Integer IdAnalysis, public List<GardsPeaksRoi> savePeaksROI(Integer sampleId, Integer IdAnalysis,
Integer roiId, GStoreMiddleProcessData middleData){ Integer roiId, GStoreMiddleProcessData middleData) {
// Gards_Peaks_ROI数据表 ==> INSERT INTO RNAUTO.GARDS_PEAKS_ROI // Gards_Peaks_ROI数据表 ==> INSERT INTO RNAUTO.GARDS_PEAKS_ROI
String base_P_IdPeak = "peaks_idPeak"; String base_P_IdPeak = "peaks_idPeak";
GardsPeaksDto gardsPeaksDto = new GardsPeaksDto(); GardsPeaksDto gardsPeaksDto = new GardsPeaksDto();
@ -1258,7 +1263,7 @@ public class Sample_C_Analysis {
return peaks; return peaks;
} }
public void savePeaksROI(Integer sampleId, Integer IdAnalysis){ public void savePeaksROI(Integer sampleId, Integer IdAnalysis) {
List<GardsPeaksRoi> peaksRois = new ArrayList<>(); List<GardsPeaksRoi> peaksRois = new ArrayList<>();
Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet(); Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet();
for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) { for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) {
@ -1270,7 +1275,7 @@ public class Sample_C_Analysis {
} }
public List<GardsNuclLinesIdedRoi> saveNuclLinesIdedROI(Integer sampleId, Integer IdAnalysis, Integer roiId, public List<GardsNuclLinesIdedRoi> saveNuclLinesIdedROI(Integer sampleId, Integer IdAnalysis, Integer roiId,
GStoreMiddleProcessData middleData){ GStoreMiddleProcessData middleData) {
// Gards_Nucl_Lines_Ided数据表 ==> INSERT INTO RNAUTO.GARDS_NUCL_LINES_IDED // Gards_Nucl_Lines_Ided数据表 ==> INSERT INTO RNAUTO.GARDS_NUCL_LINES_IDED
Map<String, GStoreMiddleProcessDataNuclLinesIded> nuclLinesIdedData = middleData.getNucl_lines_ided_data(); Map<String, GStoreMiddleProcessDataNuclLinesIded> nuclLinesIdedData = middleData.getNucl_lines_ided_data();
String base_IdPeak = "idPeak"; String base_IdPeak = "idPeak";
@ -1280,7 +1285,7 @@ public class Sample_C_Analysis {
GStoreMiddleProcessDataNuclLinesIded nuclLinesIded = entry.getValue(); GStoreMiddleProcessDataNuclLinesIded nuclLinesIded = entry.getValue();
GardsNuclLinesIdedRoi linesIdedRoi = new GardsNuclLinesIdedRoi(); GardsNuclLinesIdedRoi linesIdedRoi = new GardsNuclLinesIdedRoi();
List<GardsNuclLinesIdedRoi> linesIdedRois = mapFields(nuclLinesIded, linesIdedRoi, base_IdPeak, fieldMap); List<GardsNuclLinesIdedRoi> linesIdedRois = mapFields(nuclLinesIded, linesIdedRoi, base_IdPeak, fieldMap);
if (CollUtil.isNotEmpty(linesIdedRois)){ if (CollUtil.isNotEmpty(linesIdedRois)) {
for (GardsNuclLinesIdedRoi idedRoi : linesIdedRois) { for (GardsNuclLinesIdedRoi idedRoi : linesIdedRois) {
idedRoi.setRoiId(roiId); idedRoi.setRoiId(roiId);
idedRoi.setSampleId(sampleId); idedRoi.setSampleId(sampleId);
@ -1293,7 +1298,7 @@ public class Sample_C_Analysis {
return allNuclLinesIdeds; return allNuclLinesIdeds;
} }
public void saveNuclLinesIdedROI(Integer sampleId, Integer IdAnalysis){ public void saveNuclLinesIdedROI(Integer sampleId, Integer IdAnalysis) {
List<GardsNuclLinesIdedRoi> linesIdedRois = new ArrayList<>(); List<GardsNuclLinesIdedRoi> linesIdedRois = new ArrayList<>();
Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet(); Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet();
for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) { for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) {
@ -1305,7 +1310,7 @@ public class Sample_C_Analysis {
} }
public List<GardsNuclIdedRoi> saveNuclIdedROI(Integer sampleId, Integer IdAnalysis, public List<GardsNuclIdedRoi> saveNuclIdedROI(Integer sampleId, Integer IdAnalysis,
Integer roiId, GStoreMiddleProcessData middleData){ Integer roiId, GStoreMiddleProcessData middleData) {
// Gards_Nucl_Ided数据表 ==> INSERT INTO RNAUTO.GARDS_NUCL_IDED // Gards_Nucl_Ided数据表 ==> INSERT INTO RNAUTO.GARDS_NUCL_IDED
GardsNuclIdedDto nuclIdedDto = new GardsNuclIdedDto(); GardsNuclIdedDto nuclIdedDto = new GardsNuclIdedDto();
GardsNuclIdedRoi nuclIdedRoi = new GardsNuclIdedRoi(); GardsNuclIdedRoi nuclIdedRoi = new GardsNuclIdedRoi();
@ -1323,7 +1328,7 @@ public class Sample_C_Analysis {
return nuclIdedRois; return nuclIdedRois;
} }
public void saveNuclIdedROI(Integer sampleId, Integer IdAnalysis){ public void saveNuclIdedROI(Integer sampleId, Integer IdAnalysis) {
List<GardsNuclIdedRoi> idedRois = new ArrayList<>(); List<GardsNuclIdedRoi> idedRois = new ArrayList<>();
Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet(); Set<Map.Entry<Integer, GStoreMiddleProcessData>> entries = this.middleDataMap.entrySet();
for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) { for (Map.Entry<Integer, GStoreMiddleProcessData> entry : entries) {
@ -1336,15 +1341,15 @@ public class Sample_C_Analysis {
public void saveQcCheckROI(Integer sampleId, Integer IdAnalysis, Integer roiId, public void saveQcCheckROI(Integer sampleId, Integer IdAnalysis, Integer roiId,
Map<String, QcCheckItem> qcItems, Map<String, QcCheckItem> qcItems,
GStoreMiddleProcessData middleData){ GStoreMiddleProcessData middleData) {
// Gards_Qc_Check数据表 ==> INSERT INTO RNAUTO.GARDS_QC_CHECK // Gards_Qc_Check数据表 ==> INSERT INTO RNAUTO.GARDS_QC_CHECK
if (MapUtil.isNotEmpty(qcItems)){ if (MapUtil.isNotEmpty(qcItems)) {
String base_QC = String.valueOf(qcItems.size()); String base_QC = String.valueOf(qcItems.size());
QcCheckDto qcCheckDto = new QcCheckDto(); QcCheckDto qcCheckDto = new QcCheckDto();
BeanUtil.copyProperties(middleData,qcCheckDto); BeanUtil.copyProperties(middleData, qcCheckDto);
if (!qcItems.isEmpty()) { if (!qcItems.isEmpty()) {
GardsQcCheck gardsQcCheck = new GardsQcCheck(); GardsQcCheck gardsQcCheck = new GardsQcCheck();
List<GardsQcCheck> gardsQcChecks = mapFields(qcCheckDto, gardsQcCheck,base_QC,fieldMap); List<GardsQcCheck> gardsQcChecks = mapFields(qcCheckDto, gardsQcCheck, base_QC, fieldMap);
for (GardsQcCheck qcCheck : gardsQcChecks) { for (GardsQcCheck qcCheck : gardsQcChecks) {
qcCheck.setSampleId(sampleId); qcCheck.setSampleId(sampleId);
qcCheck.setIdanalysis(IdAnalysis); qcCheck.setIdanalysis(IdAnalysis);
@ -1354,14 +1359,14 @@ public class Sample_C_Analysis {
} }
} }
public void saveQcCheckROI(Integer sampleId, Map<String, QcCheckItem> qcItems){ public void saveQcCheckROI(Integer sampleId, Map<String, QcCheckItem> qcItems) {
} }
public List<GardsMDCRoi> saveMDCROI(Integer sampleId, Integer IdAnalysis, public List<GardsMDCRoi> saveMDCROI(Integer sampleId, Integer IdAnalysis,
Integer roiId, Map<String, CalMDCInfo> mdcInfoMap) { Integer roiId, Map<String, CalMDCInfo> mdcInfoMap) {
List<GardsMDCRoi> mdcRois = new LinkedList<>(); List<GardsMDCRoi> mdcRois = new LinkedList<>();
for (CalMDCInfo mdcInfo :mdcInfoMap.values()) { for (CalMDCInfo mdcInfo : mdcInfoMap.values()) {
if (ObjectUtil.isNull(mdcInfo)) continue; if (ObjectUtil.isNull(mdcInfo)) continue;
if (Objects.nonNull(mdcInfo.getEnergy()) && Objects.nonNull(mdcInfo.getYield()) if (Objects.nonNull(mdcInfo.getEnergy()) && Objects.nonNull(mdcInfo.getYield())
&& Objects.nonNull(mdcInfo.getEfficiency())) { && Objects.nonNull(mdcInfo.getEfficiency())) {
@ -1385,7 +1390,7 @@ public class Sample_C_Analysis {
return mdcRois; return mdcRois;
} }
public void saveMDCROI(Integer sampleId, Integer IdAnalysis, Map<String, CalMDCInfo> mdcInfoMap){ public void saveMDCROI(Integer sampleId, Integer IdAnalysis, Map<String, CalMDCInfo> mdcInfoMap) {
List<GardsMDCRoi> mdcRois = new ArrayList<>(); List<GardsMDCRoi> mdcRois = new ArrayList<>();
Set<Integer> roiIds = this.middleDataMap.keySet(); Set<Integer> roiIds = this.middleDataMap.keySet();
for (Integer roiId : roiIds) { for (Integer roiId : roiIds) {
@ -1408,51 +1413,51 @@ public class Sample_C_Analysis {
return Objects.isNull(nuclideLibs) ? Maps.newHashMap() : (Map<String, NuclideLines>) nuclideLibs; return Objects.isNull(nuclideLibs) ? Maps.newHashMap() : (Map<String, NuclideLines>) nuclideLibs;
} }
public Map<String, NuclideLines> getNuclideLinesP(){ public Map<String, NuclideLines> getNuclideLinesP() {
redisUtil = ApplicationContextUtil.getContext().getBean(RedisUtil.class); redisUtil = ApplicationContextUtil.getContext().getBean(RedisUtil.class);
Object nuclideLibs = redisUtil.get(RedisConstant.NUCLIDE_LINES_LIB + "P"); Object nuclideLibs = redisUtil.get(RedisConstant.NUCLIDE_LINES_LIB + "P");
return Objects.isNull(nuclideLibs) ? Maps.newHashMap() : (Map<String, NuclideLines>) nuclideLibs; return Objects.isNull(nuclideLibs) ? Maps.newHashMap() : (Map<String, NuclideLines>) nuclideLibs;
} }
public Map<String,String> fieldMap(){ public Map<String, String> fieldMap() {
Map<String,String> fieldMap = new HashMap<>(); Map<String, String> fieldMap = new HashMap<>();
// Gards_Nucl_Lines_Ided // Gards_Nucl_Lines_Ided
fieldMap.put("nuclideFullname","nuclidefullname"); fieldMap.put("nuclideFullname", "nuclidefullname");
fieldMap.put("Energy","energy"); fieldMap.put("Energy", "energy");
fieldMap.put("Abundance","abundance"); fieldMap.put("Abundance", "abundance");
fieldMap.put("Activity","activity"); fieldMap.put("Activity", "activity");
fieldMap.put("Effic","effic"); fieldMap.put("Effic", "effic");
fieldMap.put("uncEffic","unEffic"); fieldMap.put("uncEffic", "unEffic");
fieldMap.put("Mda","mda"); fieldMap.put("Mda", "mda");
fieldMap.put("key_flag","keyFlag"); fieldMap.put("key_flag", "keyFlag");
fieldMap.put("csc_ratio","cscRatio"); fieldMap.put("csc_ratio", "cscRatio");
fieldMap.put("csc_ratio_err","cscRatioErr"); fieldMap.put("csc_ratio_err", "cscRatioErr");
fieldMap.put("csc_mod_flag","cscModFlag"); fieldMap.put("csc_mod_flag", "cscModFlag");
fieldMap.put("MDC","mdc"); fieldMap.put("MDC", "mdc");
fieldMap.put("Concentration","concentration"); fieldMap.put("Concentration", "concentration");
// Gards_Nucl_Ided // Gards_Nucl_Ided
fieldMap.put("nucl_ided_Nuclidename","nuclideName"); fieldMap.put("nucl_ided_Nuclidename", "nuclideName");
fieldMap.put("nucl_ided_Type","type"); fieldMap.put("nucl_ided_Type", "type");
fieldMap.put("nucl_ided_Halflife","halflife"); fieldMap.put("nucl_ided_Halflife", "halflife");
fieldMap.put("nucl_ided_ave_activ","aveActiv"); fieldMap.put("nucl_ided_ave_activ", "aveActiv");
fieldMap.put("nucl_ided_ave_activ_err","aveActivErr"); fieldMap.put("nucl_ided_ave_activ_err", "aveActivErr");
fieldMap.put("nucl_ided_activ_key","activKey"); fieldMap.put("nucl_ided_activ_key", "activKey");
fieldMap.put("nucl_ided_activ_key_err","activKeyErr"); fieldMap.put("nucl_ided_activ_key_err", "activKeyErr");
fieldMap.put("nucl_ided_mda","mda"); fieldMap.put("nucl_ided_mda", "mda");
fieldMap.put("nucl_ided_mda_err","mdaErr"); fieldMap.put("nucl_ided_mda_err", "mdaErr");
fieldMap.put("nucl_ided_nid_flag","nidFlag"); fieldMap.put("nucl_ided_nid_flag", "nidFlag");
fieldMap.put("nucl_ided_csc_ratio","cscRatio"); fieldMap.put("nucl_ided_csc_ratio", "cscRatio");
fieldMap.put("nucl_ided_csc_ratio_err","cscRatioErr"); fieldMap.put("nucl_ided_csc_ratio_err", "cscRatioErr");
fieldMap.put("nucl_ided_csc_mod_flag","cscModFlag"); fieldMap.put("nucl_ided_csc_mod_flag", "cscModFlag");
fieldMap.put("nucl_ided_MDC","mdc"); fieldMap.put("nucl_ided_MDC", "mdc");
fieldMap.put("nucl_ided_Concentration","concentration"); fieldMap.put("nucl_ided_Concentration", "concentration");
fieldMap.put("nucl_ided_Key_Energy","keyEnergy"); fieldMap.put("nucl_ided_Key_Energy", "keyEnergy");
fieldMap.put("nucl_ided_Key_Yield","keyYield"); fieldMap.put("nucl_ided_Key_Yield", "keyYield");
// Gards_Qc_Check // Gards_Qc_Check
fieldMap.put("QC_CHECK_QC_NAME","qcName"); fieldMap.put("QC_CHECK_QC_NAME", "qcName");
fieldMap.put("QC_CHECK_QC_VALUE","qcValue"); fieldMap.put("QC_CHECK_QC_VALUE", "qcValue");
fieldMap.put("QC_CHECK_QC_STANDARD","qcStandard"); fieldMap.put("QC_CHECK_QC_STANDARD", "qcStandard");
fieldMap.put("QC_CHECK_QC_RESULT","qcResult"); fieldMap.put("QC_CHECK_QC_RESULT", "qcResult");
// Gards_Peaks // Gards_Peaks
fieldMap.put("peaks_idPeak", "idPeak"); fieldMap.put("peaks_idPeak", "idPeak");
fieldMap.put("peaks_peakCentroid", "centroidChannel"); fieldMap.put("peaks_peakCentroid", "centroidChannel");
@ -1484,22 +1489,22 @@ public class Sample_C_Analysis {
fieldMap.put("peaks_Lc", "lc"); fieldMap.put("peaks_Lc", "lc");
fieldMap.put("peaks_Ld", "ld"); fieldMap.put("peaks_Ld", "ld");
// GARDS_CALIBRATION_PAIRS // GARDS_CALIBRATION_PAIRS
fieldMap.put("calibration_pairs_E_idCalPoint","idCalPoint"); fieldMap.put("calibration_pairs_E_idCalPoint", "idCalPoint");
fieldMap.put("calibration_pairs_E_xValue","xValue"); fieldMap.put("calibration_pairs_E_xValue", "xValue");
fieldMap.put("calibration_pairs_E_yValue","yValue"); fieldMap.put("calibration_pairs_E_yValue", "yValue");
fieldMap.put("calibration_pairs_E_uncYValue","uncYValue"); fieldMap.put("calibration_pairs_E_uncYValue", "uncYValue");
fieldMap.put("calibration_pairs_EF_idCalPoint","idCalPoint"); fieldMap.put("calibration_pairs_EF_idCalPoint", "idCalPoint");
fieldMap.put("calibration_pairs_EF_xValue","xValue"); fieldMap.put("calibration_pairs_EF_xValue", "xValue");
fieldMap.put("calibration_pairs_EF_yValue","yValue"); fieldMap.put("calibration_pairs_EF_yValue", "yValue");
fieldMap.put("calibration_pairs_EF_uncYValue","uncYValue"); fieldMap.put("calibration_pairs_EF_uncYValue", "uncYValue");
fieldMap.put("calibration_pairs_R_idCalPoint","idCalPoint"); fieldMap.put("calibration_pairs_R_idCalPoint", "idCalPoint");
fieldMap.put("calibration_pairs_R_xValue","xValue"); fieldMap.put("calibration_pairs_R_xValue", "xValue");
fieldMap.put("calibration_pairs_R_yValue","yValue"); fieldMap.put("calibration_pairs_R_yValue", "yValue");
fieldMap.put("calibration_pairs_R_uncYValue","uncYValue"); fieldMap.put("calibration_pairs_R_uncYValue", "uncYValue");
fieldMap.put("calibration_pairs_T_idCalPoint","idCalPoint"); fieldMap.put("calibration_pairs_T_idCalPoint", "idCalPoint");
fieldMap.put("calibration_pairs_T_xValue","xValue"); fieldMap.put("calibration_pairs_T_xValue", "xValue");
fieldMap.put("calibration_pairs_T_yValue","yValue"); fieldMap.put("calibration_pairs_T_yValue", "yValue");
fieldMap.put("calibration_pairs_T_uncYValue","uncYValue"); fieldMap.put("calibration_pairs_T_uncYValue", "uncYValue");
return fieldMap; return fieldMap;
} }
@ -1518,19 +1523,19 @@ public class Sample_C_Analysis {
if (StrUtil.isNotBlank(CalibrationPSS_high)) if (StrUtil.isNotBlank(CalibrationPSS_high))
setting.setCalibrationPSS_high(Double.parseDouble(CalibrationPSS_high)); setting.setCalibrationPSS_high(Double.parseDouble(CalibrationPSS_high));
String ECutAnalysis_High = mapSetting.get(Setting.ECUTANALYSIS_HIGH); String ECutAnalysis_High = mapSetting.get(Setting.ECUTANALYSIS_HIGH);
if (StrUtil.isNotBlank(ECutAnalysis_High)){ if (StrUtil.isNotBlank(ECutAnalysis_High)) {
setting.setECutAnalysis_High(Double.parseDouble(ECutAnalysis_High)); setting.setECutAnalysis_High(Double.parseDouble(ECutAnalysis_High));
}else { } else {
setting.setECutAnalysis_High(Double.POSITIVE_INFINITY); setting.setECutAnalysis_High(Double.POSITIVE_INFINITY);
} }
String systemType = sampleStruct.system_type; String systemType = sampleStruct.system_type;
if (StrUtil.equals(systemType, SpectrumSystemType.P.name())){ if (StrUtil.equals(systemType, SpectrumSystemType.P.name())) {
String ECutAnalysis_Low = mapSetting.get(Setting.ECUTANALYSIS_LOW_P); String ECutAnalysis_Low = mapSetting.get(Setting.ECUTANALYSIS_LOW_P);
if (StrUtil.isNotBlank(ECutAnalysis_Low)) if (StrUtil.isNotBlank(ECutAnalysis_Low))
setting.setECutAnalysis_Low(Double.parseDouble(ECutAnalysis_Low)); setting.setECutAnalysis_Low(Double.parseDouble(ECutAnalysis_Low));
String bUpdateCal_P = mapSetting.get(Setting.BUPDATECAL_P); String bUpdateCal_P = mapSetting.get(Setting.BUPDATECAL_P);
setting.setBUpdateCal(StrUtil.equals(bUpdateCal_P, "1")); setting.setBUpdateCal(StrUtil.equals(bUpdateCal_P, "1"));
}else { } else {
String ECutAnalysis_Low = mapSetting.get(Setting.ECUTANALYSIS_LOW_G); String ECutAnalysis_Low = mapSetting.get(Setting.ECUTANALYSIS_LOW_G);
if (StrUtil.isNotBlank(ECutAnalysis_Low)) if (StrUtil.isNotBlank(ECutAnalysis_Low))
setting.setECutAnalysis_Low(Double.parseDouble(ECutAnalysis_Low)); setting.setECutAnalysis_Low(Double.parseDouble(ECutAnalysis_Low));
@ -1541,7 +1546,7 @@ public class Sample_C_Analysis {
if (StrUtil.isNotBlank(EnergyTolerance)) if (StrUtil.isNotBlank(EnergyTolerance))
setting.setEnergyTolerance(Double.parseDouble(EnergyTolerance)); setting.setEnergyTolerance(Double.parseDouble(EnergyTolerance));
String KeepCalPeakSearchPeaks = mapSetting.get(Setting.KEEPCALPEAKSERCHPEAKS); String KeepCalPeakSearchPeaks = mapSetting.get(Setting.KEEPCALPEAKSERCHPEAKS);
setting.setKeepCalPeakSearchPeaks(StrUtil.equals(KeepCalPeakSearchPeaks,"1")); setting.setKeepCalPeakSearchPeaks(StrUtil.equals(KeepCalPeakSearchPeaks, "1"));
String k_alpha = mapSetting.get(Setting.K_ALPHA); String k_alpha = mapSetting.get(Setting.K_ALPHA);
if (StrUtil.isNotBlank(k_alpha)) if (StrUtil.isNotBlank(k_alpha))
setting.setK_alpha(Double.parseDouble(k_alpha)); setting.setK_alpha(Double.parseDouble(k_alpha));
@ -1558,14 +1563,14 @@ public class Sample_C_Analysis {
if (StrUtil.isNotBlank(RiskLevelK)) if (StrUtil.isNotBlank(RiskLevelK))
setting.setRiskLevelK(Double.parseDouble(RiskLevelK)); setting.setRiskLevelK(Double.parseDouble(RiskLevelK));
setting.setRefTime_act(DateUtils.parseDate(phdFile.getAcq().getAcquisition_start_date()+" "+phdFile.getAcq().getAcquisition_start_time())); setting.setRefTime_act(DateUtils.parseDate(phdFile.getAcq().getAcquisition_start_date() + " " + phdFile.getAcq().getAcquisition_start_time()));
setting.setRefTime_conc(DateUtils.parseDate(phdFile.getCollect().getCollection_start_date()+" "+phdFile.getCollect().getCollection_start_time())); setting.setRefTime_conc(DateUtils.parseDate(phdFile.getCollect().getCollection_start_date() + " " + phdFile.getCollect().getCollection_start_time()));
} }
} }
public void saveAnalysis(Integer sampleId, GardsSampleData detSampleData, Date analysisBegin, public void saveAnalysis(Integer sampleId, GardsSampleData detSampleData, Date analysisBegin,
Date analysisEnd, String logPath, String reportPath){ Date analysisEnd, String logPath, String reportPath) {
GardsAnalyses analysis = new GardsAnalyses(); // TODO 自动处理 分析表数据补全 (包括update) GardsAnalyses analysis = new GardsAnalyses(); // TODO 自动处理 分析表数据补全 (包括update)
analysis.setSampleId(sampleId); analysis.setSampleId(sampleId);
analysis.setCategory(1);//按C++代码写死的1，该字段是分级结果张博士还没有想好数据要不要分级1,2,3,4 analysis.setCategory(1);//按C++代码写死的1，该字段是分级结果张博士还没有想好数据要不要分级1,2,3,4
@ -1576,7 +1581,7 @@ public class Sample_C_Analysis {
analysis.setSwVersion(serviceQuotes.getSoftwareProperties().getSwVersion()); analysis.setSwVersion(serviceQuotes.getSoftwareProperties().getSwVersion());
analysis.setAnalyst(serviceQuotes.getSoftwareProperties().getAnalyst()); analysis.setAnalyst(serviceQuotes.getSoftwareProperties().getAnalyst());
analysis.setComments("test");//按C++代码写死的test analysis.setComments("test");//按C++代码写死的test
if (ObjectUtil.isNotNull(detSampleData)){ if (ObjectUtil.isNotNull(detSampleData)) {
analysis.setUseddetphd(detSampleData.getInputFileName()); analysis.setUseddetphd(detSampleData.getInputFileName());
analysis.setUseddetphdId(detSampleData.getSampleId()); analysis.setUseddetphdId(detSampleData.getSampleId());
} }
@ -1645,15 +1650,15 @@ public class Sample_C_Analysis {
} }
}*/ }*/
public <T1,T2> List<T2> mapFields(T1 source, T2 tartget, String baseLine, Map<String,String> fieldMap) { public <T1, T2> List<T2> mapFields(T1 source, T2 tartget, String baseLine, Map<String, String> fieldMap) {
try { try {
List<T2> result = new ArrayList<>(); List<T2> result = new ArrayList<>();
Class<?> sourceClass = source.getClass(); Class<?> sourceClass = source.getClass();
boolean isNumber = NumberUtil.isNumber(baseLine); boolean isNumber = NumberUtil.isNumber(baseLine);
int total; int total;
if (isNumber){ if (isNumber) {
total = Integer.parseInt(baseLine); total = Integer.parseInt(baseLine);
}else { } else {
Field declaredField = sourceClass.getDeclaredField(baseLine); Field declaredField = sourceClass.getDeclaredField(baseLine);
declaredField.setAccessible(true); declaredField.setAccessible(true);
List<String> baseList = (List<String>) declaredField.get(source); List<String> baseList = (List<String>) declaredField.get(source);
@ -1674,7 +1679,7 @@ public class Sample_C_Analysis {
if (sourceList.size() <= i) if (sourceList.size() <= i)
continue; continue;
String value = sourceList.get(i); String value = sourceList.get(i);
if (StrUtil.isNotBlank(value)){ if (StrUtil.isNotBlank(value)) {
String sourceFieldName = sourceField.getName(); String sourceFieldName = sourceField.getName();
String targetFieldName = fieldMap.get(sourceFieldName); String targetFieldName = fieldMap.get(sourceFieldName);
targetFieldName = StrUtil.isBlank(targetFieldName) ? sourceFieldName : targetFieldName; targetFieldName = StrUtil.isBlank(targetFieldName) ? sourceFieldName : targetFieldName;
@ -1692,7 +1697,7 @@ public class Sample_C_Analysis {
tartgetField.set(tartget, Boolean.valueOf(value)); tartgetField.set(tartget, Boolean.valueOf(value));
} }
} }
}catch (Exception e){ } catch (Exception e) {
log.error("Sample_G_Analysis.mapFields()值映射异常: {}", e.getMessage()); log.error("Sample_G_Analysis.mapFields()值映射异常: {}", e.getMessage());
} }
} }