xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公用模块下气体数据实体类，状态数据实体类，样品数据实体类增加字段注解

Browse Source 
移除系统模块下的样品数据实体类
This commit is contained in:
qiaoqinzheng 2023-06-16 16:46:41 +08:00
parent 8cc7d138f2
commit bf6b784e78
8 changed files with 149 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java
View File

@ -13,46 +13,85 @@ import java.util.Date;
@TableName(value = "gards_met_data")
public class GardsMetData implements Serializable {
/**
* 台站id
*/
@TableField(value = "STATION_ID")
private Integer stationId;
/**
* 台站编码
*/
@TableField(value = "STATION_CODE")
private String stationCode;
/**
* 气象数据id
*/
@TableField(value = "MET_ID")
private Integer metId;
/**
* 开始时间
*/
@TableField(value = "START_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 结束时间
*/
@TableField(value = "END_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 平均湿度（％）
*/
@TableField(value = "AVE_HUMIDITY")
private Integer aveHumidity;
/**
* 平均温度（℃）
*/
@TableField(value = "AVGTEMPERATURE")
private Integer avgtemperature;
/**
* 平均压力（hPa）
*/
@TableField(value = "AVE_PRESSURE")
private Integer avePressure;
/**
* 平均风向（偏离正北的度数）
*/
@TableField(value = "AVE_WIND_DIR")
private Integer aveWindDir;
/**
* 平均风速（m/s）
*/
@TableField(value = "AVE_WIND_SPEED")
private Integer aveWindSpeed;
/**
* 降雨量（mm）
*/
@TableField(value = "RAINFALL")
private Integer rainfall;
/**
* 文件路径
*/
@TableField(value = "INPUT_FILE_NAME")
private String inputFileName;
/**
* 操作时间
*/
@TableField(value = "MODDATE")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

70
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java
View File

@ -13,77 +13,147 @@ import java.util.Date;
@TableName("GARDS_SAMPLE_DATA")
public class GardsSampleData implements Serializable {
/**
* 探测器编码
*/
@TableField(value = "SITE_DET_CODE")
private String siteDetCode;
/**
* 样品id
*/
@TableField(value = "SAMPLE_ID")
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)
*/
@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")
private Date transmitDtg;
/**
* 样品采集开始时间
*/
@TableField(value = "COLLECT_START")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStart;
/**
* 样品采集结束时间
*/
@TableField(value = "COLLECT_STOP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStop;
/**
* 样品测量开始时间
*/
@TableField(value = "ACQUISITION_START")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acquisitionStart;
/**
* 样品测量结束时间
*/
@TableField(value = "ACQUISITION_STOP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
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 = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
/**
* 台站名称
*/
@TableField(exist = false)
private String stationName;
/**
* 探测器名称
*/
@TableField(exist = false)
private String detectorsName;

36
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java
View File

@ -13,41 +13,77 @@ import java.util.Date;
@TableName(value = "gards_soh_data")
public class GardsSohData implements Serializable {
/**
* 台站ID号
*/
@TableField(value = "STATION_ID")
private Integer stationId;
/**
* 台站代码
*/
@TableField(value = "STATION_CODE")
private String stationCode;
/**
* 报警ID号
*/
@TableField(value = "SOH_ID")
private Integer sohId;
/**
* 状态数据采集开始时间
*/
@TableField(value = "START_TIME")
private Date startTime;
/**
* 时间间隔长度（秒）
*/
@TableField(value = "TIME")
private Integer time;
/**
* 采样流速均值（scm/h）
*/
@TableField(value = "AVGFLOWRATE")
private Integer avgflowrate;
/**
* 采样流速偏差（scm/h）
*/
@TableField(value = "FLOWRATEDEV")
private Integer flowratedev;
/**
* 文件路径
*/
@TableField(value = "INPUT_FILE_NAME")
private String inputFileName;
/**
* 探测器id
*/
@TableField(value = "DETECTOR_ID")
private Integer detectorId;
/**
* 操作时间
*/
@TableField(value = "MODDATE")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
/**
* 台站名称
*/
@TableField(exist = false)
private String stationName;
/**
* 探测器名称
*/
@TableField(exist = false)
private String detectorName;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsSampleDataController.java
View File

@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.system.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.system.service.IGardsSampleDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;

160
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsSampleData.java
View File

@ -1,160 +0,0 @@
package org.jeecg.modules.system.entity;
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("GARDS_SAMPLE_DATA")
public class GardsSampleData implements Serializable {
/**
* 探测器编码
*/
@TableField(value = "SITE_DET_CODE")
private String siteDetCode;
/**
* 样品id
*/
@TableField(value = "SAMPLE_ID")
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)
*/
@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")
private Date transmitDtg;
/**
* 样品采集开始时间
*/
@TableField(value = "COLLECT_START")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStart;
/**
* 样品采集结束时间
*/
@TableField(value = "COLLECT_STOP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectStop;
/**
* 样品测量开始时间
*/
@TableField(value = "ACQUISITION_START")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acquisitionStart;
/**
* 样品测量结束时间
*/
@TableField(value = "ACQUISITION_STOP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
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 = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
/**
* 台站名称
*/
@TableField(exist = false)
private String stationName;
/**
* 探测器名称
*/
@TableField(exist = false)
private String detectorsName;
}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsSampleDataMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.system.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSampleData;
public interface GardsSampleDataMapper extends BaseMapper<GardsSampleData> {
}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsSampleDataService.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.system.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSampleData;
public interface IGardsSampleDataService extends IService<GardsSampleData> {

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java
View File

@ -11,7 +11,7 @@ import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.system.entity.GardsDetectors;
import org.jeecg.modules.system.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.system.entity.GardsStations;
import org.jeecg.modules.system.mapper.GardsSampleDataMapper;
import org.jeecg.modules.system.service.IGardsDetectorsService;