From 1452be8f318a0432d922317d4675239d571c3826 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 16 Jan 2024 19:01:08 +0800 Subject: [PATCH] =?UTF-8?q?MDC=E5=88=86=E6=9E=90=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=94=B9=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/base/entity/rnauto/GardsMDC.java | 4 ++-- .../java/org/jeecg/modules/base/entity/rnman/GardsMDC.java | 4 ++-- .../java/org/jeecg/modules/spectrum/Sample_G_Analysis.java | 2 +- .../modules/service/impl/GardsMDCSpectrumServiceImpl.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsMDC.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsMDC.java index 2dac8a62..640ee416 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsMDC.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsMDC.java @@ -32,10 +32,10 @@ public class GardsMDC implements Serializable { private Double efficiency; @TableField(value = "MDC") - private Double mdc; + private String mdc; @TableField(value = "MDC_ERR") - private Double mdcErr; + private String mdcErr; @TableField(value = "MODDATE") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsMDC.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsMDC.java index 72052994..59f77159 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsMDC.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsMDC.java @@ -32,10 +32,10 @@ public class GardsMDC implements Serializable { private Double efficiency; @TableField(value = "MDC") - private Double mdc; + private String mdc; @TableField(value = "MDC_ERR") - private Double mdcErr; + private String mdcErr; @TableField(value = "MODDATE") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") 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 ce1c6a2e..d93a28ec 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 @@ -888,7 +888,7 @@ public class Sample_G_Analysis { mdc.setYield(mdcInfo.getYield()); mdc.setEfficiency(mdcInfo.getEfficiency()); if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) { - mdc.setMdc(mdcInfo.getMdc()); + mdc.setMdc(String.valueOf(mdcInfo.getMdc())); } else { mdc.setMdc(null); } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsMDCSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsMDCSpectrumServiceImpl.java index 298ea55f..11f69a0e 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsMDCSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsMDCSpectrumServiceImpl.java @@ -32,7 +32,7 @@ public class GardsMDCSpectrumServiceImpl extends ServiceImpl