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
new file mode 100644
index 0000000..9d2c872
--- /dev/null
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleData.java
@@ -0,0 +1,198 @@
+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;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("ORIGINAL.GARDS_SAMPLE_DATA")
+public class GardsSampleData implements Serializable {
+
+    /**
+     *  探测器编码
+     */
+    @Excel(name = "DETECTOR CODE",orderNum = "3",width = 20)
+    @TableField(value = "SITE_DET_CODE")
+    private String siteDetCode;
+
+    /**
+     *  样品id
+     */
+
+    @TableId(type = IdType.AUTO)
+    private Integer sampleId;
+
+    /**
+     *  台站id
+     */
+    @TableField(value = "STATION_ID")
+    private Integer stationId;
+
+    /**
+     *  探测器id
+     */
+
+    @TableField(value = "DETECTOR_ID")
+    private Integer detectorId;
+
+    /**
+     *  导入文件名称
+     */
+
+    @TableField(value = "INPUT_FILE_NAME")
+    private String inputFileName;
+
+    /**
+     *  系统类型（P : particulate; B :gas with 3-D β-γ coincidence detection; G :all other gas systems (high-resolution
+     * γ-spectrometry or 2-D β-γ coincidence
+     * detection)）
+     */
+
+    @TableField(value = "SAMPLE_TYPE")
+    private String sampleType;
+
+    /**
+     *  数据类型（S：SAMPLEPHD
+     * B：BLANKPHD
+     * D：DETBKPHD
+     * G：GASBKPHD
+     * C：CALIBPHD
+     * Q：QCPHD）
+     */
+
+    @TableField(value = "DATA_TYPE")
+    private String dataType;
+
+    /**
+     *  几何尺寸
+     */
+    @TableField(value = "GEOMETRY")
+    private String geometry;
+
+    /**
+     *  能谱限定符: 过程谱(PREL) 和 全谱(FULL)
+     */
+    @Excel(name = "SPECTRAL QUALIFIER",orderNum = "4",width = 30)
+    @TableField(value = "SPECTRAL_QUALIFIE")
+    private String spectralQualifie;
+
+    /**
+     *  报文发送日期
+     */
+    @TableField(value = "TRANSMIT_DTG")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date transmitDtg;
+
+    /**
+     *  样品采集开始时间
+     */
+    @TableField(value = "COLLECT_START")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "COLLECTION START TIME",format = "yyyy-MM-dd HH:mm:ss",orderNum = "5",width = 30)
+    private Date collectStart;
+
+    /**
+     *  样品采集结束时间
+     */
+    @TableField(value = "COLLECT_STOP")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "COLLECTION STOP TIME",format = "yyyy-MM-dd HH:mm:ss",orderNum = "6",width = 30)
+    private Date collectStop;
+
+    /**
+     *  样品测量开始时间
+     */
+    @TableField(value = "ACQUISITION_START")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "ACQUISITION START TIME",format = "yyyy-MM-dd HH:mm:ss",orderNum = "5",width = 30)
+    private Date acquisitionStart;
+
+    /**
+     *  样品测量结束时间
+     */
+    @TableField(value = "ACQUISITION_STOP")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "ACQUISITION STOP TIME",format = "yyyy-MM-dd HH:mm:ss",orderNum = "6",width = 30)
+    private Date acquisitionStop;
+
+    /**
+     *  能谱获取实时间
+     */
+
+    @TableField(value = "ACQUISITION_REAL_SEC")
+    private Double acquisitionRealSec;
+
+    /**
+     *  能谱获取活时间
+     */
+
+    @TableField(value = "ACQUISITION_LIVE_SEC")
+    private Double acquisitionLiveSec;
+
+    /**
+     *  采样量（立方米）
+     */
+
+    @TableField(value = "QUANTITY")
+    private Double quantity;
+
+    /**
+     *  样品处理状态
+     */
+
+    @TableField(value = "STATUS")
+    private String status;
+
+    /**
+     *  样品级别
+     */
+
+    @TableField(value = "RNAUTO_GRADING")
+    private Integer rnautoGarding;
+
+    /**
+     *  样品级别
+     */
+
+    @TableField(value = "RNMAN_GRADING")
+    private Integer rnmanGarding;
+
+    /**
+     *  样品阈值
+     */
+
+    @TableField(value = "RNAUTO_THRESHOLD")
+    private String rnautoThreshold;
+
+    /**
+     *  样品阈值
+     */
+
+    @TableField(value = "RNMAN_THRESHOLD")
+    private String rnmanThreshold;
+
+
+    /**
+     *  操作时间
+     */
+    @TableField(value = "MODDATE")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date moddate;
+
+
+}
\ No newline at end of file
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java
new file mode 100644
index 0000000..6daa7ec
--- /dev/null
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsNuclIded.java
@@ -0,0 +1,119 @@
+package org.jeecg.modules.base.entity.rnauto;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *  存储gamma谱中识别到的核素计算结果。
+ */
+@Data
+@TableName("RNAUTO.GARDS_NUCL_IDED")
+public class GardsNuclIded implements Serializable {
+
+    /**
+     *  样品id
+     */
+    @TableField(value = "SAMPLE_ID")
+    private Integer sampleId;
+    /**
+     *  分析ID号
+     */
+    @TableField(value = "IDANALYSIS")
+    private Integer idAnalysis;
+    /**
+     *  核素名称
+     */
+    @TableField(value = "NUCLIDENAME")
+    private String nuclideName;
+    /**
+     *  核素类型
+     */
+    @TableField(value = "TYPE")
+    private String type;
+    /**
+     *  核素半衰期
+     */
+    @TableField(value = "HALFLIFE")
+    private String halflife;
+    /**
+     *  平均活度值
+     */
+    @TableField(value = "AVE_ACTIV")
+    private String aveActiv;
+    /**
+     *  平均活度值不确定度
+     */
+    @TableField(value = "AVE_ACTIV_ERR")
+    private Double aveActivErr;
+    /**
+     *  主射线活度值
+     */
+    @TableField(value = "ACTIV_KEY")
+    private Double activKey;
+    /**
+     *  主射线活度值不确定度
+     */
+    @TableField(value = "ACTIV_KEY_ERR")
+    private Double activKeyErr;
+    /**
+     *  核素的最小可探测活度
+     */
+    @TableField(value = "MDA")
+    private String mda;
+    /**
+     *  核素的最小可探测活度不确定度
+     */
+    @TableField(value = "MDA_ERR")
+    private Double mdaErr;
+    /**
+     *  核素识别标志
+     */
+    @TableField(value = "NID_FLAG")
+    private Integer nidFlag;
+
+    @TableField(value = "ACTIV_DECAY")
+    private Double activDecay;
+
+    @TableField(value = "ACTIV_DECAY_ERR")
+    private Double activDecayErr;
+    /**
+     * 符合相加校正因子（无设为1）
+     */
+    @TableField(value = "CSC_RATIO")
+    private Double cscRatio;
+    /**
+     * 符合相加校正因子不确定度（无设为0）
+     */
+    @TableField(value = "CSC_RATIO_ERR")
+    private Double cscRatioErr;
+    /**
+     * 活度是否经过符合相加校正
+     */
+    @TableField(value = "CSC_MOD_FLAG")
+    private Integer cscModFlag;
+
+    @TableField(value = "MODDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
+
+    @TableField(value = "MDC")
+    private String mdc;
+
+    @TableField(value = "CONCENTRATION")
+    private String concentration;
+
+    @TableField(value = "KEY_ENERGY")
+    private String keyEnergy;
+
+    @TableField(value = "KEY_YIELD")
+    private String keyYield;
+
+}
\ No newline at end of file
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java
new file mode 100644
index 0000000..fc99ec2
--- /dev/null
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnauto/GardsXeResults.java
@@ -0,0 +1,64 @@
+package org.jeecg.modules.base.entity.rnauto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *  存储β-γ符合谱最终分析结果。
+ */
+@Data
+@TableName("RNAUTO.GARDS_XE_RESULTS")
+public class GardsXeResults implements Serializable {
+
+    /**
+     *  样品id
+     */
+    @TableField(value = "SAMPLE_ID")
+    private Integer sampleId;
+    /**
+     *  分析ID号
+     */
+    @TableField(value = "IDANALYSIS")
+    private Integer idAnalysis;
+    /**
+     *  核素名称
+     */
+    @TableField(value = "NUCLIDE_NAME")
+    private String nuclideName;
+    /**
+     *  感兴趣区活度浓度
+     */
+    @TableField(value = "CONC")
+    private Double conc;
+    /**
+     *  感兴趣区活度浓度不确定度
+     */
+    @TableField(value = "CONC_ERR")
+    private Double concErr;
+    /**
+     *  感兴趣区MDC
+     */
+    @TableField(value = "MDC")
+    private Double mdc;
+    /**
+     *  感兴趣区LC
+     */
+    @TableField(value = "LC")
+    private Double lc;
+    /**
+     *  感兴趣区识别标示；1：识别到，0，未识别到
+     */
+    @TableField(value = "NID_FLAG")
+    private Integer nidFlag;
+
+    @TableField(value = "MODDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
+}
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java
new file mode 100644
index 0000000..a432abe
--- /dev/null
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsNuclIded.java
@@ -0,0 +1,118 @@
+package org.jeecg.modules.base.entity.rnman;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *  存储gamma谱中识别到的核素计算结果。
+ */
+@Data
+@TableName("RNMAN.GARDS_NUCL_IDED")
+public class GardsNuclIded implements Serializable {
+
+    /**
+     *  样品id
+     */
+    @TableField(value = "SAMPLE_ID")
+    private Integer sampleId;
+    /**
+     *  分析ID号
+     */
+    @TableField(value = "IDANALYSIS")
+    private Integer idAnalysis;
+    /**
+     *  核素名称
+     */
+    @TableField(value = "NUCLIDENAME")
+    private String nuclideName;
+    /**
+     *  核素类型
+     */
+    @TableField(value = "TYPE")
+    private String type;
+    /**
+     *  核素半衰期
+     */
+    @TableField(value = "HALFLIFE")
+    private String halflife;
+    /**
+     *  平均活度值
+     */
+    @TableField(value = "AVE_ACTIV")
+    private String aveActiv;
+    /**
+     *  平均活度值不确定度
+     */
+    @TableField(value = "AVE_ACTIV_ERR")
+    private Double aveActivErr;
+    /**
+     *  主射线活度值
+     */
+    @TableField(value = "ACTIV_KEY")
+    private Double activKey;
+    /**
+     *  主射线活度值不确定度
+     */
+    @TableField(value = "ACTIV_KEY_ERR")
+    private Double activKeyErr;
+    /**
+     *  核素的最小可探测活度
+     */
+    @TableField(value = "MDA")
+    private String mda;
+    /**
+     *  核素的最小可探测活度不确定度
+     */
+    @TableField(value = "MDA_ERR")
+    private Double mdaErr;
+    /**
+     *  核素识别标志
+     */
+    @TableField(value = "NID_FLAG")
+    private Integer nidFlag;
+
+    @TableField(value = "ACTIV_DECAY")
+    private Double activDecay;
+
+    @TableField(value = "ACTIV_DECAY_ERR")
+    private Double activDecayErr;
+    /**
+     * 符合相加校正因子（无设为1）
+     */
+    @TableField(value = "CSC_RATIO")
+    private Double cscRatio;
+    /**
+     * 符合相加校正因子不确定度（无设为0）
+     */
+    @TableField(value = "CSC_RATIO_ERR")
+    private Double cscRatioErr;
+    /**
+     * 活度是否经过符合相加校正
+     */
+    @TableField(value = "CSC_MOD_FLAG")
+    private Integer cscModFlag;
+
+    @TableField(value = "MODDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
+
+    @TableField(value = "MDC")
+    private String mdc;
+
+    @TableField(value = "CONCENTRATION")
+    private String concentration;
+
+    @TableField(value = "KEY_ENERGY")
+    private String keyEnergy;
+
+    @TableField(value = "KEY_YIELD")
+    private String keyYield;
+}
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java
new file mode 100644
index 0000000..a5ff2e0
--- /dev/null
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/rnman/GardsXeResults.java
@@ -0,0 +1,65 @@
+package org.jeecg.modules.base.entity.rnman;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *  存储β-γ符合谱最终分析结果。
+ */
+@Data
+@TableName("RNMAN.GARDS_XE_RESULTS")
+public class GardsXeResults implements Serializable {
+
+    /**
+     *  样品id
+     */
+    @TableField(value = "SAMPLE_ID")
+    private Integer sampleId;
+    /**
+     *  分析ID号
+     */
+    @TableField(value = "IDANALYSIS")
+    private Integer idAnalysis;
+    /**
+     *  核素名称
+     */
+    @TableField(value = "NUCLIDE_NAME")
+    private String nuclideName;
+    /**
+     *  感兴趣区活度浓度
+     */
+    @TableField(value = "CONC")
+    private Double conc;
+    /**
+     *  感兴趣区活度浓度不确定度
+     */
+    @TableField(value = "CONC_ERR")
+    private Double concErr;
+    /**
+     *  感兴趣区MDC
+     */
+    @TableField(value = "MDC")
+    private Double mdc;
+    /**
+     *  感兴趣区LC
+     */
+    @TableField(value = "LC")
+    private Double lc;
+    /**
+     *  感兴趣区识别标示；1：识别到，0，未识别到
+     */
+    @TableField(value = "NID_FLAG")
+    private Integer nidFlag;
+
+    @TableField(value = "MODDATE")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date moddate;
+}
diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/GardsThresholdResultHis.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/GardsThresholdResultHis.java
new file mode 100644
index 0000000..90210cd
--- /dev/null
+++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/GardsThresholdResultHis.java
@@ -0,0 +1,18 @@
+package org.jeecg.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GardsThresholdResultHis {
+    private String id;
+    private String stationId;
+    private String nuclideName;
+    private double thresholdValue;
+    private double median;
+    private double percentile25;
+    private double percentile75;
+    private Date calculationTime;
+    private Long idAnalysis;
+}