From 165f009892855f52c77498d25ee8a9cff12c9233 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Wed, 8 Jul 2026 14:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A2=E6=B5=8B=E5=99=A8?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=8F=8A=E8=81=94=E7=AC=A6=E5=90=88=E6=A0=A1?= =?UTF-8?q?=E6=AD=A3=E5=9B=A0=E5=AD=90=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/GardsCorrectionFactor.java | 5 ++ .../GardsCorrectionFactorDetail.java | 67 +++++++++++++++ .../GardsCorrectionFactorEff.java | 67 +++++++++++++++ .../GardsCorrectionFactorDetailMapper.java | 25 ++++++ .../GardsCorrectionFactorEffMapper.java | 36 ++++++++ .../xml/GardsCorrectionFactorDetailMapper.xml | 85 +++++++++++++++++++ .../xml/GardsCorrectionFactorEffMapper.xml | 85 +++++++++++++++++++ .../jeecg/modules/base/vo/DetectorMapDTO.java | 10 +++ .../modules/base/vo/DetectorOptionVO.java | 14 +++ .../vo/GardsCorrectionFactorDetailVO.java | 18 ++++ .../base/vo/GardsCorrectionFactorEffVO.java | 16 ++++ .../modules/base/vo/StationOptionVO.java | 14 +++ 12 files changed, 442 insertions(+) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorDetail.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorEff.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorDetailMapper.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorEffMapper.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorDetailMapper.xml create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorEffMapper.xml create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorMapDTO.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorOptionVO.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorDetailVO.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorEffVO.java create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StationOptionVO.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java index 4bbd2a6..74c83e9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java @@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 探测器模拟及联符合校正因子库数据 @@ -89,4 +90,8 @@ public class GardsCorrectionFactor implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date moddate; + + + @TableField(exist = false) + private List details; } \ No newline at end of file diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorDetail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorDetail.java new file mode 100644 index 0000000..e475763 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorDetail.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.base.entity.configuration; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 探测器模拟及联符合校正因子库数据---校正因子 + * + */ +@Data +@TableName("CONFIGURATION.GARDS_CORRECTION_FACTOR_DETAIL") +public class GardsCorrectionFactorDetail { + + /** + * 校正因子ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Integer id; + + /** + * 台站ID + */ + @TableField(value = "STATION_ID") + private Integer stationId; + + /** + * 探测器ID + */ + @TableField(value = "DETECTOR_ID") + private Integer detectorId; + + /** + * 能量 + */ + @Excel(name = "核素", width = 20, height = 20, orderNum = "1") + @TableField(value = "NUCLIDE_NAME") + private String nuclideName; + + /** + * 能量 + */ + @Excel(name = "能量", width = 20, height = 20, orderNum = "2") + @TableField(value = "ENERGY") + private Double energy; + + /** + * 校正因子 + */ + @Excel(name = "校正因子", width = 20, height = 20, orderNum = "3") + @TableField(value = "CORRECTION_FACTOR") + private Double correctionFactor; + + /** + * 修改时间 + */ + @TableField(value = "MODDATE", fill = FieldFill.INSERT_UPDATE) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date moddate; + +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorEff.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorEff.java new file mode 100644 index 0000000..300f01c --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactorEff.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.base.entity.configuration; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 探测器模拟及联符合校正因子库数据---效率 + * + */ +@Data +@TableName("CONFIGURATION.GARDS_CORRECTION_FACTOR_EFF") +public class GardsCorrectionFactorEff { + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Integer id; + /** + * 台站ID + */ + @TableField(value = "STATION_ID") + private Integer stationId; + + /** + * 探测器ID + */ + @TableField(value = "DETECTOR_ID") + private Integer detectorId; + + /** + * 峰效率 + */ + @Excel(name = "峰效率", width = 20, height = 20, orderNum = "1") + @TableField(value = "PEAK_EFFICIENCY") + private Double peakEfficiency; + + /** + * 总效率 + */ + @Excel(name = "总效率", width = 20, height = 20, orderNum = "2") + @TableField(value = "TOTAL_EFFICIENCY") + private Double totalEfficiency; + + /** + * 能量 + */ + @Excel(name = "能量", width = 20, height = 20, orderNum = "3") + @TableField(value = "ENERGY") + private Double energy; + + + /** + * 修改时间 + */ + @TableField(value = "MODDATE", fill = FieldFill.INSERT_UPDATE) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date moddate; + +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorDetailMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorDetailMapper.java new file mode 100644 index 0000000..27eeacd --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorDetailMapper.java @@ -0,0 +1,25 @@ +package org.jeecg.modules.base.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.base.entity.configuration.GardsCorrectionFactorDetail; +import org.jeecg.modules.base.vo.GardsCorrectionFactorDetailVO; + +import java.util.List; +import java.util.Map; + +public interface GardsCorrectionFactorDetailMapper extends BaseMapper { + IPage selectCombinedPage( + Page page,@Param("stationCode")String stationCode,@Param("detectorCode") String detectorCode,@Param("nuclideName") String nuclideName); + + List findList(@Param("stationCode")String stationCode,@Param("detectorCode") String detectorCode,@Param("nuclideName") String nuclideName); + + List>selectStations(); + + List>selectdetectors(); + +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorEffMapper.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorEffMapper.java new file mode 100644 index 0000000..dc15b47 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/GardsCorrectionFactorEffMapper.java @@ -0,0 +1,36 @@ +package org.jeecg.modules.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.jeecg.modules.base.entity.configuration.GardsCorrectionFactorEff; +import org.jeecg.modules.base.vo.DetectorMapDTO; +import org.jeecg.modules.base.vo.DetectorOptionVO; +import org.jeecg.modules.base.vo.GardsCorrectionFactorEffVO; +import org.jeecg.modules.base.vo.StationOptionVO; + +import java.util.List; + +public interface GardsCorrectionFactorEffMapper extends BaseMapper { + + IPage selectCombinedPage( + Page page, + @Param("stationCode") String stationCode, @Param("detectorCode") String detectorCode); + + List selectVOList(@Param("stationCode") String stationCode, + @Param("detectorCode") String detectorCode); + + @Select("SELECT DETECTOR_ID, DETECTOR_CODE, STATION_ID FROM CONFIGURATION.GARDS_DETECTORS") + List queryAllDetectorRef(); + + + // 获取所有站点 + List getStationOptions(); + + // 根据站点联动获取探测器 + List getDetectorOptions(@Param("stationId")Long stationId); + + +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorDetailMapper.xml b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorDetailMapper.xml new file mode 100644 index 0000000..1a54c4f --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorDetailMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + \ No newline at end of file diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorEffMapper.xml b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorEffMapper.xml new file mode 100644 index 0000000..a602b1a --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/GardsCorrectionFactorEffMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorMapDTO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorMapDTO.java new file mode 100644 index 0000000..9fe7bb2 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorMapDTO.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.base.vo; + +import lombok.Data; + +@Data +public class DetectorMapDTO { + private Integer detectorId; + private String detectorCode; + private Integer stationId; +} \ No newline at end of file diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorOptionVO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorOptionVO.java new file mode 100644 index 0000000..873ee2b --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/DetectorOptionVO.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.base.vo; + +import lombok.Data; + +@Data +public class DetectorOptionVO { + private Long detectorId; + private String detectorCode; + + public DetectorOptionVO(Long detectorId, String detectorCode) { + this.detectorId = detectorId; + this.detectorCode = detectorCode; + } +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorDetailVO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorDetailVO.java new file mode 100644 index 0000000..0a2df92 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorDetailVO.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.base.vo; + +import lombok.Data; +import org.jeecg.modules.base.entity.configuration.GardsCorrectionFactorDetail; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class GardsCorrectionFactorDetailVO extends GardsCorrectionFactorDetail implements Serializable { + + @Excel(name = "台站编码", orderNum = "0") + private String stationCode; + + @Excel(name = "探测器编码", orderNum = "0") + private String detectorCode; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorEffVO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorEffVO.java new file mode 100644 index 0000000..9e733c1 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GardsCorrectionFactorEffVO.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.base.vo; + +import lombok.Data; +import org.jeecg.modules.base.entity.configuration.GardsCorrectionFactorEff; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +@Data +public class GardsCorrectionFactorEffVO extends GardsCorrectionFactorEff implements Serializable { + @Excel(name = "台站编码", orderNum = "0") + private String stationCode; + + @Excel(name = "探测器编码", orderNum = "0") + private String detectorCode; +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StationOptionVO.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StationOptionVO.java new file mode 100644 index 0000000..5d66873 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StationOptionVO.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.base.vo; + +import lombok.Data; + +@Data +public class StationOptionVO { + private Long stationId; + private String stationCode; + + public StationOptionVO(Long stationId, String stationCode) { + this.stationId = stationId; + this.stationCode = stationCode; + } +}