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

web-statistics模块下实体类移动到base-core下

Browse Source
This commit is contained in:
qiaoqinzheng 2023-08-01 08:58:52 +08:00
parent 1667b43218
commit 2d8b68e25a
60 changed files with 141 additions and 1259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAlertData.java → jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsAlertData.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.base.entity.original;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

7
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsBgEfficiencyPairs.java
View File

@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original;
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;
/**
* 存储β-γ符合谱中#b_ gefficiency 数据块中的探测器符合效率刻度点。
@ -40,5 +43,7 @@ public class GardsBgEfficiencyPairs implements Serializable {
private Double bgEfficError;
@TableField(value = "MODDATE")
private Long moddate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

7
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsHistogram.java
View File

@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original;
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;
/**
* 存储β-γ符合谱中#histogram数据块中的数据。
@ -45,5 +48,7 @@ public class GardsHistogram implements Serializable {
private Integer bEnergySpan;
@TableField(value = "MODDATE")
private Long moddate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

8
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsRoiLimits.java
View File

@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original;
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;
/**
* 存储β-γ符合谱中#ROI_LMITS 数据块中的感兴趣区能量边界数据。
@ -44,5 +48,7 @@ public class GardsRoiLimits implements Serializable {
private Double gEnergyStop;
@TableField(value = "MODDATE")
private Long moddate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

7
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCert.java
View File

@ -31,4 +31,11 @@ public class GardsSampleCert implements Serializable {
*/
@TableField(value = "ASSAY_DATE")
private Date assayDate;
/**
* 单位
*/
@TableField(value = "UNIT")
private String unit;
}

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleCertLine.java
View File

