添加采集停止时间属性

This commit is contained in:
duwenyuan 2026-01-07 20:40:19 +08:00
parent 2a189478f1
commit f99ffb824c
10 changed files with 152 additions and 0 deletions

View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@ -18,10 +19,13 @@ public class GardsThresholdResult {
private String stationId;
@TableField("NUCLIDENAME")
private String nuclideName;
private String category;
private Double thresholdValue;
private Double median;
private Double percentile25;
private Double percentile75;
@TableField(exist = false)
private Date calculationTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStop;
}

View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@ -25,5 +26,8 @@ public class GardsThresholdResultHistory {
private Double percentile75;
@TableField(exist = false)
private Date calculationTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStop;
private String category;
}

View File

@ -0,0 +1,52 @@
package org.jeecg.modules.base.entity.rnauto;
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.jeecg.modules.base.enums.TransportTaskCloseStatusEnum;
import org.jeecg.modules.base.enums.TransportTaskStatusEnum;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("RNAUTO.GARDS_TRANSPORT_STATUS")
public class GardsTransportStatus implements Serializable {
/**
* 样品id
*/
@TableId(value = "SAMPLE_ID", type = IdType.INPUT)
private Integer sampleId;
/**
* 输运模拟状态-1执行失败0未开始1运行中2已完成3缺少气象数据
*/
@TableField(value = "TRANSPORT_STATUS")
private Integer transportStatus;
/**
* 输运模拟说明
*/
@TableField(value = "DESCRIPTION")
private String description;
/**
* 关闭状态(0-未关闭1-关闭)
*/
@TableField(value = "CLOSE_STATUS")
private Integer closeStatus;
/**
* 更新时间
*/
@TableField(value = "MODDATE")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@ -24,4 +25,6 @@ public class GardsThresholdResult {
private Double percentile75;
@TableField(exist = false)
private Date calculationTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStop;
}

View File

@ -0,0 +1,8 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.jeecg.modules.base.entity.rnauto.GardsTransportStatus;
@Mapper
public interface GardsTransportStatusMapper extends BaseMapper<GardsTransportStatus> {
}

View File

@ -0,0 +1,7 @@
package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.rnauto.GardsTransportStatus;
public interface GardsTransportStatusService extends IService<GardsTransportStatus> {
}

View File

@ -0,0 +1,13 @@
package org.jeecg.modules.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.base.entity.rnauto.GardsTransportStatus;
import org.jeecg.modules.mapper.GardsTransportStatusMapper;
import org.jeecg.modules.service.GardsTransportStatusService;
import org.springframework.stereotype.Service;
@Service
@DS("ora")
public class GardsTransportStatusServiceImpl extends ServiceImpl<GardsTransportStatusMapper, GardsTransportStatus> implements GardsTransportStatusService {
}

View File

@ -0,0 +1,11 @@
package org.jeecg.modules.entity.vo;
import lombok.Data;
@Data
public class MeasurementCategorization {
private String isotope;
private String detected;
private Double abnormalLimit;
private String category;
}

View File

@ -0,0 +1,26 @@
package org.jeecg.modules.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class NuclideAnalysisInfo {
private String nuclideName;
private Integer nidFlag;
private String concErr;
private Double lc;
private String roiPeakfit;
private String category;
// 使用 @JsonFormat 注解精准控制日期序列化格式
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date moddate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date collectStop;
private Double mdc;
private Double conc;
private String sampleId;
}

View File

@ -0,0 +1,24 @@
package org.jeecg.modules.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class NuclideRatioResult {
private String sampleId;
private Double ratio; // Xe-133 / Xe-131m
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStop; // 停止采集时间
private String status; // 计算状态 SUCCESS, MISSING_DATA, ZERO_DENOMINATOR
public NuclideRatioResult(String sampleId, Double ratio, Date collectStop, String status) {
this.sampleId = sampleId;
this.ratio = ratio;
this.collectStop = collectStop;
this.status = status;
}
}