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

实体类修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-09-01 15:32:53 +08:00
parent a1c64c5f26
commit 0a2c847b7a
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java
View File

@ -1,22 +1,19 @@
package org.jeecg.modules.base.vo; package org.jeecg.modules.base.vo;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@Data
public class BgCalibratePara implements Serializable { public class BgCalibratePara implements Serializable {
private List<Double> b_e_cal; //b 能刻度系数 public List<Double> b_e_cal; //b 能刻度系数
private List<Double> g_e_cal; //g 能刻度系数 public List<Double> g_e_cal; //g 能刻度系数
private int b_e_cal_flag; //b 自计算刻度系数配置 public int b_e_cal_flag; //b 自计算刻度系数配置
private int g_e_cal_flag; //g 自计算刻度系数配置 public int g_e_cal_flag; //g 自计算刻度系数配置
private boolean bApplyNewCalicSample; // 界面交互新刻度应用 public boolean bApplyNewCalicSample; // 界面交互新刻度应用
private boolean bApplyNewCalicDetBg; public boolean bApplyNewCalicDetBg;
private boolean bApplyNewCalicGasBg; public boolean bApplyNewCalicGasBg;
private boolean bApplyNewCalicQc; public boolean bApplyNewCalicQc;
public BgCalibratePara() { public BgCalibratePara() {
b_e_cal = new LinkedList<>(); b_e_cal = new LinkedList<>();
g_e_cal = new LinkedList<>(); g_e_cal = new LinkedList<>();

18
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java
View File

@ -1,20 +1,19 @@
package org.jeecg.modules.base.vo; package org.jeecg.modules.base.vo;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@Data
public class SpectrumGroup implements Serializable { public class SpectrumGroup implements Serializable {
private String SampleSpectrumFile; public String SampleSpectrumFile;
private String GasBgSpectrumFile; public String GasBgSpectrumFile;
private String DetBgSpectrumFile; public String DetBgSpectrumFile;
private BgCalibratePara BgCalPara; public BgCalibratePara BgCalPara;
private List<Double> b_c2e; public List<Double> b_c2e;
private List<Double> g_c2e; public List<Double> g_c2e;
public Integer sampleId;
public SpectrumGroup(){ public SpectrumGroup(){
BgCalPara = new BgCalibratePara(); BgCalPara = new BgCalibratePara();
@ -23,3 +22,4 @@ public class SpectrumGroup implements Serializable {
} }
} }

3
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
View File

@ -8,6 +8,7 @@ import org.jeecg.modules.base.vo.AnalyseData;
import org.jeecg.modules.base.vo.FittingBody; import org.jeecg.modules.base.vo.FittingBody;
import org.jeecg.modules.base.vo.StatisticsQueryData; import org.jeecg.modules.base.vo.StatisticsQueryData;
import org.jeecg.modules.entity.GardsSampleDataSpectrum; import org.jeecg.modules.entity.GardsSampleDataSpectrum;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.service.ISpectrumAnalysisService; import org.jeecg.modules.service.ISpectrumAnalysisService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -178,7 +179,7 @@ public class SpectrumAnalysesController {
} }
@PostMapping("saveToDB") @PostMapping("saveToDB")
public Result saveToDB(BgDataAnlyseResultIn anlyseResultIn){ public Result saveToDB(@RequestBody BgDataAnlyseResultIn anlyseResultIn){
return spectrumAnalysisService.saveToDB(anlyseResultIn); return spectrumAnalysisService.saveToDB(anlyseResultIn);
} }

1
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java
View File

@ -1,6 +1,5 @@
package org.jeecg.modules.native_jni; 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.BgAnalyseResult;
import org.jeecg.modules.native_jni.struct.BgBoundary; import org.jeecg.modules.native_jni.struct.BgBoundary;
import org.jeecg.modules.native_jni.struct.CalcBgBoundaryParam; import org.jeecg.modules.native_jni.struct.CalcBgBoundaryParam;

1
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
View File

@ -4,6 +4,7 @@ import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.GardsSampleDataSpectrum; import org.jeecg.modules.entity.GardsSampleDataSpectrum;
import org.jeecg.modules.base.vo.*; import org.jeecg.modules.base.vo.*;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;

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

@ -19,6 +19,7 @@ import org.jeecg.modules.base.entity.original.*;
import org.jeecg.modules.base.enums.*; import org.jeecg.modules.base.enums.*;
import org.jeecg.modules.base.vo.*; import org.jeecg.modules.base.vo.*;
import org.jeecg.modules.entity.*; import org.jeecg.modules.entity.*;
import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn;
import org.jeecg.modules.mapper.SpectrumAnalysisMapper; import org.jeecg.modules.mapper.SpectrumAnalysisMapper;
import org.jeecg.modules.native_jni.EnergySpectrumHandler; import org.jeecg.modules.native_jni.EnergySpectrumHandler;
import org.jeecg.modules.native_jni.struct.BgAnalyseResult; import org.jeecg.modules.native_jni.struct.BgAnalyseResult;