From 9567ab3f604d5aaacb91582900a95261d7232140 Mon Sep 17 00:00:00 2001 From: panbaolin <13071138970@163.com> Date: Tue, 27 May 2025 15:57:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=EF=BC=8C=E9=80=82=E9=85=8Dpostgresql=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=B7=BB=E5=8A=A0C++=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=BA=93=E5=B0=91=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/entity/configuration/GardsDetectors.java | 3 ++- .../modules/base/entity/configuration/GardsStations.java | 3 ++- .../jeecg/modules/base/entity/original/GardsAlertData.java | 2 +- .../jeecg/modules/base/entity/original/GardsGPSData.java | 4 +++- .../jeecg/modules/base/entity/original/GardsMetData.java | 2 +- .../jeecg/modules/base/entity/original/GardsSampleData.java | 2 +- .../jeecg/modules/base/entity/original/GardsSohData.java | 2 +- .../org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java | 2 +- .../org/jeecg/modules/base/entity/rnman/GardsAnalyses.java | 4 +++- .../modules/native_jni/struct/EnergySpectrumStruct.java | 6 ++++++ 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java index 32d317ed..808a742c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java @@ -1,5 +1,6 @@ package org.jeecg.modules.base.entity.configuration; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -22,7 +23,7 @@ public class GardsDetectors implements Serializable { /** * 探测器id */ - @TableId(value = "DETECTOR_ID") + @TableId(type = IdType.INPUT) private Integer detectorId; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java index ba3f18fc..e2fd123c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java @@ -1,5 +1,6 @@ package org.jeecg.modules.base.entity.configuration; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,7 +22,7 @@ public class GardsStations implements Serializable { /** * 台站id */ - @TableId("STATION_ID") + @TableId(type = IdType.INPUT) @NotNull(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class}) private Integer stationId; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java index c6b4bd04..6e9f2ac7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java @@ -22,7 +22,7 @@ public class GardsAlertData implements Serializable { @TableField(value = "STATION_CODE") private String stationCode; - @TableId(value = "ALERT_ID",type = IdType.AUTO) + @TableId(type = IdType.AUTO) private Integer alertId; @TableField(value = "TIME") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java index 9d791634..1dc30618 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsGPSData.java @@ -1,6 +1,8 @@ package org.jeecg.modules.base.entity.original; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -19,7 +21,7 @@ public class GardsGPSData implements Serializable { @TableField(value = "STATION_CODE") private String stationCode; - @TableField(value = "GPS_ID") + @TableId(type = IdType.AUTO) private Integer gpsId; @TableField(value = "LON") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java index 18db6daf..7b43eb29 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsMetData.java @@ -31,7 +31,7 @@ public class GardsMetData implements Serializable { /** * 气象数据id */ - @TableId(value = "MET_ID",type = IdType.AUTO) + @TableId(type = IdType.AUTO) private Integer metId; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java index 9f58693d..3fcf91b7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java @@ -27,7 +27,7 @@ public class GardsSampleData implements Serializable { * 样品id */ - @TableId(value = "SAMPLE_ID",type = IdType.AUTO) + @TableId(type = IdType.AUTO) private Integer sampleId; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java index c5747b8d..5ea7f678 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSohData.java @@ -31,7 +31,7 @@ public class GardsSohData implements Serializable { /** * 报警ID号 */ - @TableId(value = "SOH_ID",type = IdType.AUTO) + @TableId(type = IdType.AUTO) @Excel(name = "SID",orderNum = "5") private Integer sohId; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java index 025d2fcf..c2e3b102 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsAnalyses.java @@ -21,7 +21,7 @@ public class GardsAnalyses implements Serializable { /** * 分析ID号 */ - @TableId(value = "IDANALYSIS",type = IdType.AUTO) + @TableId(value = "idanalysis",type = IdType.AUTO) private Integer idAnalysis; /** * 样品id diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java index 3bd28574..9fef1880 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsAnalyses.java @@ -1,6 +1,8 @@ package org.jeecg.modules.base.entity.rnman; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -20,7 +22,7 @@ public class GardsAnalyses implements Serializable { /** * 分析ID号 */ - @TableField(value = "IDANALYSIS") + @TableId(value = "idanalysis",type = IdType.AUTO) private Integer idAnalysis; /** * 样品id diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java index d0279728..96452499 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java @@ -222,6 +222,12 @@ public class EnergySpectrumStruct { public int b_r_record_count; /************************* g_Efficiency Block ******************/ + + /** + * γ -nuclide + */ + public List g_e_nuclide_name; + /** * γ -energy (keV) */