@ -56,7 +56,7 @@ public class GardsSampleCertLine implements Serializable {
* β能量
*/
@TableField(value = "B_ENERGY")
private Double b_energy;
private Double bEnergy;
/**
* 衰变模式
*/

8
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSampleRatios.java
View File

@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original;
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;
/**
* 存储β-γ符合谱中# Ratios 数据块中的感兴趣区相应核素的计数比率。
@ -36,5 +40,7 @@ public class GardsSampleRatios implements Serializable {
private Double countRatioErr;
@TableField(value = "MODDATE")
private Long moddate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

8
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsSpectrum.java
View File

@ -2,8 +2,12 @@ package org.jeecg.modules.base.entity.original;
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;
/**
* 存储所有能谱中#G_Spectrum和#B_Spectrum数据块中的数据。
@ -44,5 +48,7 @@ public class GardsSpectrum implements Serializable {
private Integer startChannel;
@TableField(value = "MODDATE")
private Long moddate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

7
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/original/GardsTotalEfficiencyPairs.java
View File

@ -2,9 +2,12 @@ package org.jeecg.modules.base.entity.original;
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;
/**
* 存储所有谱中#TotalEff 数据块中的探测器总效率刻度点，此数据块是可选项。
@ -36,5 +39,7 @@ public class GardsTotalEfficiencyPairs implements Serializable {
private Double totalEfficError;
@TableField(value = "MODDATE")
private Long moddate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/common/util/ReadLineUtil.java
View File

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.jeecg.common.api.vo.Result;
@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;

1
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/RadionuclideController.java
View File

@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
@RestController

12
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
View File

@ -1,22 +1,17 @@
package org.jeecg.modules.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.Prompt;
import org.jeecg.common.util.ReadLineUtil;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.configuration.GardsStations;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.jeecg.modules.base.enums.PageType;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.jeecg.modules.entity.GardsAnalysesMan;
import org.jeecg.modules.service.*;
import org.jeecg.modules.system.entity.GardsStations;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
@ -27,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@RestController
@RequestMapping("webStatistics")

175
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesAuto.java
View File

@ -1,175 +0,0 @@
package org.jeecg.modules.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(value = "RNAUTO.GARDS_ANALYSES")
public class GardsAnalysesAuto implements Serializable {
/**
* 分析ID号
*/
@TableField(value = "IDANALYSIS")
private Integer idAnalysis;
/**
* 样品id
*/
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
/**
* 分析开始时间
*/
@TableField(value = "ANALYSISBEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date analysisBegin;
/**
* 分析结束时间
*/
@TableField(value = "ANALYSISEND")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date analysisEnd;
/**
* Reviewed:交互；
*/
@TableField(value = "TYPE")
private String type;
/**
* 使用的软件名称
*/
@TableField(value = "SOFTWARE")
private String software;
/**
* 软件版本号
*/
@TableField(value = "SWVERSION")
private String swVersion;
/**
* 分析员名称
*/
@TableField(value = "ANALYST")
private String analyst;
/**
* 基线计数方法描述
*/
@TableField(value = "BASELINEMETHOD")
private String baseLineMethod;
/**
* 寻峰方法描述
*/
@TableField(value = "PEAKSMETHOD")
private String peaksMethod;
/**
* 核素识别方法描述
*/
@TableField(value = "NUCLIDEMETHOD")
private String nuclideMethod;
/**
* 不确定度计算描述
*/
@TableField(value = "UNCCALCMETHOD")
private String unccalcMethod;
/**
* Lc计算方法描述
*/
@TableField(value = "LCMETHOD")
private String lcMethod;
/**
* 寻峰起始道
*/
@TableField(value = "SEARCHSTARTCHANNEL")
private Integer searchStartChannel;
/**
* 寻峰结束道
*/
@TableField(value = "SEARCHENDCHANNEL")
private Integer searchEndChannel;
/**
* 寻峰阈值（能窗宽度）
*/
@TableField(value = "SEARCHTHRESHOLD")
private Double searchThreshold;
/**
* 峰数目
*/
@TableField(value = "NUMBEROFPEAKS")
private Integer numberOfPeaks;
/**
* 总计数
*/
@TableField(value = "TOTALCOUNTS")
private Double totalCounts;
/**
* 分级结果
*/
@TableField(value = "CATEGORY")
private Integer cateGory;
/**
* 注释
*/
@TableField(value = "COMMENTS")
private String comments;
/**
* 操作时间
*/
@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;
@TableField(value = "USEDGASPHD")
private String usedGasPhd;
@TableField(value = "USEDDETPHD")
private String usedDetPhd;
@TableField(value = "USEDGASPHD_ID")
private Integer usedGasPhdId;
@TableField(value = "USEDDETPHD_ID")
private Integer usedDetPhdId;
@TableField(value = "BASELINE_PATH")
private String baseLinePath;
@TableField(value = "LC_PATH")
private String lcPath;
@TableField(value = "SCAC_PATH")
private String scacPath;
@TableField(value = "LOG_PATH")
private String logPath;
@TableField(value = "REPORT_PAHT")
private String reportPath;
}

175
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsAnalysesMan.java
View File

@ -1,175 +0,0 @@
package org.jeecg.modules.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(value = "RNMAN.GARDS_ANALYSES")
public class GardsAnalysesMan implements Serializable {
/**
* 分析ID号
*/
@TableField(value = "IDANALYSIS")
private Integer idAnalysis;
/**
* 样品id
*/
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
/**
* 分析开始时间
*/
@TableField(value = "ANALYSISBEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date analysisBegin;
/**
* 分析结束时间
*/
@TableField(value = "ANALYSISEND")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date analysisEnd;
/**
* Reviewed:交互；
*/
@TableField(value = "TYPE")
private String type;
/**
* 使用的软件名称
*/
@TableField(value = "SOFTWARE")
private String software;
/**
* 软件版本号
*/
@TableField(value = "SWVERSION")
private String swVersion;
/**
* 分析员名称
*/
@TableField(value = "ANALYST")
private String analyst;
/**
* 基线计数方法描述
*/
@TableField(value = "BASELINEMETHOD")
private String baseLineMethod;
/**
* 寻峰方法描述
*/
@TableField(value = "PEAKSMETHOD")
private String peaksMethod;
/**
* 核素识别方法描述
*/
@TableField(value = "NUCLIDEMETHOD")
private String nuclideMethod;
/**
* 不确定度计算描述
*/
@TableField(value = "UNCCALCMETHOD")
private String unccalcMethod;
/**
* Lc计算方法描述
*/
@TableField(value = "LCMETHOD")
private String lcMethod;
/**
* 寻峰起始道
*/
@TableField(value = "SEARCHSTARTCHANNEL")
private Integer searchStartChannel;
/**
* 寻峰结束道
*/
@TableField(value = "SEARCHENDCHANNEL")
private Integer searchEndChannel;
/**
* 寻峰阈值（能窗宽度）
*/
@TableField(value = "SEARCHTHRESHOLD")
private Double searchThreshold;
/**
* 峰数目
*/
@TableField(value = "NUMBEROFPEAKS")
private Integer numberOfPeaks;
/**
* 总计数
*/
@TableField(value = "TOTALCOUNTS")
private Double totalCounts;
/**
* 分级结果
*/
@TableField(value = "CATEGORY")
private Integer cateGory;
/**
* 注释
*/
@TableField(value = "COMMENTS")
private String comments;
/**
* 操作时间
*/
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
@TableField(value = "USEDGASPHD")
private String usedGasPhd;
@TableField(value = "USEDDETPHD")
private String usedDetPhd;
@TableField(value = "USEDGASPHD_ID")
private Integer usedGasPhdId;
@TableField(value = "USEDDETPHD_ID")
private Integer usedDetPhdId;
@TableField(value = "BASELINE_PATH")
private String baseLinePath;
@TableField(value = "LC_PATH")
private String lcPath;
@TableField(value = "SCAC_PATH")
private String scacPath;
@TableField(value = "LOG_PATH")
private String logPath;
@TableField(value = "REPORT_PAHT")
private String reportPath;
}

36
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsBgEfficiencyPairs.java
View File

@ -1,36 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_BG_EFFICIENCY_PAIRS")
public class GardsBgEfficiencyPairs implements Serializable {
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
@TableField(value = "ROI")
private Integer roi;
@TableField(value = "NUCLIDE_NAME")
private String nuclideName;
@TableField(value = "BG_EFFICIENCY")
private Double bgEfficiency;
@TableField(value = "BG_EFFIC_ERROR")
private Double bgEfficError;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

68
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsCalibrationPairsOrig.java
View File

@ -1,68 +0,0 @@
package org.jeecg.modules.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@Data
@TableName(value = "ORIGINAL.GARDS_CALIBRATION_PAIRS_ORIG")
public class GardsCalibrationPairsOrig implements Serializable {
/**
* 样品ID号
*/
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
/**
* 系统类型 G：gamma探测器的数据，#g_；B：beta探测器的数据,#b_
*/
@TableField(value = "SAMPLE_TYPE")
private String sampleType;
/**
* 刻度类型 energy：能量刻度；efficiency：效率刻度；
* Resolution：分辨率刻度
*/
@TableField(value = "CALTYPE")
private String caltype;
/**
* 来源 PHD：代表数据来自PHD文件；External：代表数据来自外部，如刻度工具、其它文件等
*/
@TableField(value = "INPUT")
private String input;
/**
* 刻度点ID号
*/
@TableField(value = "IDCALPOINT")
private Integer idcalpoint;
/**
* x轴数值
*/
@TableField(value = "XVALUE")
private Double xvalue;
/**
* y轴数值
*/
@TableField(value = "YVALUE")
private Double yvalue;
/**
* y值不确定度
*/
@TableField(value = "UNCYVALUE")
private Double uncyvalue;
/**
* 衰变模式
*/
@TableField(value = "DECAY_MODE")
private String decayMode;
}

39
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsHistogram.java
View File

@ -1,39 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_HISTOGRAM")
public class GardsHistogram implements Serializable {
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
@TableField(value = "FILENAME")
private String fileName;
@TableField(value = "G_CHANNELS")
private Integer GChannels;
@TableField(value = "B_CHANNELS")
private Integer BChannels;
@TableField(value = "G_ENERGY_SPAN")
private Integer GEnergySpan;
@TableField(value = "B_ENERGY_SPAN")
private Integer BEnergySpan;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

39
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsRoiLimits.java
View File

@ -1,39 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_ROI_LIMITS")
public class GardsRoiLimits implements Serializable {
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
@TableField(value = "ROI")
private Integer roi;
@TableField(value = "B_ENERGY_START")
private Double BEnergyStart;
@TableField(value = "B_ENERGY_STOP")
private Double BEnergyStop;
@TableField(value = "G_ENERGY_START")
private Double GEnergyStart;
@TableField(value = "G_ENERGY_STOP")
private Double GEnergyStop;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

102
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleAux.java
View File

@ -1,102 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_SAMPLE_AUX")
public class GardsSampleAux implements Serializable {
/**
* 样品ID号
*/
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
/**
* 样品参考ID
*/
@TableField(value = "SAMPLE_REF_ID")
private String sampleRefId;
/**
* 样品测量ID
*/
@TableField(value = "MEASUREMENT_ID")
private String measurementId;
/**
* 探测器本底测量ID
*/
@TableField(value = "BKGD_MEASUREMENT_ID")
private String bkgdMeasurementId;
/**
* 气体本底测量ID
*/
@TableField(value = "GAS_BKGD_MEASUREMENT_ID")
private String gasBkgdMeasurementId;
/**
* 样品的几何尺寸，#Sample数据块 dimension2
*/
@TableField(value = "SAMPLE_HEIGHT")
private Double sampleHeight;
/**
* 样品的几何尺寸，#Sample数据块 dimension1
*/
@TableField(value = "SAMPLE_DIAMETER")
private Double sampleDiameter;
/**
* #calibration数据块
*/
@TableField(value = "CALIBRATION_DTG")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date calibrationDtg;
/**
* 报文ID号
*/
@TableField(value = "MSG_ID")
private String msgId;
/**
* 归档瓶ID号
*/
@TableField(value = "ARCHIVE_BOTTLE_ID")
private String archiveBottleId;
/**
* 氙体积
*/
@TableField(value = "XE_VOLUME")
private Double xeVolume;
/**
* 氙体积不确定度
*/
@TableField(value = "XE_VOLUME_UNCER")
private Double xeVolumeUncer;
/**
* 氙收集效率
*/
@TableField(value = "XE_COLLECTION_YIED")
private Double xeCollectionYied;
/**
* 氙收集效率不确定度
*/
@TableField(value = "XE_COLLECTION_YIED_UNCER")
private Double xeCollectionYiedUncer;
}

42
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCert.java
View File

@ -1,42 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_SAMPLE_CERT")
public class GardsSampleCert implements Serializable {
/**
* 台站ID号
*/
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
/**
* 刻度源活度（Bq）total_source_activity
*/
@TableField(value = "QUANTITY")
private Double quantity;
/**
* 鉴定日期
*/
@TableField(value = "ASSAY_DATE")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date assayDate;
/**
* 单位
*/
@TableField(value = "UNIT")
private String unit;
}

79
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleCertLine.java
View File

@ -1,79 +0,0 @@
package org.jeecg.modules.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@Data
@TableName(value = "ORIGINAL.GARDS_SAMPLE_CERT_LINE")
public class GardsSampleCertLine implements Serializable {
/**
* 台站ID号
*/
@TableField(value = "SAMPLE_ID")
private Double sampleId;
/**
* 核素名称
*/
@TableField(value = "NUCL_NAME")
private String nuclName;
/**
* 半衰期（秒S、小时H、天D、年Y）
*/
@TableField(value = "HALFLIFE")
private String halflife;
/**
* γ能量（keV）
*/
@TableField(value = "ENERGY")
private Double energy;
/**
* 核素活度（Bq）
*/
@TableField(value = "ACTIVITY")
private Double activity;
/**
* 核素活度不确定度（％）
*/
@TableField(value = "ERROR")
private Double error;
/**
* γ射线强度（％）
*/
@TableField(value = "ABUNDANCE")
private Double abundance;
/**
* β射线强度（％）
*/
@TableField(value = "B_ABUNDANCE")
private Double bAbundance;
/**
* β能量
*/
@TableField(value = "B_ENERGY")
private Double bEnergy;
/**
* 衰变模式：
*/
@TableField(value = "DECAY_MODE")
private String decayMode;
/**
* 半衰期单位
*/
@TableField(value = "HALFLIFT_UNIT")
private String halfliftUnit;
}

19
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleDescription.java
View File

@ -1,19 +0,0 @@
package org.jeecg.modules.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
@Data
@TableName(value = "ORIGINAL.GARDS_SAMPLE_DESCRIPTION")
public class GardsSampleDescription implements Serializable {
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
@TableField(value = "DESCRIPTION")
private String description;
}

39
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleRatios.java
View File

@ -1,39 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_SAMPLE_RATIOS")
public class GardsSampleRatios implements Serializable {
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
@TableField(value = "RATIO_ID")
private String ratioId;
@TableField(value = "UPPER_ROI_NUMBER")
private Integer upperRoiNumber;
@TableField(value = "LOWER_ROI_NUMBER")
private Integer lowerRoiNumber;
@TableField(value = "COUNT_RATIO")
private Double countRatio;
@TableField(value = "COUNT_RATIO_ERR")
private Double countRatioErr;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

39
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSpectrum.java
View File

@ -1,39 +0,0 @@
package org.jeecg.modules.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(value = "ORIGINAL.GARDS_SPECTRUM")
public class GardsSpectrum implements Serializable {
@TableField(value = "SAMPLE_ID")
private Integer sampleId;
@TableField(value = "SAMPLE_TYPE")
private String sampleType;
@TableField(value = "FILENAME")
private String fileName;
@TableField(value = "CHANNELS")
private Integer channels;
@TableField(value = "ENERGY_SPAN")
private Integer energySpan;
@TableField(value = "START_CHANNEL")
private Integer startChannel;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}

50
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDict.java
View File

@ -1,50 +0,0 @@
package org.jeecg.modules.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "sys_dict")
public class SysDict implements Serializable {
@TableField(value = "id")
private String id;
@TableField(value = "dict_name")
private String dictName;
@TableField(value = "dict_code")
private String dictCode;
@TableField(value = "description")
private String description;
@TableField(value = "del_flag")
private Integer delFlag;
@TableField(value = "create_by")
private String createBy;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_by")
private String updateBy;
@TableField(value = "update_time")
private Date updateTime;
@TableField(value = "type")
private Integer type;
@TableField(value = "tenant_id")
private Integer tenantId;
@TableField(value = "low_app_id")
private String lowAppId;
}

80
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/SysDictItem.java
View File

@ -1,80 +0,0 @@
package org.jeecg.modules.entity;
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 lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @Author zhangweijian
* @since 2018-12-28
*/
@Data
@TableName(value = "sys_dict_item")
public class SysDictItem implements Serializable {
/**
* id
*/
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
/**
* 字典id
*/
@TableField(value = "dict_id")
private String dictId;
/**
* 字典项文本
*/
@TableField(value = "item_text")
private String itemText;
/**
* 字典项值
*/
@TableField(value = "item_value")
private String itemValue;
/**
* 描述
*/
@TableField(value = "description")
private String description;
/**
* 排序
*/
@TableField(value = "sort_order")
private Integer sortOrder;
/**
* 状态（1启用 0不启用）
*/
@TableField(value = "status")
private Integer status;
@TableField(value = "create_by")
private String createBy;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_by")
private String updateBy;
@TableField(value = "update_time")
private Date updateTime;
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAlertDataMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsAlertData;
import org.jeecg.modules.base.entity.original.GardsAlertData;
public interface GardsAlertDataMapper extends BaseMapper<GardsAlertData> {

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesAutoMapper.java
View File

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

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleAuxMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java
View File

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

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java
View File

@ -2,9 +2,8 @@ package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import java.util.Date;
import java.util.List;
public interface GardsSampleDataWebMapper extends BaseMapper<GardsSampleData> {

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java
View File

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

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java
View File

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

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mapper.GardsSampleDataWebMapper">
<select id="findAutoPage" resultType="org.jeecg.modules.base.entity.GardsSampleData">
<select id="findAutoPage" resultType="org.jeecg.modules.base.entity.original.GardsSampleData">
SELECT
sam.SITE_DET_CODE,
sam.SAMPLE_ID,
@ -41,7 +41,7 @@
</where>
</select>
<select id="findReviewedPage" resultType="org.jeecg.modules.base.entity.GardsSampleData">
<select id="findReviewedPage" resultType="org.jeecg.modules.base.entity.original.GardsSampleData">
SELECT
sam.SITE_DET_CODE,
sam.SAMPLE_ID,

7
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IAutoService.java
View File

@ -3,17 +3,16 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.springframework.web.bind.annotation.RequestParam;
import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
public interface IAutoService extends IService<GardsAnalysesAuto> {
public interface IAutoService extends IService<GardsAnalyses> {
Result findAutoPage(QueryRequest queryRequest, Integer[] stationIds, Date startTime, Date endTime);
GardsAnalysesAuto getOne(Integer sampleId);
GardsAnalyses getOne(Integer sampleId);
void arrExport(Integer[] stationIds, String startTime, String endTime, HttpServletResponse response);
}

7
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsAlertDataService.java
View File

@ -1,14 +1,9 @@
package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.entity.GardsAlertData;
import org.springframework.web.bind.annotation.RequestParam;
import org.jeecg.modules.base.entity.original.GardsAlertData;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
public interface IGardsAlertDataService extends IService<GardsAlertData> {

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
View File

@ -3,8 +3,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsMetData;
import org.springframework.web.bind.annotation.RequestParam;
import org.jeecg.modules.base.entity.original.GardsMetData;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleCertService.java
View File

@ -2,7 +2,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.GardsSampleCert;
import org.jeecg.modules.base.entity.original.GardsSampleCert;
public interface IGardsSampleCertService extends IService<GardsSampleCert> {

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
View File

@ -3,9 +3,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsSohData;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.RequestParam;
import org.jeecg.modules.base.entity.original.GardsSohData;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IMenuNameService.java
View File

@ -1,6 +1,6 @@
package org.jeecg.modules.service;
import org.jeecg.modules.system.entity.GardsStations;
import org.jeecg.modules.base.entity.configuration.GardsStations;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestMapping;

6
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IReviewedService.java
View File

@ -3,16 +3,16 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.GardsAnalysesMan;
import org.jeecg.modules.base.entity.rnman.GardsAnalyses;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
public interface IReviewedService extends IService<GardsAnalysesMan> {
public interface IReviewedService extends IService<GardsAnalyses> {
Result findReviewedPage(QueryRequest queryRequest, Integer[] stationIds, Date startTime, Date endTime);
GardsAnalysesMan getOne(Integer sampleId);
GardsAnalyses getOne(Integer sampleId);
void rrrExport(Integer[] stationIds, String startTime, String endTime, HttpServletResponse response);
}

24
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
View File

@ -1,8 +1,6 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -17,9 +15,8 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.dto.SampleDataDto;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
import org.jeecg.modules.mapper.GardsAnalysesAutoMapper;
import org.jeecg.modules.mapper.GardsSampleDataWebMapper;
import org.jeecg.modules.service.IAutoService;
@ -32,13 +29,12 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;
@Service("autoService")
@DS("ora")
public class AutoServiceImpl extends ServiceImpl<GardsAnalysesAutoMapper, GardsAnalysesAuto> implements IAutoService {
public class AutoServiceImpl extends ServiceImpl<GardsAnalysesAutoMapper, GardsAnalyses> implements IAutoService {
@Autowired
private IGardsSampleDataWebService gardsSampleDataService;
@ -83,12 +79,12 @@ public class AutoServiceImpl extends ServiceImpl<GardsAnalysesAutoMapper, GardsA
}
@Override
public GardsAnalysesAuto getOne(Integer sampleId) {
LambdaQueryWrapper<GardsAnalysesAuto> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(GardsAnalysesAuto::getSampleId,sampleId);
GardsAnalysesAuto gardsAnalyses = getOne(wrapper);
public GardsAnalyses getOne(Integer sampleId) {
LambdaQueryWrapper<GardsAnalyses> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(GardsAnalyses::getSampleId,sampleId);
GardsAnalyses gardsAnalyses = getOne(wrapper);
return Optional.ofNullable(gardsAnalyses)
.orElse(new GardsAnalysesAuto());
.orElse(new GardsAnalyses());
}
@Override
@ -97,12 +93,12 @@ public class AutoServiceImpl extends ServiceImpl<GardsAnalysesAutoMapper, GardsA
String endTime,
HttpServletResponse response) {
// 查询自动处理后的
List<GardsAnalysesAuto> gardsAnalyses = this.list();
List<GardsAnalyses> gardsAnalyses = this.list();
// 获取全部样品id
List<Integer> sampleIds = gardsAnalyses
.stream()
.map(GardsAnalysesAuto::getSampleId)
.map(GardsAnalyses::getSampleId)
.collect(Collectors.toList());
if (CollUtil.isEmpty(sampleIds)) return;

19
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsAlertDataServiceImpl.java
View File

@ -1,38 +1,25 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.poi.ss.usermodel.Workbook;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.entity.GardsAlertData;
import org.jeecg.modules.base.entity.original.GardsAlertData;
import org.jeecg.modules.mapper.GardsAlertDataMapper;
import org.jeecg.modules.mapper.GardsSohDataMapper;
import org.jeecg.modules.service.IGardsAlertDataService;
import org.jeecg.modules.service.IGardsSohDataService;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.ParseException;
import java.util.*;
import static org.jeecg.modules.base.enums.PageType.*;
import java.util.Date;
import java.util.List;
@Service
@DS("ora")

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
View File

@ -12,8 +12,7 @@ import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.entity.GardsAlertData;
import org.jeecg.modules.base.entity.original.GardsMetData;
import org.jeecg.modules.mapper.GardsMetDataMapper;
import org.jeecg.modules.service.IGardsMetDataService;
import org.jeecgframework.poi.excel.ExcelExportUtil;

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertServiceImpl.java
View File

@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.GardsSampleCert;
import org.jeecg.modules.entity.GardsSampleCertLine;
import org.jeecg.modules.base.entity.original.GardsSampleCert;
import org.jeecg.modules.base.entity.original.GardsSampleCertLine;
import org.jeecg.modules.mapper.GardsSampleCertLineMapper;
import org.jeecg.modules.mapper.GardsSampleCertMapper;
import org.jeecg.modules.service.IGardsSampleCertService;

68
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
View File

@ -1,12 +1,10 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -21,10 +19,7 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.ReadLineUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.enums.PageType;
import org.jeecg.modules.entity.*;
import org.jeecg.modules.base.entity.original.*;
import org.jeecg.modules.entity.data.*;
import org.jeecg.modules.mapper.*;
import org.jeecg.modules.service.IGardsSampleDataWebService;
@ -32,16 +27,11 @@ import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.text.ParseException;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@ -258,17 +248,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
LambdaQueryWrapper<GardsCalibrationPairsOrig> calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>();
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "G");
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint);
List<GardsCalibrationPairsOrig> gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper);
gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("energy")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){
gEnergySubBlock = new LinkedList<>();
for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) {
GEnergy gEnergy = new GEnergy();
if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){
gEnergy.setEnergy(orig.getYvalue());
gEnergy.setCentroid(orig.getXvalue());
gEnergy.setUncertainty(orig.getUncyvalue());
if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){
gEnergy.setEnergy(orig.getYValue());
gEnergy.setCentroid(orig.getXValue());
gEnergy.setUncertainty(orig.getUncYValue());
gEnergySubBlock.add(gEnergy);
}
}
@ -281,17 +271,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
LambdaQueryWrapper<GardsCalibrationPairsOrig> calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>();
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "B");
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint);
List<GardsCalibrationPairsOrig> gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper);
gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("energy")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){
bEnergySubBlock = new LinkedList<>();
for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) {
BEnergy bEnergy = new BEnergy();
if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue()) && Objects.nonNull(orig.getDecayMode())){
bEnergy.setElectronEnergy(orig.getYvalue());
bEnergy.setMaximumChannel(orig.getXvalue());
bEnergy.setUncertainty(orig.getUncyvalue());
if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue()) && Objects.nonNull(orig.getDecayMode())){
bEnergy.setElectronEnergy(orig.getYValue());
bEnergy.setMaximumChannel(orig.getXValue());
bEnergy.setUncertainty(orig.getUncYValue());
bEnergy.setDecayModeDescriptor(orig.getDecayMode());
bEnergySubBlock.add(bEnergy);
}
@ -305,17 +295,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
LambdaQueryWrapper<GardsCalibrationPairsOrig> calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>();
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "G");
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint);
List<GardsCalibrationPairsOrig> gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper);
gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("Resolution")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){
gResolutionSubBlock = new LinkedList<>();
for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) {
GResolution gResolution = new GResolution();
if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){
gResolution.setEnergy(orig.getXvalue());
gResolution.setFWHM(orig.getYvalue());
gResolution.setUncertainty(orig.getUncyvalue());
if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){
gResolution.setEnergy(orig.getXValue());
gResolution.setFWHM(orig.getYValue());
gResolution.setUncertainty(orig.getUncYValue());
gResolutionSubBlock.add(gResolution);
}
}
@ -328,17 +318,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
LambdaQueryWrapper<GardsCalibrationPairsOrig> calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>();
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "B");
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint);
List<GardsCalibrationPairsOrig> gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper);
gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("Resolution")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){
bResolutionSubBlock = new LinkedList<>();
for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) {
BResolution bResolution = new BResolution();
if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){
bResolution.setElectronEnergy(orig.getXvalue());
bResolution.setFWHM(orig.getYvalue());
bResolution.setUncertainty(orig.getUncyvalue());
if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){
bResolution.setElectronEnergy(orig.getXValue());
bResolution.setFWHM(orig.getYValue());
bResolution.setUncertainty(orig.getUncYValue());
bResolutionSubBlock.add(bResolution);
}
}
@ -351,17 +341,17 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
LambdaQueryWrapper<GardsCalibrationPairsOrig> calibrationPairsOrigQueryWrapper = new LambdaQueryWrapper<>();
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleType, "G");
calibrationPairsOrigQueryWrapper.eq(GardsCalibrationPairsOrig::getSampleId, sampleId);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdcalpoint);
calibrationPairsOrigQueryWrapper.orderByAsc(GardsCalibrationPairsOrig::getIdCalPoint);
List<GardsCalibrationPairsOrig> gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigMapper.selectList(calibrationPairsOrigQueryWrapper);
gardsCalibrationPairsOrigs = gardsCalibrationPairsOrigs.stream().filter(item->item.getCaltype().trim().equals("efficiency")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(gardsCalibrationPairsOrigs)){
gEfficiencySubBlock = new LinkedList<>();
for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) {
GEfficiency gEfficiency = new GEfficiency();
if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){
gEfficiency.setEnergy(orig.getXvalue());
gEfficiency.setEfficiency(orig.getYvalue());
gEfficiency.setUncertainty(orig.getUncyvalue());
if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXValue()) && Objects.nonNull(orig.getUncYValue())){
gEfficiency.setEnergy(orig.getXValue());
gEfficiency.setEfficiency(orig.getYValue());
gEfficiency.setUncertainty(orig.getUncYValue());
gEfficiencySubBlock.add(gEfficiency);
}
}
@ -446,7 +436,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
GardsSpectrum gardsSpectrum = gardsSpectrumMapper.selectOne(spectrumQueryWrapper);
if (Objects.nonNull(gardsSpectrum)){
gSpectrumBlock = new GammaSpectrum();
Map<String, Object> map = readLineUtil.readLine(gardsSpectrum.getFileName(), SampleFileHeader.GSPECTRUM.getMessage());
Map<String, Object> map = readLineUtil.readLine(gardsSpectrum.getFilename(), SampleFileHeader.GSPECTRUM.getMessage());
List<Integer> gSpectrumSubBlock = new LinkedList<>();
if (CollectionUtils.isNotEmpty(map)){
gSpectrumSubBlock = (List<Integer>)map.get(SampleFileHeader.GSPECTRUM.getMessage());
@ -470,7 +460,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
GardsSpectrum gardsSpectrum = gardsSpectrumMapper.selectOne(spectrumQueryWrapper);
if (Objects.nonNull(gardsSpectrum)){
bSpectrumBlock = new BetaSpectrum();
Map<String, Object> map = readLineUtil.readLine(gardsSpectrum.getFileName(), SampleFileHeader.BSPECTRUM.getMessage());
Map<String, Object> map = readLineUtil.readLine(gardsSpectrum.getFilename(), SampleFileHeader.BSPECTRUM.getMessage());
List<Integer> bSpectrumSubBlock = new LinkedList<>();
if (CollectionUtils.isNotEmpty(map)) {
bSpectrumSubBlock = (List<Integer>)map.get(SampleFileHeader.BSPECTRUM.getMessage());
@ -493,7 +483,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
GardsHistogram gardsHistogram = gardsHistogramMapper.selectOne(histogramQueryWrapper);
if (Objects.nonNull(gardsHistogram)){
histogramBlock = new Histogram();
Map<String, Object> map = readLineUtil.readLine(gardsHistogram.getFileName(), SampleFileHeader.HISTOGRAM.getMessage());
Map<String, Object> map = readLineUtil.readLine(gardsHistogram.getFilename(), SampleFileHeader.HISTOGRAM.getMessage());
List<HistogramData> histogramSubBlock = new LinkedList<>();
if (CollectionUtils.isNotEmpty(map)) {
histogramSubBlock = (List<HistogramData>)map.get(SampleFileHeader.HISTOGRAM.getMessage());

6
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
View File

@ -1,10 +1,8 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -15,8 +13,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.entity.GardsAlertData;
import org.jeecg.modules.base.entity.original.GardsAlertData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.jeecg.modules.mapper.GardsAlertDataMapper;
import org.jeecg.modules.mapper.GardsSohDataMapper;
import org.jeecg.modules.service.IGardsSohDataService;

22
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java
View File

@ -15,9 +15,8 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.dto.SampleDataDto;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.jeecg.modules.entity.GardsAnalysesMan;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.rnman.GardsAnalyses;
import org.jeecg.modules.mapper.GardsAnalysesManMapper;
import org.jeecg.modules.mapper.GardsSampleDataWebMapper;
import org.jeecg.modules.service.IGardsSampleDataWebService;
@ -30,13 +29,12 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;
@Service("reviewedService")
@DS("ora")
public class ReviewedServiceImpl extends ServiceImpl<GardsAnalysesManMapper, GardsAnalysesMan> implements IReviewedService {
public class ReviewedServiceImpl extends ServiceImpl<GardsAnalysesManMapper, GardsAnalyses> implements IReviewedService {
@Autowired
private IGardsSampleDataWebService gardsSampleDataService;
@ -81,12 +79,12 @@ public class ReviewedServiceImpl extends ServiceImpl<GardsAnalysesManMapper, Gar
}
@Override
public GardsAnalysesMan getOne(Integer sampleId) {
LambdaQueryWrapper<GardsAnalysesMan> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(GardsAnalysesMan::getSampleId,sampleId);
GardsAnalysesMan gardsAnalyses = getOne(wrapper);
public GardsAnalyses getOne(Integer sampleId) {
LambdaQueryWrapper<GardsAnalyses> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(GardsAnalyses::getSampleId,sampleId);
GardsAnalyses gardsAnalyses = getOne(wrapper);
return Optional.ofNullable(gardsAnalyses)
.orElse(new GardsAnalysesMan());
.orElse(new GardsAnalyses());
}
@Override
@ -95,12 +93,12 @@ public class ReviewedServiceImpl extends ServiceImpl<GardsAnalysesManMapper, Gar
String endTime,
HttpServletResponse response) {
// 查询自动处理后的
List<GardsAnalysesMan> gardsAnalyses = this.list();
List<GardsAnalyses> gardsAnalyses = this.list();
// 获取全部样品id
List<Integer> sampleIds = gardsAnalyses
.stream()
.map(GardsAnalysesMan::getSampleId)
.map(GardsAnalyses::getSampleId)
.collect(Collectors.toList());
if (CollUtil.isEmpty(sampleIds)) return;

69
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java
View File

@ -1,69 +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_DETECTORS")
public class GardsDetectors implements Serializable {
@TableField(value = "DETECTOR_ID")
private Integer detectorId;
@TableField(value = "DETECTOR_CODE")
private String detectorCode;
@TableField(value = "LON")
private Double lon;
@TableField(value = "LAT")
private Double lat;
@TableField(value = "TYPE")
private String type;
@TableField(value = "CHANNELS")
private Double channels;
@TableField(value = "RATED_EFFICIENCY")
private Double ratedEfficiency;
@TableField(value = "RATED_RESOLUTION")
private Double ratedResolution;
@TableField(value = "ECAL_RANGE_MAX")
private Double ecalRangeMax;
@TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dateBegin;
@TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dateEnd;
@TableField(value = "STATUS")
private String status;
@TableField(value = "DESCRIPTION")
private String description;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
@TableField(value = "STATION_ID")
private Integer stationId;
@TableField(exist = false)
private String stationName;
}

58
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
View File

@ -1,58 +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(value = "GARDS_STATIONS")
public class GardsStations implements Serializable {
@TableField(value = "STATION_ID")
private Integer stationId;
@TableField(value = "STATION_CODE")
private String stationCode;
@TableField(value = "COUNTRY_CODE")
private String countryCode;
@TableField(value = "TYPE")
private String type;
@TableField(value = "LON")
private Double lon;
@TableField(value = "LAT")
private Double lat;
@TableField(value = "ELEVATION")
private Double elevation;
@TableField(value = "DESCRIPTION")
private String description;
@TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dateBegin;
@TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dateEnd;
@TableField(value = "STATUS")
private String status;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}