1.修改实体类主键，适配postgresql

2.修改自动处理工程，添加C++动态库少的字段

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;
 
     /**

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;
 

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")

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")

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;
 
     /**

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;
 
     /**

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;
 

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

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

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<String> g_e_nuclide_name;
+
     /**
      * γ -energy (keV)
      */