From 842b544b43b7343fdafdcf711188c2999d6feb83 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Tue, 5 Sep 2023 15:55:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9ASample=5FG=5FAnalysis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/constant/Prompt.java | 2 +- .../modules/base/dto/GardsNuclIdedDto.java | 26 ++ .../jeecg/modules/base/dto/QcCheckDto.java | 13 + .../AlarmAnalysisLogController.java | 6 +- .../mapper/GardsNuclLinesIdedAutoMapper.java | 11 + .../modules/mapper/GardsPeaksAutoMapper.java | 10 + .../mapper/GardsQcCheckAutoMapper.java | 10 + .../GardsNuclLinesIdedAutoService.java | 9 + .../service/GardsPeaksAutoService.java | 8 + .../service/GardsQcCheckAutoService.java | 8 + .../impl/GardsCalibrationServiceImpl.java | 17 + .../GardsNuclLinesIdedAutoServiceImpl.java | 15 + .../impl/GardsPeaksAutoServiceImpl.java | 15 + .../impl/GardsQcCheckAutoServiceImpl.java | 18 + .../modules/spectrum/Sample_G_Analysis.java | 410 ++++++++++++++++-- .../spectrum/SpectrumServiceQuotes.java | 8 + .../controller/GardsNuclLibController.java | 8 + .../SysDefaultNuclideController.java | 16 +- .../system/mapper/GardsNuclLibMapper.java | 2 + .../system/mapper/xml/GardsNuclLibMapper.xml | 3 + .../system/service/IGardsNuclLibService.java | 2 + .../service/ISysDefaultNuclideService.java | 6 +- .../service/impl/GardsNuclLibServiceImpl.java | 7 + .../impl/SysDefaultNuclideServiceImpl.java | 43 +- 24 files changed, 611 insertions(+), 62 deletions(-) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/GardsNuclIdedDto.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/QcCheckDto.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedAutoMapper.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsPeaksAutoMapper.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsQcCheckAutoMapper.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsNuclLinesIdedAutoService.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsPeaksAutoService.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsQcCheckAutoService.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationServiceImpl.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedAutoServiceImpl.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsPeaksAutoServiceImpl.java create mode 100644 jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsQcCheckAutoServiceImpl.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/Prompt.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/Prompt.java index b37d9ca5..69310723 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/Prompt.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/Prompt.java @@ -27,7 +27,7 @@ public interface Prompt { String NOT_REPEAT = " Can Not Be Repeat!"; - String PARAM_REQUIRED = "Param Is Required!"; + String PARAM_REQUIRED = " Is Required!"; String PARAM_NOT_EMPTY = "Param Cat Not Be Empty!"; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/GardsNuclIdedDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/GardsNuclIdedDto.java new file mode 100644 index 00000000..46e68da3 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/GardsNuclIdedDto.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.base.dto; + +import lombok.Data; +import java.util.List; + +@Data +public class GardsNuclIdedDto { + + private List nucl_ided_Nuclidename; // 核素名称 + private List nucl_ided_Type; //核素类型 未知 + private List nucl_ided_Halflife; //核素半衰期 + private List nucl_ided_ave_activ; //平均活度值NULL + private List nucl_ided_ave_activ_err; //平均活度值不确定度NULL + private List nucl_ided_activ_key; //主射线活度值 未知 + private List nucl_ided_activ_key_err; //主射线活度值不确定度 + private List nucl_ided_mda; //核素的最小可探测活度 + private List nucl_ided_mda_err; //核素的最小可探测活度不确定度 + private List nucl_ided_nid_flag; //核素识别标志未知 + private List nucl_ided_csc_ratio; //符合相加校正因子（无设为1） + private List nucl_ided_csc_ratio_err; //符合相加校正因子不确定度（无设为0） + private List nucl_ided_csc_mod_flag; //活度是否经过符合相加校正0 + private List nucl_ided_MDC; + private List nucl_ided_Concentration; + private List nucl_ided_Key_Energy; // + private List nucl_ided_Key_Yield; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/QcCheckDto.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/QcCheckDto.java new file mode 100644 index 00000000..b6f07c39 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/QcCheckDto.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.base.dto; + +import lombok.Data; +import java.util.List; + +@Data +public class QcCheckDto { + + private List QC_CHECK_QC_NAME; + private List QC_CHECK_QC_VALUE; + private List QC_CHECK_QC_STANDARD; + private List QC_CHECK_QC_RESULT; +} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmAnalysisLogController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmAnalysisLogController.java index 254d36cd..3a50ec0e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmAnalysisLogController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmAnalysisLogController.java @@ -36,7 +36,7 @@ public class AlarmAnalysisLogController extends JeecgController byTime(@RequestParam String startDate, @RequestParam String endDate) { if (StrUtil.isBlank(startDate) || StrUtil.isBlank(endDate)) - return Result.error(Prompt.PARAM_REQUIRED); + return Result.error("StartDate Or EndDate" + Prompt.PARAM_REQUIRED); return Result.OK(service.byTime(startDate, endDate)); } @@ -45,7 +45,7 @@ public class AlarmAnalysisLogController extends JeecgController byStatoin(@RequestParam String startDate, @RequestParam String endDate) { if (StrUtil.isBlank(startDate) || StrUtil.isBlank(endDate)) - return Result.error(Prompt.PARAM_REQUIRED); + return Result.error("StartDate Or EndDate" + Prompt.PARAM_REQUIRED); return Result.OK(service.byStatoin(startDate, endDate)); } @@ -54,7 +54,7 @@ public class AlarmAnalysisLogController extends JeecgController bySource(@RequestParam String startDate, @RequestParam String endDate) { if (StrUtil.isBlank(startDate) || StrUtil.isBlank(endDate)) - return Result.error(Prompt.PARAM_REQUIRED); + return Result.error("StartDate Or EndDate" + Prompt.PARAM_REQUIRED); return Result.OK(service.bySource(startDate, endDate)); } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedAutoMapper.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedAutoMapper.java new file mode 100644 index 00000000..4d856645 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedAutoMapper.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.jeecg.modules.base.entity.rnauto.GardsNuclLinesIded; +import org.jeecg.modules.base.entity.rnauto.GardsPeaks; + +@Mapper +public interface GardsNuclLinesIdedAutoMapper extends BaseMapper { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsPeaksAutoMapper.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsPeaksAutoMapper.java new file mode 100644 index 00000000..6ca67087 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsPeaksAutoMapper.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.jeecg.modules.base.entity.rnauto.GardsPeaks; + +@Mapper +public interface GardsPeaksAutoMapper extends BaseMapper { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsQcCheckAutoMapper.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsQcCheckAutoMapper.java new file mode 100644 index 00000000..39b54a23 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/mapper/GardsQcCheckAutoMapper.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.jeecg.modules.base.entity.rnauto.GardsQcCheck; + +@Mapper +public interface GardsQcCheckAutoMapper extends BaseMapper { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsNuclLinesIdedAutoService.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsNuclLinesIdedAutoService.java new file mode 100644 index 00000000..b13fb9a4 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsNuclLinesIdedAutoService.java @@ -0,0 +1,9 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnauto.GardsNuclLinesIded; +import org.jeecg.modules.base.entity.rnauto.GardsPeaks; + +public interface GardsNuclLinesIdedAutoService extends IService { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsPeaksAutoService.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsPeaksAutoService.java new file mode 100644 index 00000000..99367865 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsPeaksAutoService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnauto.GardsPeaks; + +public interface GardsPeaksAutoService extends IService { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsQcCheckAutoService.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsQcCheckAutoService.java new file mode 100644 index 00000000..d6d852e3 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/GardsQcCheckAutoService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnauto.GardsQcCheck; + +public interface GardsQcCheckAutoService extends IService { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationServiceImpl.java new file mode 100644 index 00000000..1d06073a --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationServiceImpl.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.base.entity.rnauto.GardsCalibration; +import org.jeecg.modules.base.entity.rnauto.GardsCalibrationPairs; +import org.jeecg.modules.mapper.GardsCalibrationMapper; +import org.jeecg.modules.mapper.GardsCalibrationPairsMapper; +import org.jeecg.modules.service.GardsCalibrationService; +import org.springframework.stereotype.Service; + +@Service +@DS("ora") +public class GardsCalibrationServiceImpl extends ServiceImpl implements GardsCalibrationService { + + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedAutoServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedAutoServiceImpl.java new file mode 100644 index 00000000..7d4bc1ab --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedAutoServiceImpl.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.service.impl; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.base.entity.rnauto.GardsNuclLinesIded; +import org.jeecg.modules.mapper.GardsNuclLinesIdedAutoMapper; +import org.jeecg.modules.service.GardsNuclLinesIdedAutoService; +import org.springframework.stereotype.Service; + +@Service +@DS("ora") +public class GardsNuclLinesIdedAutoServiceImpl extends ServiceImpl implements GardsNuclLinesIdedAutoService { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsPeaksAutoServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsPeaksAutoServiceImpl.java new file mode 100644 index 00000000..a327caf7 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsPeaksAutoServiceImpl.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.service.impl; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.base.entity.rnauto.GardsPeaks; +import org.jeecg.modules.mapper.GardsPeaksAutoMapper; +import org.jeecg.modules.service.GardsPeaksAutoService; +import org.springframework.stereotype.Service; + +@Service +@DS("ora") +public class GardsPeaksAutoServiceImpl extends ServiceImpl implements GardsPeaksAutoService { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsQcCheckAutoServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsQcCheckAutoServiceImpl.java new file mode 100644 index 00000000..e00d3ce9 --- /dev/null +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsQcCheckAutoServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.service.impl; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.base.entity.rnauto.GardsNuclLinesIded; +import org.jeecg.modules.base.entity.rnauto.GardsQcCheck; +import org.jeecg.modules.mapper.GardsNuclLinesIdedAutoMapper; +import org.jeecg.modules.mapper.GardsQcCheckAutoMapper; +import org.jeecg.modules.service.GardsNuclLinesIdedAutoService; +import org.jeecg.modules.service.GardsQcCheckAutoService; +import org.springframework.stereotype.Service; + +@Service +@DS("ora") +public class GardsQcCheckAutoServiceImpl extends ServiceImpl implements GardsQcCheckAutoService { + +} diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java index 7658a2c6..4105cc05 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java @@ -1,26 +1,22 @@ package org.jeecg.modules.spectrum; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import org.jeecg.common.constant.DateConstant; import org.jeecg.common.constant.Setting; -import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib; +import org.jeecg.modules.base.dto.GardsNuclIdedDto; +import org.jeecg.modules.base.dto.QcCheckDto; import org.jeecg.modules.base.entity.original.GardsSampleData; -import org.jeecg.modules.base.entity.rnauto.GardsAnalyses; -import org.jeecg.modules.base.entity.rnauto.GardsCalibrationPairs; -import org.jeecg.modules.base.entity.rnauto.GardsRoiChannels; -import org.jeecg.modules.base.vo.GStoreMiddleProcessData; -import org.jeecg.modules.base.vo.PHDFile; -import org.jeecg.modules.base.vo.SpecSetup; +import org.jeecg.modules.base.entity.rnauto.*; +import org.jeecg.modules.base.vo.*; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; - -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.lang.reflect.Field; +import java.util.*; @Data public class Sample_G_Analysis { @@ -45,17 +41,42 @@ public class Sample_G_Analysis { /* 准备Gamma分析需要的数据 */ PHDFile phdFile = getSettingFromDB(); - // 从MiddleData获取需要的数据 - GStoreMiddleProcessData middleData = new GStoreMiddleProcessData(); - String calibrationSampleType = middleData.getCalibration_sample_type(); - String calibrationPairsECaltype = middleData.getCalibration_pairs_E_Caltype(); - String calibrationPairsEInput = middleData.getCalibration_pairs_E_Input(); - List calibrationPairsEIdCalPoint = middleData.getCalibration_pairs_E_idCalPoint(); - List calibrationPairsEXValue = middleData.getCalibration_pairs_E_xValue(); - List calibrationPairsEYValue = middleData.getCalibration_pairs_E_yValue(); - List calibrationPairsEUncYValue = middleData.getCalibration_pairs_E_uncYValue(); + Map fieldMap = fieldMap(); - // 保存分析结果(Gards_Analyses) + /** 从MiddleData获取需要的数据 **/ + GStoreMiddleProcessData middleData = new GStoreMiddleProcessData(); + String pairsSampleType = middleData.getCalibration_pairs_sample_type(); + String calibrationSampleType = middleData.getCalibration_sample_type(); + // Energy + String pairsECaltype = middleData.getCalibration_pairs_E_Caltype(); + String pairsEInput = middleData.getCalibration_pairs_E_Input(); + List pairsEIdCalPoint = middleData.getCalibration_pairs_E_idCalPoint(); + List pairsEXValue = middleData.getCalibration_pairs_E_xValue(); + List pairsEYValue = middleData.getCalibration_pairs_E_yValue(); + List pairsEUncYValue = middleData.getCalibration_pairs_E_uncYValue(); + // Efficiency + String pairsEfCaltype = middleData.getCalibration_pairs_EF_Caltype(); + String pairsEfInput = middleData.getCalibration_pairs_EF_Input(); + List pairsEfIdCalPoint = middleData.getCalibration_pairs_EF_idCalPoint(); + List pairsEfXValue = middleData.getCalibration_pairs_EF_xValue(); + List pairsEfYValue = middleData.getCalibration_pairs_EF_yValue(); + List pairsEfUncYValue = middleData.getCalibration_pairs_EF_uncYValue(); + // Resolution + String pairsRCaltype = middleData.getCalibration_pairs_R_Caltype(); + String pairsRInput = middleData.getCalibration_pairs_R_Input(); + List pairsRIdCalPoint = middleData.getCalibration_pairs_R_idCalPoint(); + List pairsRXValue = middleData.getCalibration_pairs_R_xValue(); + List pairsRYValue = middleData.getCalibration_pairs_R_yValue(); + List pairsRUncYValue = middleData.getCalibration_pairs_R_uncYValue(); + // TotalEfficiency + String pairsTCaltype = middleData.getCalibration_pairs_T_Caltype(); + String pairsTInput = middleData.getCalibration_pairs_T_Input(); + List pairsTIdCalPoint = middleData.getCalibration_pairs_T_idCalPoint(); + List pairsTXValue = middleData.getCalibration_pairs_T_xValue(); + List pairsTYValue = middleData.getCalibration_pairs_T_yValue(); + List pairsTUncYValue = middleData.getCalibration_pairs_T_uncYValue(); + + // 保存分析结果 ==> INSERT INTO RNAUTO.GARDS_ANALYSES GardsAnalyses analysis = toAnalysis(middleData); Integer sampleId = sampleData.getSampleId(); analysis.setSampleId(sampleId); @@ -64,18 +85,254 @@ public class Sample_G_Analysis { Integer IdAnalysis = serviceQuotes.getAnalysesService().getIdAnalysis(sampleId); // ==> UPDATE ORIGINAL.GARDS_SAMPLE_DATA serviceQuotes.getSampleDataService().updateStatus(null,null); - // ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS + // Energy ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS GardsCalibrationPairs calibrationPairs = new GardsCalibrationPairs(); calibrationPairs.setSampleId(sampleId); calibrationPairs.setIdAnalysis(IdAnalysis); - calibrationPairs.setSampleType(calibrationSampleType); - calibrationPairs.setCaltype(calibrationPairsECaltype); - calibrationPairs.setInput(calibrationPairsEInput); + calibrationPairs.setSampleType(pairsSampleType); + calibrationPairs.setCaltype(pairsECaltype); + calibrationPairs.setInput(pairsEInput); calibrationPairs.setIdCalPoint(null); calibrationPairs.setXValue(null); calibrationPairs.setYValue(null); calibrationPairs.setUncYValue(null); serviceQuotes.getGardsCalibrationPairsService().save(calibrationPairs); + // Efficiency ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS + calibrationPairs.setCaltype(pairsEfCaltype); + calibrationPairs.setInput(pairsEfInput); + calibrationPairs.setIdCalPoint(null); + calibrationPairs.setXValue(null); + calibrationPairs.setYValue(null); + calibrationPairs.setUncYValue(null); + serviceQuotes.getGardsCalibrationPairsService().save(calibrationPairs); + // Resolution ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS + calibrationPairs.setCaltype(pairsRCaltype); + calibrationPairs.setInput(pairsRInput); + calibrationPairs.setIdCalPoint(null); + calibrationPairs.setXValue(null); + calibrationPairs.setYValue(null); + calibrationPairs.setUncYValue(null); + serviceQuotes.getGardsCalibrationPairsService().save(calibrationPairs); + // TotalEfficiency ==> INSERT INTO RNAUTO.GARDS_CALIBRATION_PAIRS + calibrationPairs.setCaltype(pairsTCaltype); + calibrationPairs.setInput(pairsTInput); + calibrationPairs.setIdCalPoint(null); + calibrationPairs.setXValue(null); + calibrationPairs.setYValue(null); + calibrationPairs.setUncYValue(null); + serviceQuotes.getGardsCalibrationPairsService().save(calibrationPairs); + // E ==> INSERT INTO RNAUTO.GARDS_CALIBRATION + GardsCalibration calibration = new GardsCalibration(); + calibration.setSampleId(sampleId); + calibration.setIdAnalysis(IdAnalysis); + calibration.setSampleType(calibrationSampleType); + if (CollUtil.isNotEmpty(pairsEIdCalPoint)){ + String eCaltype = middleData.getCalibration_E_Caltype(); + double eFunction = middleData.getCalibration_E_function(); + String eFunctionDef = middleData.getCalibration_E_functionDef(); + double eStartOfRange = middleData.getCalibration_E_startOfRange(); + double eEndOfRange = middleData.getCalibration_E_endOfRange(); + String eCoeffString = middleData.getCalibration_E_coeff_string(); + calibration.setCalType(eCaltype); + calibration.setFunction((int)eFunction); + calibration.setFunctionDef(eFunctionDef); + calibration.setStartOfRange((int)eStartOfRange); + calibration.setEndOfRange((int)eEndOfRange); + calibration.setCoeffString(eCoeffString); + serviceQuotes.getGardsCalibrationService().save(calibration); + } + // EF ==> INSERT INTO RNAUTO.GARDS_CALIBRATION + if (CollUtil.isNotEmpty(pairsEfIdCalPoint)){ + String efCaltype = middleData.getCalibration_EF_Caltype(); + double efFunction = middleData.getCalibration_EF_function(); + String efFunctionDef = middleData.getCalibration_EF_functionDef(); + double efStartOfRange = middleData.getCalibration_EF_startOfRange(); + double efEndOfRange = middleData.getCalibration_EF_endOfRange(); + String efCoeffString = middleData.getCalibration_EF_coeff_string(); + calibration.setCalType(efCaltype); + calibration.setFunction((int)efFunction); + calibration.setFunctionDef(efFunctionDef); + calibration.setStartOfRange((int)efStartOfRange); + calibration.setEndOfRange((int)efEndOfRange); + calibration.setCoeffString(efCoeffString); + serviceQuotes.getGardsCalibrationService().save(calibration); + } + // R ==> INSERT INTO RNAUTO.GARDS_CALIBRATION + if (CollUtil.isNotEmpty(pairsRIdCalPoint)){ + String rCaltype = middleData.getCalibration_R_Caltype(); + double rFunction = middleData.getCalibration_R_function(); + String rFunctionDef = middleData.getCalibration_R_functionDef(); + double rStartOfRange = middleData.getCalibration_R_startOfRange(); + double rEndOfRange = middleData.getCalibration_R_endOfRange(); + String rCoeffString = middleData.getCalibration_R_coeff_string(); + calibration.setCalType(rCaltype); + calibration.setFunction((int)rFunction); + calibration.setFunctionDef(rFunctionDef); + calibration.setStartOfRange((int)rStartOfRange); + calibration.setEndOfRange((int)rEndOfRange); + calibration.setCoeffString(rCoeffString); + serviceQuotes.getGardsCalibrationService().save(calibration); + } + // T ==> INSERT INTO RNAUTO.GARDS_CALIBRATION + if (CollUtil.isNotEmpty(pairsTIdCalPoint)){ + String tCaltype = middleData.getCalibration_T_Caltype(); + double tFunction = middleData.getCalibration_T_function(); + String tFunctionDef = middleData.getCalibration_T_functionDef(); + double tStartOfRange = middleData.getCalibration_T_startOfRange(); + double tEndOfRange = middleData.getCalibration_T_endOfRange(); + String tCoeffString = middleData.getCalibration_T_coeff_string(); + calibration.setCalType(tCaltype); + calibration.setFunction((int)tFunction); + calibration.setFunctionDef(tFunctionDef); + calibration.setStartOfRange((int)tStartOfRange); + calibration.setEndOfRange((int)tEndOfRange); + calibration.setCoeffString(tCoeffString); + serviceQuotes.getGardsCalibrationService().save(calibration); + } + // Gards_Peaks数据表 ==> INSERT INTO RNAUTO.GARDS_PEAKS + List idPeak = middleData.getPeaks_idPeak(); + if (CollUtil.isNotEmpty(idPeak)){ + List peakCentroid = middleData.getPeaks_peakCentroid(); + List uncpeakCentroid = middleData.getPeaks_uncpeakCentroid(); + List energy = middleData.getPeaks_Energy(); + List uncEnergy = middleData.getPeaks_uncEnergy(); + List area = middleData.getPeaks_Area(); + List areaErr = middleData.getPeaks_areaErr(); + List efficiency = middleData.getPeaks_Efficiency(); + List uncefficiency = middleData.getPeaks_Uncefficiency(); + List fwhm = middleData.getPeaks_Fwhm(); + List fwhmc = middleData.getPeaks_Fwhmc(); + List significance = middleData.getPeaks_Significance(); + List sensitivity = middleData.getPeaks_Sensitivity(); + List multiIndex = middleData.getPeaks_multiIndex(); + List roIstart = middleData.getPeaks_ROIstart(); + List roIend = middleData.getPeaks_ROIend(); + List tail = middleData.getPeaks_tail(); + List tailAlpha = middleData.getPeaks_tailAlpha(); + List upperTail = middleData.getPeaks_upperTail(); + List upperTailAlpha = middleData.getPeaks_upperTailAlpha(); + List bwWidthChan = middleData.getPeaks_BWWidthChan(); + List recoilDeltaChan = middleData.getPeaks_recoilDeltaChan(); + List stepRatio = middleData.getPeaks_stepRatio(); + List backgroundArea = middleData.getPeaks_backgroundArea(); + List meanBackCount = middleData.getPeaks_meanBackCount(); + List lc = middleData.getPeaks_Lc(); + List ld = middleData.getPeaks_Ld(); + List netCountRate = middleData.getPeaks_netCountRate(); + List uncNetCountRate = middleData.getPeaks_uncNetCountRate(); + List peaks = new ArrayList<>(); + for (int i = 0; i < idPeak.size(); i++) { + GardsPeaks peak = new GardsPeaks(); + peak.setSampleId(sampleId); + peak.setIdAnalysis(IdAnalysis); + if (StrUtil.isNotBlank(idPeak.get(i))) + peak.setIdPeak(Integer.valueOf(idPeak.get(i))); + if (StrUtil.isNotBlank(peakCentroid.get(i))) + peak.setCentroidChannel(Double.valueOf(peakCentroid.get(i))); + if (StrUtil.isNotBlank(uncpeakCentroid.get(i))) + peak.setUncCentroidChannel(Double.valueOf(uncpeakCentroid.get(i))); + if (StrUtil.isNotBlank(energy.get(i))) + peak.setEnergy(Double.valueOf(energy.get(i))); + if (StrUtil.isNotBlank(uncEnergy.get(i))) + peak.setUncEnergy(Double.valueOf(uncEnergy.get(i))); + if (StrUtil.isNotBlank(area.get(i))) + peak.setArea(Double.valueOf(area.get(i))); + if (StrUtil.isNotBlank(areaErr.get(i))) + peak.setUncArea(Double.valueOf(areaErr.get(i))); + if (StrUtil.isNotBlank(efficiency.get(i))) + peak.setEfficiency(Double.valueOf(efficiency.get(i))); + if (StrUtil.isNotBlank(uncefficiency.get(i))) + peak.setUncefficiency(Double.valueOf(uncefficiency.get(i))); + if (StrUtil.isNotBlank(fwhm.get(i))) + peak.setFwhm(Double.valueOf(fwhm.get(i))); + if (StrUtil.isNotBlank(fwhmc.get(i))) + peak.setFwtm(Double.valueOf(fwhmc.get(i))); + if (StrUtil.isNotBlank(significance.get(i))) + peak.setSignificance(Double.valueOf(significance.get(i))); + if (StrUtil.isNotBlank(sensitivity.get(i))) + peak.setSensitivity(Double.valueOf(sensitivity.get(i))); + if (StrUtil.isNotBlank(multiIndex.get(i))) + peak.setMulitiIndex(Double.valueOf(multiIndex.get(i))); + if (StrUtil.isNotBlank(roIstart.get(i))) + peak.setRoiStart(Double.valueOf(roIstart.get(i))); + if (StrUtil.isNotBlank(roIend.get(i))) + peak.setRoiEnd(Double.valueOf(roIend.get(i))); + if (StrUtil.isNotBlank(tail.get(i))) + peak.setTail(Double.valueOf(tail.get(i))); + if (StrUtil.isNotBlank(tailAlpha.get(i))) + peak.setTailAlpha(Double.valueOf(tailAlpha.get(i))); + if (StrUtil.isNotBlank(upperTail.get(i))) + peak.setUpperTail(Double.valueOf(upperTail.get(i))); + if (StrUtil.isNotBlank(upperTailAlpha.get(i))) + peak.setUpperTailAlpha(Double.valueOf(upperTailAlpha.get(i))); + if (StrUtil.isNotBlank(bwWidthChan.get(i))) + peak.setBwwidthchan(Double.valueOf(bwWidthChan.get(i))); + if (StrUtil.isNotBlank(recoilDeltaChan.get(i))) + peak.setRecoildeltachan(Double.valueOf(recoilDeltaChan.get(i))); + if (StrUtil.isNotBlank(stepRatio.get(i))) + peak.setStepraio(Double.valueOf(stepRatio.get(i))); + if (StrUtil.isNotBlank(backgroundArea.get(i))) + peak.setBackgroundarea(Double.valueOf(backgroundArea.get(i))); + if (StrUtil.isNotBlank(meanBackCount.get(i))) + peak.setMeanbackcount(Double.valueOf(meanBackCount.get(i))); + if (StrUtil.isNotBlank(lc.get(i))) + peak.setLc(Double.valueOf(lc.get(i))); + if (StrUtil.isNotBlank(ld.get(i))) + peak.setLd(Double.valueOf(ld.get(i))); + if (StrUtil.isNotBlank(netCountRate.get(i))) + peak.setNetCountRate(Double.valueOf(netCountRate.get(i))); + if (StrUtil.isNotBlank(uncNetCountRate.get(i))) + peak.setUncNetCountRate(Double.valueOf(uncNetCountRate.get(i))); + peaks.add(peak); + } + serviceQuotes.getGardsPeaksAutoService().saveBatch(peaks); + } + // Gards_Nucl_Lines_Ided数据表 ==> INSERT INTO RNAUTO.GARDS_NUCL_LINES_IDED + Map nuclLinesIdedData = middleData.getNucl_lines_ided_data(); + String base_idPeak = "idPeak"; + List allNuclLinesIdeds = new ArrayList<>(); + for (Map.Entry entry : nuclLinesIdedData.entrySet()) { + String nuclideName = entry.getKey(); + GStoreMiddleProcessDataNuclLinesIded nuclLinesIded = entry.getValue(); + GardsNuclLinesIded gardsNuclLinesIded = new GardsNuclLinesIded(); + List gardsNuclLinesIdeds = + mapFields(nuclLinesIded, gardsNuclLinesIded, base_idPeak, fieldMap); + if (CollUtil.isNotEmpty(gardsNuclLinesIdeds)){ + for (GardsNuclLinesIded ided : gardsNuclLinesIdeds) { + ided.setSampleId(sampleId); + ided.setIdAnalysis(IdAnalysis); + ided.setNuclideName(nuclideName); + } + allNuclLinesIdeds.addAll(gardsNuclLinesIdeds); + } + } + serviceQuotes.getGardsNuclLinesIdedAutoService().saveBatch(allNuclLinesIdeds); + // Gards_Nucl_Ided数据表 ==> INSERT INTO RNAUTO.GARDS_NUCL_IDED + GardsNuclIdedDto gardsNuclIdedDto = new GardsNuclIdedDto(); + GardsNuclIded gardsNuclIded = new GardsNuclIded(); + BeanUtil.copyProperties(middleData,gardsNuclIdedDto); + String base_nuclideName = "nucl_ided_Nuclidename"; + List gardsNuclIdeds = + mapFields(gardsNuclIdedDto, gardsNuclIded, base_nuclideName, fieldMap); + for (GardsNuclIded ided : gardsNuclIdeds) { + ided.setSampleId(sampleId); + ided.setIdAnalysis(IdAnalysis); + } + // serviceQuotes.get + // Gards_Qc_Check数据表 ==> INSERT INTO RNAUTO.GARDS_QC_CHECK + Map qcItems = phdFile.getQcItems(); + if (MapUtil.isNotEmpty(qcItems)){ + String base_QC = String.valueOf(qcItems.size()); + QcCheckDto qcCheckDto = new QcCheckDto(); + BeanUtil.copyProperties(middleData,qcCheckDto); + GardsQcCheck gardsQcCheck = new GardsQcCheck(); + List gardsQcChecks = mapFields(qcCheckDto, gardsQcCheck,base_QC,fieldMap); + for (GardsQcCheck qcCheck : gardsQcChecks) { + qcCheck.setSampleId(sampleId); + qcCheck.setIdanalysis(IdAnalysis); + } + serviceQuotes.getGardsQcCheckAutoService().saveBatch(gardsQcChecks); + } } @@ -84,7 +341,49 @@ public class Sample_G_Analysis { } public void getNuclideLinesP(){ - + + } + + public Map fieldMap(){ + Map fieldMap = new HashMap<>(); + // Gards_Nucl_Lines_Ided + fieldMap.put("nuclideFullname","nuclidefullname"); + fieldMap.put("Energy","energy"); + fieldMap.put("Abundance","abundance"); + fieldMap.put("Activity","activity"); + fieldMap.put("Effic","effic"); + fieldMap.put("uncEffic","unEffic"); + fieldMap.put("Mda","mda"); + fieldMap.put("key_flag","keyFlag"); + fieldMap.put("csc_ratio","cscRatio"); + fieldMap.put("csc_ratio_err","cscRatioErr"); + fieldMap.put("csc_mod_flag","cscModFlag"); + fieldMap.put("MDC","mdc"); + fieldMap.put("Concentration","concentration"); + // Gards_Nucl_Ided + fieldMap.put("nucl_ided_Nucidename","nuclideName"); + fieldMap.put("nucl_ided_Type","type"); + fieldMap.put("nucl_ided_Halflife","halflife"); + fieldMap.put("nucl_ided_ave_activ","aveActiv"); + fieldMap.put("nucl_ided_ave_activ_err","aveActivErr"); + fieldMap.put("nucl_ided_activ_key","activKey"); + fieldMap.put("nucl_ided_activ_key_err","activKeyErr"); + fieldMap.put("nucl_ided_mda","mda"); + fieldMap.put("nucl_ided_mda_err","mdaErr"); + fieldMap.put("nucl_ided_nid_flag","nidFlag"); + fieldMap.put("nucl_ided_csc_ratio","cscRatio"); + fieldMap.put("nucl_ided_csc_ratio_err","cscRatioErr"); + fieldMap.put("nucl_ided_csc_mod_flag","cscModFlag"); + fieldMap.put("nucl_ided_MDC","mdc"); + fieldMap.put("nucl_ided_Concentration","concentration"); + fieldMap.put("nucl_ided_Key_Energy","keyEnergy"); + fieldMap.put("nucl_ided_Key_Yield","keyYield"); + // Gards_Qc_Check + fieldMap.put("QC_CHECK_QC_NAME","qcName"); + fieldMap.put("QC_CHECK_QC_VALUE","qcValue"); + fieldMap.put("QC_CHECK_QC_STANDARD","qcStandard"); + fieldMap.put("QC_CHECK_QC_RESULT","qcResult"); + return fieldMap; } public PHDFile getSettingFromDB(){ @@ -172,4 +471,57 @@ public class Sample_G_Analysis { gardsAnalyses.setReportPath(middleData.getAnalyses_ReportPath()); return gardsAnalyses; } + + public static List mapFields(T1 source, T2 tartget, String baseLine, Map fieldMap) { + try { + List result = new ArrayList<>(); + Class sourceClass = source.getClass(); + boolean isNumber = NumberUtil.isNumber(baseLine); + int total; + if (isNumber){ + total = Integer.parseInt(baseLine); + }else { + List baseList = (List) sourceClass.getDeclaredField(baseLine).get(source); + if (CollUtil.isEmpty(baseList)) + return result; + total = baseList.size(); + } + Class tartgetClass = (Class) tartget.getClass(); + Field[] sourceFields = sourceClass.getDeclaredFields(); + for (int i = 0; i < total; i++) { + tartget = tartgetClass.newInstance(); + for (Field sourceField : sourceFields) { + sourceField.setAccessible(true); + List sourceList = (List) sourceField.get(source); + if (CollUtil.isEmpty(sourceList)) + continue; + if (sourceList.size() <= i) + continue; + String value = sourceList.get(i); + if (StrUtil.isNotBlank(value)){ + String sourceFieldName = sourceField.getName(); + String targetFieldName = fieldMap.get(sourceFieldName); + targetFieldName = StrUtil.isBlank(targetFieldName) ? sourceFieldName : targetFieldName; + Field tartgetField = tartgetClass.getDeclaredField(targetFieldName); + tartgetField.setAccessible(true); + Class type = tartgetField.getType(); + if (type == String.class) { + tartgetField.set(tartget, value); + } else if (type == Integer.class || type == int.class) { + tartgetField.set(tartget,Integer.valueOf(value)); + } else if (type == Double.class || type == double.class) { + tartgetField.set(tartget,Double.valueOf(value)); + } else if (type == Boolean.class || type == boolean.class) { + tartgetField.set(tartget, Boolean.valueOf(value)); + } + } + } + result.add(tartget); + } + return result; + } catch (Exception e) { + e.printStackTrace(); + return new ArrayList<>(); + } + } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java index dd9632cd..2a495bee 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java @@ -50,5 +50,13 @@ public class SpectrumServiceQuotes { private final IGardsGammaDefaultParamsService gammaDefaultParamsService; + private final GardsCalibrationService gardsCalibrationService; + private final GardsCalibrationPairsService gardsCalibrationPairsService; + + private final GardsPeaksAutoService gardsPeaksAutoService; + + private final GardsNuclLinesIdedAutoService gardsNuclLinesIdedAutoService; + + private final GardsQcCheckAutoService gardsQcCheckAutoService; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java index e9b67c63..2f7f16b2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java @@ -1,9 +1,12 @@ package org.jeecg.modules.system.controller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.base.entity.configuration.GardsNuclLib; import org.jeecg.modules.system.service.IGardsNuclLibService; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(value = "核素信息库管理",tags = "核素信息库管理") @@ -11,4 +14,9 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("gardsNuclLib") public class GardsNuclLibController extends JeecgController { + @ApiOperation(value = "核素名称列表",tags = "核素名称列表") + @GetMapping("allName") + public Result allName(){ + return Result.OK(service.allName()); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java index 3b27c6ab..e6cca6bc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java @@ -34,22 +34,24 @@ public class SysDefaultNuclideController extends JeecgController findPage(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam Integer useType) { - return service.queryNuclideByType(pageNo, pageSize, useType); + Integer useType, String nuclideType) { + return service.queryNuclideByType(pageNo, pageSize, useType,nuclideType); } @ApiOperation(value = "核素名称列表", notes = "核素名称列表") @GetMapping(value = "/allName") - public Result allName(@RequestParam Integer useType) { - return service.allName(useType); + public Result allName(Integer useType, String nuclideType) { + return service.allName(useType, nuclideType); } @ApiOperation(value = "添加核素配置信息", notes = "添加添加核素配置信息") @RequiresRoles("admin") - @PostMapping(value = "/add") - public Result add(@RequestBody List nuclides) { - return service.add(nuclides); + @GetMapping(value = "/add") + public Result add(@RequestParam List nuclideNames, + @RequestParam String nuclideType, + @RequestParam Integer useType) { + return service.add(nuclideNames, nuclideType, useType); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclLibMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclLibMapper.java index c0f9ab21..ade09797 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclLibMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclLibMapper.java @@ -10,4 +10,6 @@ import java.util.List; public interface GardsNuclLibMapper extends BaseMapper { List halfLife(List nuclideNames); + + List allName(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsNuclLibMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsNuclLibMapper.xml index c6dda156..241bde80 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsNuclLibMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsNuclLibMapper.xml @@ -17,4 +17,7 @@ + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclLibService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclLibService.java index b090c865..583ff439 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclLibService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclLibService.java @@ -9,4 +9,6 @@ import java.util.Map; public interface IGardsNuclLibService extends IService { Map halfLife(List nuclideNames); + + List allName(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDefaultNuclideService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDefaultNuclideService.java index d84ac765..88d38a04 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDefaultNuclideService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDefaultNuclideService.java @@ -15,11 +15,11 @@ import java.util.Map; */ public interface ISysDefaultNuclideService extends IService { - Result queryNuclideByType(Integer pageNo, Integer pageSize, Integer useType); + Result queryNuclideByType(Integer pageNo, Integer pageSize, Integer useType,String nuclideType); - Result allName(Integer useType); + Result allName(Integer useType, String nuclideType); - Result add(List nuclides); + Result add(List nuclideNames,String nuclideType,Integer useType); Map> mapLines(String nuclideType); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java index 3f1b1438..ebe158d5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.base.dto.GardsNuclLibDto; @@ -29,4 +30,10 @@ public class GardsNuclLibServiceImpl extends ServiceImpl allName() { + return baseMapper.allName().stream().filter(StrUtil::isNotBlank) + .collect(Collectors.toList()); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDefaultNuclideServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDefaultNuclideServiceImpl.java index 5d47630d..d90f723f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDefaultNuclideServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDefaultNuclideServiceImpl.java @@ -41,18 +41,20 @@ public class SysDefaultNuclideServiceImpl extends ServiceImpl queryNuclideByType(Integer pageNo, Integer pageSize, Integer useType) { + public Result queryNuclideByType(Integer pageNo, Integer pageSize, Integer useType,String nuclideType) { Page page = new Page<>(pageNo, pageSize); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(null != useType, SysDefaultNuclide::getUseType, useType); - IPage result = this.page(page, queryWrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(useType), SysDefaultNuclide::getUseType, useType); + wrapper.eq(StrUtil.isNotBlank(nuclideType),SysDefaultNuclide::getNuclideType,nuclideType); + IPage result = this.page(page, wrapper); return Result.OK(result); } @Override - public Result allName(Integer useType) { + public Result allName(Integer useType, String nuclideType) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysDefaultNuclide::getUseType,useType); + wrapper.eq(ObjectUtil.isNotNull(useType),SysDefaultNuclide::getUseType,useType); + wrapper.eq(StrUtil.isNotBlank(nuclideType),SysDefaultNuclide::getNuclideType,nuclideType); List allName = list(wrapper).stream() .map(SysDefaultNuclide::getNuclideName) .collect(Collectors.toList()); @@ -60,21 +62,24 @@ public class SysDefaultNuclideServiceImpl extends ServiceImpl add(List nuclides) { - if (CollUtil.isEmpty(nuclides)) - return Result.error(Prompt.PARAM_NOT_EMPTY); - Integer useType = nuclides.get(0).getUseType(); - List type = ListUtil.toList(1, 2); - if (ObjectUtil.isNotNull(useType) && type.contains(useType)){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysDefaultNuclide::getUseType,useType); - remove(wrapper); + public Result add(List nuclideNames,String nuclideType,Integer useType) { + if (CollUtil.isEmpty(nuclideNames)) + return Result.error(Prompt.PARAM_NOT_EMPTY); + if (StrUtil.isBlank(nuclideType)) + return Result.error("nuclideType" + Prompt.PARAM_REQUIRED); + if (ObjectUtil.isNull(useType)) + return Result.error("useType" + Prompt.PARAM_REQUIRED); + List SysDefaultNuclides = new ArrayList<>(); + for (String nuclideName : nuclideNames) { + SysDefaultNuclide sysDefaultNuclide = new SysDefaultNuclide(); + sysDefaultNuclide.setNuclideName(nuclideName); + sysDefaultNuclide.setNuclideType(nuclideType); + sysDefaultNuclide.setUseType(useType); + SysDefaultNuclides.add(sysDefaultNuclide); } - boolean success = saveBatch(nuclides); - if (success){ - mapLines2Redis(); + boolean success = saveBatch(SysDefaultNuclides); + if (success) return Result.OK(Prompt.ADD_SUCC); - } return Result.error(Prompt.ADD_ERR); }