diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java index 4de641f8..fe64e70d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java @@ -1,22 +1,19 @@ package org.jeecg.modules.base.vo; -import lombok.Data; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; -@Data public class BgCalibratePara implements Serializable { - private List b_e_cal; //b 能刻度系数 - private List g_e_cal; //g 能刻度系数 - private int b_e_cal_flag; //b 自计算刻度系数配置 - private int g_e_cal_flag; //g 自计算刻度系数配置 - private boolean bApplyNewCalicSample; // 界面交互新刻度应用 - private boolean bApplyNewCalicDetBg; - private boolean bApplyNewCalicGasBg; - private boolean bApplyNewCalicQc; + public List b_e_cal; //b 能刻度系数 + public List g_e_cal; //g 能刻度系数 + public int b_e_cal_flag; //b 自计算刻度系数配置 + public int g_e_cal_flag; //g 自计算刻度系数配置 + public boolean bApplyNewCalicSample; // 界面交互新刻度应用 + public boolean bApplyNewCalicDetBg; + public boolean bApplyNewCalicGasBg; + public boolean bApplyNewCalicQc; public BgCalibratePara() { b_e_cal = new LinkedList<>(); g_e_cal = new LinkedList<>(); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java index 4e24f435..5f211756 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java @@ -1,20 +1,19 @@ package org.jeecg.modules.base.vo; -import lombok.Data; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; -@Data public class SpectrumGroup implements Serializable { - private String SampleSpectrumFile; - private String GasBgSpectrumFile; - private String DetBgSpectrumFile; - private BgCalibratePara BgCalPara; - private List b_c2e; - private List g_c2e; + public String SampleSpectrumFile; + public String GasBgSpectrumFile; + public String DetBgSpectrumFile; + public BgCalibratePara BgCalPara; + public List b_c2e; + public List g_c2e; + + public Integer sampleId; public SpectrumGroup(){ BgCalPara = new BgCalibratePara(); @@ -23,3 +22,4 @@ public class SpectrumGroup implements Serializable { } } + diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index 45eb4a63..d62cac46 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -8,6 +8,7 @@ import org.jeecg.modules.base.vo.AnalyseData; import org.jeecg.modules.base.vo.FittingBody; import org.jeecg.modules.base.vo.StatisticsQueryData; import org.jeecg.modules.entity.GardsSampleDataSpectrum; +import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn; import org.jeecg.modules.service.ISpectrumAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; @@ -178,7 +179,7 @@ public class SpectrumAnalysesController { } @PostMapping("saveToDB") - public Result saveToDB(BgDataAnlyseResultIn anlyseResultIn){ + public Result saveToDB(@RequestBody BgDataAnlyseResultIn anlyseResultIn){ return spectrumAnalysisService.saveToDB(anlyseResultIn); } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java index 8ddef91c..acf974c2 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java @@ -1,6 +1,5 @@ package org.jeecg.modules.native_jni; -import org.jeecg.modules.entity.vo.SpectrumGroup; import org.jeecg.modules.native_jni.struct.BgAnalyseResult; import org.jeecg.modules.native_jni.struct.BgBoundary; import org.jeecg.modules.native_jni.struct.CalcBgBoundaryParam; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index df9eadce..4ee22fe7 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -4,6 +4,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.GardsSampleDataSpectrum; import org.jeecg.modules.base.vo.*; +import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index eef32599..e8258c3d 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -19,6 +19,7 @@ import org.jeecg.modules.base.entity.original.*; import org.jeecg.modules.base.enums.*; import org.jeecg.modules.base.vo.*; import org.jeecg.modules.entity.*; +import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn; import org.jeecg.modules.mapper.SpectrumAnalysisMapper; import org.jeecg.modules.native_jni.EnergySpectrumHandler; import org.jeecg.modules.native_jni.struct.BgAnalyseResult;