diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StatisticsResult.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StatisticsResult.java index 99ab72cf..1a324542 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StatisticsResult.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StatisticsResult.java @@ -2,6 +2,8 @@ package org.jeecg.modules.base.entity; import lombok.Data; +import java.util.Date; + @Data public class StatisticsResult { private String nuclideName; @@ -9,4 +11,5 @@ public class StatisticsResult { private Double percentile25; // 25分位数 private Double percentile75; // 75分位数 private int dataCount; // 有效数据量 + private Date collectStop; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetric.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetric.java index 7a62d360..a91ce1d3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetric.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetric.java @@ -3,11 +3,15 @@ package org.jeecg.modules.base.entity; import lombok.Data; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Data public class ThresholdMetric implements Serializable { - private Integer stationId; - private Integer sampleId; - private String nuclideName; - private String concentration; + private Integer stationId;//站点ID + private Integer sampleId;//样品ID + private String nuclideName;//核素名称 + private String concentration;//浓度值 + private Date collectStop;//采集停止时间 + private List concentrations;// 浓度列表 } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetricResults.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetricResults.java new file mode 100644 index 00000000..88f6fb1e --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/ThresholdMetricResults.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.base.entity; + +import lombok.Data; + +import java.util.Date; +import java.util.List; +@Data +public class ThresholdMetricResults { + private Integer stationId;//站点ID + private String nuclideName;//核素名称 + private Date collectStop;//采集停止时间 + private List concentrations;// 浓度列表 +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/TransportTaskCloseStatusEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/TransportTaskCloseStatusEnum.java new file mode 100644 index 00000000..01079c6c --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/TransportTaskCloseStatusEnum.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.base.enums; + +public enum TransportTaskCloseStatusEnum { + + /** + * 未关闭 + */ + NOT_CLOSED(0), + /** + * 已关闭 + */ + CLOSE(1); + + private Integer value; + + TransportTaskCloseStatusEnum(Integer value) { + this.value = value; + } + + public Integer getValue(){ + return this.value; + } +} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/TransportTaskStatusEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/TransportTaskStatusEnum.java new file mode 100644 index 00000000..da51225b --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/TransportTaskStatusEnum.java @@ -0,0 +1,35 @@ +package org.jeecg.modules.base.enums; + +public enum TransportTaskStatusEnum { + + /** + * 执行失败 + */ + FAILURE(-1), + /** + * 未开始 + */ + NOT_STARTED(0), + /** + * 执行中 + */ + IN_OPERATION(1), + /** + * 已完成 + */ + COMPLETED(2), + /** + * 缺少气象数据 + */ + LACK_MET_DATA(3); + + private Integer value; + + TransportTaskStatusEnum(Integer value) { + this.value = value; + } + + public Integer getValue(){ + return this.value; + } +} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/StatDTO.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/StatDTO.java new file mode 100644 index 00000000..0d1a07b1 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/StatDTO.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.entity; + +import lombok.Data; + +/** + * 统计数据传输对象 (StatDTO) + * 用于承载数据库按小时分组统计后的结果。 + * 对应 SQL: SELECT EXTRACT(HOUR FROM ...) AS hour_key, COUNT(*) AS count_val + */ +@Data +public class StatDTO { + + /** + * 小时键（0 - 23），对应 SQL 中的 hour_key + */ + private int hourKey; + + /** + * 该小时的记录总数，对应 SQL 中的 count_val + */ + private long countVal; +} \ No newline at end of file diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java index 26b60c76..7ce24263 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumServiceQuotes.java @@ -101,5 +101,9 @@ public class SpectrumServiceQuotes { // 获取阈值信息 private final IGardsThresholdService gardsThresholdService; + /** + * 输运模拟 + */ + private final GardsTransportStatusService gardsTransportStatusService; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ThresholdResultHistory.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ThresholdResultHistory.java new file mode 100644 index 00000000..f31090f8 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ThresholdResultHistory.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.entity.vo; + +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class ThresholdResultHistory { + + private String nuclideName; + private Double thresholdValue; + private String calculationTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date collectStop; + private String category; +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/XeCategoryHistory.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/XeCategoryHistory.java new file mode 100644 index 00000000..5891ded4 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/XeCategoryHistory.java @@ -0,0 +1,40 @@ +package org.jeecg.modules.entity.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; +@Data +public class XeCategoryHistory { + public String title; + public Integer width = 1000; + public Integer height = 600; + public Boolean save = true; + + public List levelA; // 普通散点 + public List levelB; // 带误差线 + public List levelC; // 带误差线 + + public List mdc; // 动态线条数据 + public List lc; // 动态线条数据 + public List thresholds; // 动态线条数据 + + public XeCategoryHistory(){ + this.levelA = new ArrayList<>(); + this.levelB = new ArrayList<>(); + this.levelC = new ArrayList<>(); + this.mdc = new ArrayList<>(); + this.lc = new ArrayList<>(); + this.thresholds = new ArrayList<>(); + } + public static class Point { + public String date; // 日期字符串，例如 "2025-01-15" + public double y; + } + + public static class ErrorPoint { + public String date; + public double y; + public double yError; + } +}