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

人工交互分析模块Beta保存数据代码优化，存储前的分析操作移除，根据分析结果数据存储数据

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-19 17:00:16 +08:00
parent 0c5eadbb2c
commit 924cddb1f2
13 changed files with 584 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java
View File

@ -7,6 +7,9 @@ import org.jeecg.modules.base.entity.rnman.GardsCalibration;
public interface GardsCalibrationSpectrumMapper extends BaseMapper<GardsCalibration> {
@InterceptorIgnore(tenantLine = "true")
void insertCalibration(@Param(value = "calibration") GardsCalibration calibration);
@InterceptorIgnore(tenantLine = "true")
void insertCalibrationGamma(@Param(value = "calibration") GardsCalibration calibration);

28
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsCalibrationSpectrumMapper.xml
View File

@ -2,6 +2,34 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mapper.GardsCalibrationSpectrumMapper">
<insert id="insertCalibration">
INSERT INTO
RNMAN.GARDS_CALIBRATION(
SAMPLE_ID,
IDANALYSIS,
SAMPLE_TYPE,
CALTYPE,
FUNCTION,
FUNCTIONDEF,
STARTOFRANGE,
ENDOFRANGE,
COEFF1,
COEFF2,
COEFF3)
VALUES(#{calibration.sampleId},
#{calibration.idAnalysis},
#{calibration.sampleType},
#{calibration.calType},
#{calibration.function},
#{calibration.functionDef},
#{calibration.startOfRange},
#{calibration.endOfRange},
#{calibration.coeff1},
#{calibration.coeff2},
#{calibration.coeff3})
</insert>
<insert id="insertCalibrationGamma">
INSERT INTO
RNMAN.GARDS_CALIBRATION(

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsSpectrumService.java
View File

@ -2,6 +2,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.rnman.GardsCalibrationPairs;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import org.jeecg.modules.entity.vo.PHDFile;
@ -9,7 +10,7 @@ import java.util.List;
public interface IGardsCalibrationPairsSpectrumService extends IService<GardsCalibrationPairs> {
int saveGardsCalibrationPairs(List<GardsCalibrationPairs> calibrationPairsList);
int saveGardsCalibrationPairs(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis);
int saveGardsCalibrationPairsGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java
View File

@ -2,13 +2,14 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.rnman.GardsCalibration;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import java.util.List;
public interface IGardsCalibrationSpectrumService extends IService<GardsCalibration> {
int saveGardsCalibration(List<GardsCalibration> calibrationPairsList);
int saveGardsCalibration(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis);
int saveCalibrationGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis);

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsROIChannelsSpectrumService.java
View File

@ -2,11 +2,12 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.rnman.GardsRoiChannels;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import java.util.List;
public interface IGardsROIChannelsSpectrumService extends IService<GardsRoiChannels> {
int saveGardsROIChannels(List<GardsRoiChannels> roiChannelsList);
int saveGardsROIChannels(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis);
}

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsROIResultsSpectrumService.java
View File

@ -2,11 +2,12 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.rnman.GardsRoiResults;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import java.util.List;
public interface IGardsROIResultsSpectrumService extends IService<GardsRoiResults> {
int saveGardsROIResults(List<GardsRoiResults> roiResultsList);
int saveGardsROIResults(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer idAnalysis);
}

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsXeResultsSpectrumService.java
View File

@ -2,11 +2,12 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.rnman.GardsXeResults;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import java.util.List;
public interface IGardsXeResultsSpectrumService extends IService<GardsXeResults> {
int saveGardsXeResults(List<GardsXeResults> xeResultsList);
int saveGardsXeResults(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer idAnalysis);
}

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

@ -4,6 +4,10 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnman.GardsCalibrationPairs;
import org.jeecg.modules.base.enums.CalName;
import org.jeecg.modules.base.enums.CalType;
import org.jeecg.modules.base.enums.SystemType;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import org.jeecg.modules.entity.vo.PHDFile;
import org.jeecg.modules.entity.GardsCalibrationPairsSpectrum;
@ -22,7 +26,92 @@ public class GardsCalibrationPairsSpectrumServiceImpl extends ServiceImpl<GardsC
@Override
@Transactional
public int saveGardsCalibrationPairs(List<GardsCalibrationPairs> calibrationPairsList) {
public int saveGardsCalibrationPairs(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis) {
List<GardsCalibrationPairs> calibrationPairsList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(anlyseResultIn.getB_channel_sample())) {
for (int i=0; i< anlyseResultIn.getB_channel_sample().size(); i++){
GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs();
calibrationPairs.setSampleId(sampleId);
calibrationPairs.setIdAnalysis(idAnalysis);
calibrationPairs.setSampleType(SystemType.BETA.getType());
calibrationPairs.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairs.setInput(CalName.CalPHD.getType());
calibrationPairs.setIdCalPoint(i);
calibrationPairs.setXValue(anlyseResultIn.getB_channel_sample().get(i));
calibrationPairs.setYValue(anlyseResultIn.getB_energy_sample().get(i));
calibrationPairsList.add(calibrationPairs);
}
}
if (CollectionUtils.isNotEmpty(anlyseResultIn.getG_channel_sample())) {
for (int i=0; i< anlyseResultIn.getG_channel_sample().size(); i++){
GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs();
calibrationPairs.setSampleId(sampleId);
calibrationPairs.setIdAnalysis(idAnalysis);
calibrationPairs.setSampleType(SystemType.GAMMA.getType());
calibrationPairs.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairs.setInput(CalName.CalPHD.getType());
calibrationPairs.setIdCalPoint(i);
calibrationPairs.setXValue(anlyseResultIn.getG_channel_sample().get(i));
calibrationPairs.setYValue(anlyseResultIn.getG_energy_sample().get(i));
calibrationPairsList.add(calibrationPairs);
}
}
if (CollectionUtils.isNotEmpty(anlyseResultIn.getB_channel_gas())) {
for (int i=0; i< anlyseResultIn.getB_channel_gas().size(); i++){
GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs();
calibrationPairs.setSampleId(gasId);
calibrationPairs.setIdAnalysis(idAnalysis);
calibrationPairs.setSampleType(SystemType.BETA.getType());
calibrationPairs.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairs.setInput(CalName.CalPHD.getType());
calibrationPairs.setIdCalPoint(i);
calibrationPairs.setXValue(anlyseResultIn.getB_channel_gas().get(i));
calibrationPairs.setYValue(anlyseResultIn.getB_energy_gas().get(i));
calibrationPairsList.add(calibrationPairs);
}
}
if (CollectionUtils.isNotEmpty(anlyseResultIn.getG_channel_gas())) {
for (int i=0; i< anlyseResultIn.getG_channel_gas().size(); i++){
GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs();
calibrationPairs.setSampleId(gasId);
calibrationPairs.setIdAnalysis(idAnalysis);
calibrationPairs.setSampleType(SystemType.GAMMA.getType());
calibrationPairs.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairs.setInput(CalName.CalPHD.getType());
calibrationPairs.setIdCalPoint(i);
calibrationPairs.setXValue(anlyseResultIn.getG_channel_gas().get(i));
calibrationPairs.setYValue(anlyseResultIn.getG_energy_gas().get(i));
calibrationPairsList.add(calibrationPairs);
}
}
if (CollectionUtils.isNotEmpty(anlyseResultIn.getB_channel_det())) {
for (int i=0; i< anlyseResultIn.getB_channel_det().size(); i++){
GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs();
calibrationPairs.setSampleId(detId);
calibrationPairs.setIdAnalysis(idAnalysis);
calibrationPairs.setSampleType(SystemType.BETA.getType());
calibrationPairs.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairs.setInput(CalName.CalPHD.getType());
calibrationPairs.setIdCalPoint(i);
calibrationPairs.setXValue(anlyseResultIn.getB_channel_det().get(i));
calibrationPairs.setYValue(anlyseResultIn.getB_energy_det().get(i));
calibrationPairsList.add(calibrationPairs);
}
}
if (CollectionUtils.isNotEmpty(anlyseResultIn.getG_channel_det())) {
for (int i=0; i< anlyseResultIn.getG_channel_det().size(); i++){
GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs();
calibrationPairs.setSampleId(detId);
calibrationPairs.setIdAnalysis(idAnalysis);
calibrationPairs.setSampleType(SystemType.GAMMA.getType());
calibrationPairs.setCaltype(CalType.ENERGY_CAL.getType());
calibrationPairs.setInput(CalName.CalPHD.getType());
calibrationPairs.setIdCalPoint(i);
calibrationPairs.setXValue(anlyseResultIn.getG_channel_det().get(i));
calibrationPairs.setYValue(anlyseResultIn.getG_energy_det().get(i));
calibrationPairsList.add(calibrationPairs);
}
}
if (CollectionUtils.isNotEmpty(calibrationPairsList)) {
this.saveBatch(calibrationPairsList);
}

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

@ -4,6 +4,12 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnman.GardsCalibration;
import org.jeecg.modules.base.enums.CalType;
import org.jeecg.modules.base.enums.DataTypeAbbr;
import org.jeecg.modules.base.enums.FittingType;
import org.jeecg.modules.base.enums.SystemType;
import org.jeecg.modules.entity.GardsCalibrationSpectrum;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
import org.jeecg.modules.mapper.GardsCalibrationSpectrumMapper;
import org.jeecg.modules.service.IGardsCalibrationSpectrumService;
@ -12,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service("gardsCalibrationSpectrumService")
@DS("ora")
@ -20,11 +28,116 @@ public class GardsCalibrationSpectrumServiceImpl extends ServiceImpl<GardsCalibr
@Override
@Transactional
public int saveGardsCalibration(List<GardsCalibration> calibrationPairsList) {
if (CollectionUtils.isNotEmpty(calibrationPairsList)) {
this.saveBatch(calibrationPairsList);
public int saveGardsCalibration(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis) {
List<GardsCalibration> calibrationSpectrumList = new LinkedList<>();
if (Objects.nonNull(sampleId)) {
GardsCalibration calibrationB = new GardsCalibration();
calibrationB.setSampleId(sampleId);
calibrationB.setIdAnalysis(idAnalysis);
calibrationB.setSampleType(SystemType.BETA.getType());
calibrationB.setCalType(CalType.ENERGY_CAL.getType());
calibrationB.setFunction(FittingType.POLY2.getCode());
calibrationB.setFunctionDef(FittingType.POLY2.getDescription());
calibrationB.setStartOfRange(0);
calibrationB.setEndOfRange(1);
List<GardsCalibrationSpectrum> betaCollect = anlyseResultIn.getBetaCalibrationSpectrumList().stream().filter(item -> item.getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
GardsCalibrationSpectrum betaCalibrationSpectrum = betaCollect.get(0);
calibrationB.setCoeff1(Double.valueOf(betaCalibrationSpectrum.getCoeff1()));
calibrationB.setCoeff2(Double.valueOf(betaCalibrationSpectrum.getCoeff2()));
calibrationB.setCoeff3(Double.valueOf(betaCalibrationSpectrum.getCoeff3()));
calibrationSpectrumList.add(calibrationB);
GardsCalibration calibrationG = new GardsCalibration();
calibrationG.setSampleId(sampleId);
calibrationG.setIdAnalysis(idAnalysis);
calibrationG.setSampleType(SystemType.GAMMA.getType());
calibrationG.setCalType(CalType.ENERGY_CAL.getType());
calibrationG.setFunction(FittingType.POLY2.getCode());
calibrationG.setFunctionDef(FittingType.POLY2.getDescription());
calibrationG.setStartOfRange(0);
calibrationG.setEndOfRange(1);
List<GardsCalibrationSpectrum> gammaCollect = anlyseResultIn.getGammaCalibrationSpectrumList().stream().filter(item -> item.getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
GardsCalibrationSpectrum gammaCalibrationSpectrum = gammaCollect.get(0);
calibrationG.setCoeff1(Double.valueOf(gammaCalibrationSpectrum.getCoeff1()));
calibrationG.setCoeff2(Double.valueOf(gammaCalibrationSpectrum.getCoeff2()));
calibrationG.setCoeff3(Double.valueOf(gammaCalibrationSpectrum.getCoeff3()));
calibrationSpectrumList.add(calibrationG);
}
return calibrationPairsList.size();
if (Objects.nonNull(gasId)) {
//gas文件 Beta部分
GardsCalibration calibrationB = new GardsCalibration();
calibrationB.setSampleId(gasId);
calibrationB.setIdAnalysis(idAnalysis);
calibrationB.setSampleType(SystemType.BETA.getType());
calibrationB.setCalType(CalType.ENERGY_CAL.getType());
calibrationB.setFunction(FittingType.POLY2.getCode());
calibrationB.setFunctionDef(FittingType.POLY2.getDescription());
calibrationB.setStartOfRange(0);
calibrationB.setEndOfRange(1);
List<GardsCalibrationSpectrum> betaCollect = anlyseResultIn.getBetaCalibrationSpectrumList().stream().filter(item -> item.getDataType().equals(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
GardsCalibrationSpectrum betaCalibrationSpectrum = betaCollect.get(0);
calibrationB.setCoeff1(Double.valueOf(betaCalibrationSpectrum.getCoeff1()));
calibrationB.setCoeff2(Double.valueOf(betaCalibrationSpectrum.getCoeff2()));
calibrationB.setCoeff3(Double.valueOf(betaCalibrationSpectrum.getCoeff3()));
calibrationSpectrumList.add(calibrationB);
//gas文件 gamma部分
GardsCalibration calibrationG = new GardsCalibration();
calibrationG.setSampleId(gasId);
calibrationG.setIdAnalysis(idAnalysis);
calibrationG.setSampleType(SystemType.GAMMA.getType());
calibrationG.setCalType(CalType.ENERGY_CAL.getType());
calibrationG.setFunction(FittingType.POLY2.getCode());
calibrationG.setFunctionDef(FittingType.POLY2.getDescription());
calibrationG.setStartOfRange(0);
calibrationG.setEndOfRange(1);
List<GardsCalibrationSpectrum> gammaCollect = anlyseResultIn.getGammaCalibrationSpectrumList().stream().filter(item -> item.getDataType().equals(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
GardsCalibrationSpectrum gammaCalibrationSpectrum = gammaCollect.get(0);
calibrationG.setCoeff1(Double.valueOf(gammaCalibrationSpectrum.getCoeff1()));
calibrationG.setCoeff2(Double.valueOf(gammaCalibrationSpectrum.getCoeff2()));
calibrationG.setCoeff3(Double.valueOf(gammaCalibrationSpectrum.getCoeff3()));
calibrationSpectrumList.add(calibrationG);
}
if (Objects.nonNull(detId)) {
GardsCalibration calibrationB = new GardsCalibration();
calibrationB.setSampleId(detId);
calibrationB.setIdAnalysis(idAnalysis);
calibrationB.setSampleType(SystemType.BETA.getType());
calibrationB.setCalType(CalType.ENERGY_CAL.getType());
calibrationB.setFunction(FittingType.POLY2.getCode());
calibrationB.setFunctionDef(FittingType.POLY2.getDescription());
calibrationB.setStartOfRange(0);
calibrationB.setEndOfRange(1);
List<GardsCalibrationSpectrum> betaCollect = anlyseResultIn.getBetaCalibrationSpectrumList().stream().filter(item -> item.getDataType().equals(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
GardsCalibrationSpectrum betaCalibrationSpectrum = betaCollect.get(0);
calibrationB.setCoeff1(Double.valueOf(betaCalibrationSpectrum.getCoeff1()));
calibrationB.setCoeff2(Double.valueOf(betaCalibrationSpectrum.getCoeff2()));
calibrationB.setCoeff3(Double.valueOf(betaCalibrationSpectrum.getCoeff3()));
calibrationSpectrumList.add(calibrationB);
GardsCalibration calibrationG = new GardsCalibration();
calibrationG.setSampleId(detId);
calibrationG.setIdAnalysis(idAnalysis);
calibrationG.setSampleType(SystemType.GAMMA.getType());
calibrationG.setCalType(CalType.ENERGY_CAL.getType());
calibrationG.setFunction(FittingType.POLY2.getCode());
calibrationG.setFunctionDef(FittingType.POLY2.getDescription());
calibrationG.setStartOfRange(0);
calibrationG.setEndOfRange(1);
List<GardsCalibrationSpectrum> gammaCollect = anlyseResultIn.getGammaCalibrationSpectrumList().stream().filter(item -> item.getDataType().equals(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
GardsCalibrationSpectrum gammaCalibrationSpectrum = gammaCollect.get(0);
calibrationG.setCoeff1(Double.valueOf(gammaCalibrationSpectrum.getCoeff1()));
calibrationG.setCoeff2(Double.valueOf(gammaCalibrationSpectrum.getCoeff2()));
calibrationG.setCoeff3(Double.valueOf(gammaCalibrationSpectrum.getCoeff3()));
calibrationSpectrumList.add(calibrationG);
}
if (CollectionUtils.isNotEmpty(calibrationSpectrumList)) {
for (GardsCalibration calibration:calibrationSpectrumList) {
this.baseMapper.insertCalibration(calibration);
}
}
return calibrationSpectrumList.size();
}
@Override

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

@ -4,12 +4,18 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnman.GardsRoiChannels;
import org.jeecg.modules.base.enums.DataType;
import org.jeecg.modules.base.enums.DataTypeAbbr;
import org.jeecg.modules.entity.GardsROIChannelsSpectrum;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.mapper.GardsROIChannelsSpectrumMapper;
import org.jeecg.modules.service.IGardsROIChannelsSpectrumService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
@Service("roiChannelsService")
@DS("ora")
@ -17,7 +23,49 @@ public class GardsROIChannelsSpectrumServiceImpl extends ServiceImpl<GardsROICha
@Override
@Transactional
public int saveGardsROIChannels(List<GardsRoiChannels> roiChannelsList) {
public int saveGardsROIChannels(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer gasId, Integer detId, Integer idAnalysis) {
List<GardsRoiChannels> roiChannelsList = new LinkedList<>();
List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = anlyseResultIn.getRoiChannelsSpectrumList();
//过滤出sample相关的数据
List<GardsROIChannelsSpectrum> sampleRoiChannelsSpectrumList = roiChannelsSpectrumList.stream().filter(item-> item.getDataType().equals(DataTypeAbbr.SAMPLEPHD.getType())).collect(Collectors.toList());
for (int i=0; i<sampleRoiChannelsSpectrumList.size(); i++){
GardsRoiChannels roiChannels = new GardsRoiChannels();
roiChannels.setSampleId(sampleId);
roiChannels.setIdAnalysis(idAnalysis);
roiChannels.setRoi(i+1);
roiChannels.setBChanStart(sampleRoiChannelsSpectrumList.get(i).getBChanStart());
roiChannels.setBChanStop(sampleRoiChannelsSpectrumList.get(i).getBChanStop());
roiChannels.setGChanStart(sampleRoiChannelsSpectrumList.get(i).getGChanStart());
roiChannels.setGChanStop(sampleRoiChannelsSpectrumList.get(i).getGChanStop());
roiChannelsList.add(roiChannels);
}
//过滤出gas相关的数据
List<GardsROIChannelsSpectrum> gasRoiChannelsSpectrumList = roiChannelsSpectrumList.stream().filter(item-> item.getDataType().equals(DataTypeAbbr.GASBKPHD.getType())).collect(Collectors.toList());
for (int i=0; i<gasRoiChannelsSpectrumList.size(); i++){
GardsRoiChannels roiChannels = new GardsRoiChannels();
roiChannels.setSampleId(gasId);
roiChannels.setIdAnalysis(idAnalysis);
roiChannels.setRoi(i+1);
roiChannels.setBChanStart(gasRoiChannelsSpectrumList.get(i).getBChanStart());
roiChannels.setBChanStop(gasRoiChannelsSpectrumList.get(i).getBChanStop());
roiChannels.setGChanStart(gasRoiChannelsSpectrumList.get(i).getGChanStart());
roiChannels.setGChanStop(gasRoiChannelsSpectrumList.get(i).getGChanStop());
roiChannelsList.add(roiChannels);
}
//过滤出det相关的数据
List<GardsROIChannelsSpectrum> detRoiChannelsSpectrumList = roiChannelsSpectrumList.stream().filter(item-> item.getDataType().equals(DataTypeAbbr.DETBKPHD.getType())).collect(Collectors.toList());
for (int i=0; i<detRoiChannelsSpectrumList.size(); i++){
GardsRoiChannels roiChannels = new GardsRoiChannels();
roiChannels.setSampleId(detId);
roiChannels.setIdAnalysis(idAnalysis);
roiChannels.setRoi(i+1);
roiChannels.setBChanStart(detRoiChannelsSpectrumList.get(i).getBChanStart());
roiChannels.setBChanStop(detRoiChannelsSpectrumList.get(i).getBChanStop());
roiChannels.setGChanStart(detRoiChannelsSpectrumList.get(i).getGChanStart());
roiChannels.setGChanStop(detRoiChannelsSpectrumList.get(i).getGChanStop());
roiChannelsList.add(roiChannels);
}
//批量存储
if (CollectionUtils.isNotEmpty(roiChannelsList)) {
this.saveBatch(roiChannelsList);
}

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

@ -4,10 +4,13 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnman.GardsRoiResults;
import org.jeecg.modules.entity.GardsROIResultsSpectrum;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.mapper.GardsROIResultsSpectrumMapper;
import org.jeecg.modules.service.IGardsROIResultsSpectrumService;
import org.springframework.stereotype.Service;
import java.util.LinkedList;
import java.util.List;
@Service("roiResultsSpectrumService")
@ -15,7 +18,28 @@ import java.util.List;
public class GardsROIResultsSpectrumServiceImpl extends ServiceImpl<GardsROIResultsSpectrumMapper, GardsRoiResults> implements IGardsROIResultsSpectrumService {
@Override
public int saveGardsROIResults(List<GardsRoiResults> roiResultsList) {
public int saveGardsROIResults(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer idAnalysis) {
List<GardsRoiResults> roiResultsList = new LinkedList<>();
List<GardsROIResultsSpectrum> roiResultsSpectrumList = anlyseResultIn.getRoiResultsSpectrumList();
for (int i=0; i<roiResultsSpectrumList.size(); i++) {
GardsRoiResults roiResults = new GardsRoiResults();
roiResults.setSampleId(sampleId);
roiResults.setIdAnalysis(idAnalysis);
roiResults.setRoi(i+1);
roiResults.setLc(roiResultsSpectrumList.get(i).getLc());
roiResults.setSGross(roiResultsSpectrumList.get(i).getSGross());
roiResults.setGGross(roiResultsSpectrumList.get(i).getGGross());
roiResults.setBGross(roiResultsSpectrumList.get(i).getBGross());
roiResults.setSNet(roiResultsSpectrumList.get(i).getSNet());
roiResults.setGNet(roiResultsSpectrumList.get(i).getGNet());
roiResults.setNet(roiResultsSpectrumList.get(i).getNet());
roiResults.setNetErr(roiResultsSpectrumList.get(i).getNetErr());
roiResults.setConc(roiResultsSpectrumList.get(i).getConc());
roiResults.setConcErr(roiResultsSpectrumList.get(i).getConcErr());
roiResults.setMdc(roiResultsSpectrumList.get(i).getMdc());
roiResults.setNidFlag(roiResultsSpectrumList.get(i).getNidFlag());
roiResultsList.add(roiResults);
}
if (CollectionUtils.isNotEmpty(roiResultsList)) {
this.saveBatch(roiResultsList);
}

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

@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnman.GardsXeResults;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.mapper.GardsXeResultsSpectrumMapper;
import org.jeecg.modules.service.IGardsXeResultsSpectrumService;
import org.springframework.stereotype.Service;
@ -17,7 +18,12 @@ public class GardsXeResultsSpectrumServiceImpl extends ServiceImpl<GardsXeResult
@Override
@Transactional
public int saveGardsXeResults(List<GardsXeResults> xeResultsList) {
public int saveGardsXeResults(BgDataAnlyseResultIn anlyseResultIn, Integer sampleId, Integer idAnalysis) {
List<GardsXeResults> xeResultsList = anlyseResultIn.getXeData();
for (GardsXeResults xeResults:xeResultsList) {
xeResults.setIdAnalysis(idAnalysis);
xeResults.setSampleId(sampleId);
}
if (CollectionUtils.isNotEmpty(xeResultsList)) {
this.saveBatch(xeResultsList);
}

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

File diff suppressed because it is too large Load Diff