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

MDC分析结果存储改为字符串格式与数据库格式匹配

Browse Source
This commit is contained in:
qiaoqinzheng 2024-01-16 19:01:08 +08:00
parent e33fc8df83
commit 1452be8f31
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsMDC.java
View File

@ -32,10 +32,10 @@ public class GardsMDC implements Serializable {
private Double efficiency; private Double efficiency;
@TableField(value = "MDC") @TableField(value = "MDC")
private Double mdc; private String mdc;
@TableField(value = "MDC_ERR") @TableField(value = "MDC_ERR")
private Double mdcErr; private String mdcErr;
@TableField(value = "MODDATE") @TableField(value = "MODDATE")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsMDC.java
View File

@ -32,10 +32,10 @@ public class GardsMDC implements Serializable {
private Double efficiency; private Double efficiency;
@TableField(value = "MDC") @TableField(value = "MDC")
private Double mdc; private String mdc;
@TableField(value = "MDC_ERR") @TableField(value = "MDC_ERR")
private Double mdcErr; private String mdcErr;
@TableField(value = "MODDATE") @TableField(value = "MODDATE")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

2
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
View File

@ -888,7 +888,7 @@ public class Sample_G_Analysis {
mdc.setYield(mdcInfo.getYield()); mdc.setYield(mdcInfo.getYield());
mdc.setEfficiency(mdcInfo.getEfficiency()); mdc.setEfficiency(mdcInfo.getEfficiency());
if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) { if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) {
mdc.setMdc(mdcInfo.getMdc()); mdc.setMdc(String.valueOf(mdcInfo.getMdc()));
} else { } else {
mdc.setMdc(null); mdc.setMdc(null);
} }

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

@ -32,7 +32,7 @@ public class GardsMDCSpectrumServiceImpl extends ServiceImpl<GardsMDCSpectrumMap
mdc.setYield(mdcInfo.getYield()); mdc.setYield(mdcInfo.getYield());
mdc.setEfficiency(mdcInfo.getEfficiency()); mdc.setEfficiency(mdcInfo.getEfficiency());
if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) { if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) {
mdc.setMdc(mdcInfo.getMdc()); mdc.setMdc(String.valueOf(mdcInfo.getMdc()));
} else { } else {
mdc.setMdc(null); mdc.setMdc(null);
} }