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

Merge remote-tracking branch 'origin/station' into station

Browse Source
This commit is contained in:
nieziyan 2023-07-12 17:02:00 +08:00
commit 8928607514
10 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class GardsSampleData implements Serializable {
*/ */
@TableField(value = "TRANSMIT_DTG") @TableField(value = "TRANSMIT_DTG")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date transmitDtg; private Date transmitDtg;
/** /**
@ -87,7 +87,7 @@ public class GardsSampleData implements Serializable {
*/ */
@TableField(value = "COLLECT_START") @TableField(value = "COLLECT_START")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date collectStart; private Date collectStart;
/** /**
@ -95,7 +95,7 @@ public class GardsSampleData implements Serializable {
*/ */
@TableField(value = "COLLECT_STOP") @TableField(value = "COLLECT_STOP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date collectStop; private Date collectStop;
/** /**
@ -103,7 +103,7 @@ public class GardsSampleData implements Serializable {
*/ */
@TableField(value = "ACQUISITION_START") @TableField(value = "ACQUISITION_START")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date acquisitionStart; private Date acquisitionStart;
/** /**
@ -111,7 +111,7 @@ public class GardsSampleData implements Serializable {
*/ */
@TableField(value = "ACQUISITION_STOP") @TableField(value = "ACQUISITION_STOP")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date acquisitionStop; private Date acquisitionStop;
/** /**
@ -161,4 +161,7 @@ public class GardsSampleData implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String calibReports; private String calibReports;
@TableField(exist = false)
private String dbName;
} }

8
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/EnergySpectrumHandler.java
View File

@ -33,4 +33,12 @@ public class EnergySpectrumHandler {
*/ */
public static native List<Double> GetFileFittingPara(List<Double> centroid_channel, List<Double> g_energy); public static native List<Double> GetFileFittingPara(List<Double> centroid_channel, List<Double> g_energy);
/**
* 根据channel 获取 Energy
* @param centroid_channel
* @param fittingPara
* @return
*/
public static native List<Double> GetFileFittingData(List<Double> centroid_channel, List<Double> fittingPara);
} }

6
jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
View File

@ -39,12 +39,12 @@ public class GardsStations implements Serializable {
@TableField(value = "DATE_BEGIN") @TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateBegin; private Date dateBegin;
@TableField(value = "DATE_END") @TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateEnd; private Date dateEnd;
@TableField(value = "STATUS") @TableField(value = "STATUS")
@ -52,7 +52,7 @@ public class GardsStations implements Serializable {
@TableField(value = "MODDATE") @TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date moddate; private Date moddate;
} }

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java
View File

@ -72,7 +72,7 @@ public class GardsDetectors implements Serializable {
*/ */
@TableField(value = "DATE_BEGIN") @TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dateBegin; private Date dateBegin;
/** /**
@ -80,7 +80,7 @@ public class GardsDetectors implements Serializable {
*/ */
@TableField(value = "DATE_END") @TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dateEnd; private Date dateEnd;
/** /**

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsNuclearfacility.java
View File

@ -66,7 +66,7 @@ public class GardsNuclearfacility implements Serializable {
*/ */
@TableField(value = "BUILDDATE") @TableField(value = "BUILDDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date buildDate; private Date buildDate;
/** /**
@ -74,7 +74,7 @@ public class GardsNuclearfacility implements Serializable {
*/ */
@TableField(value = "CRITICALITYDATE") @TableField(value = "CRITICALITYDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date criticalityDate; private Date criticalityDate;
/** /**

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
View File

@ -75,7 +75,7 @@ public class GardsStations implements Serializable {
*/ */
@TableField(value = "DATE_BEGIN") @TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateBegin; private Date dateBegin;
/** /**
@ -83,7 +83,7 @@ public class GardsStations implements Serializable {
*/ */
@TableField(value = "DATE_END") @TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateEnd; private Date dateEnd;
/** /**
@ -97,7 +97,7 @@ public class GardsStations implements Serializable {
*/ */
@TableField(value = "MODDATE") @TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date moddate; private Date moddate;
} }

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTask.java
View File

@ -28,7 +28,7 @@ public class SysTask implements Serializable {
@TableField(value = "scheduling_date") @TableField(value = "scheduling_date")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@NotBlank(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class}) @NotBlank(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class})
private Date schedulingDate; private Date schedulingDate;
@ -40,12 +40,12 @@ public class SysTask implements Serializable {
@TableField(value = "create_time") @TableField(value = "create_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
@TableField(value = "update_time") @TableField(value = "update_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime; private Date updateTime;
@TableField(exist = false) @TableField(exist = false)

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTaskStation.java
View File

@ -34,12 +34,12 @@ public class SysTaskStation implements Serializable {
@TableField(value = "create_time") @TableField(value = "create_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
@TableField(value = "update_time") @TableField(value = "update_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime; private Date updateTime;
@TableField(exist = false) @TableField(exist = false)

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

@ -30,7 +30,7 @@ public class GardsAnalysesAuto implements Serializable {
*/ */
@TableField(value = "ANALYSISBEGIN") @TableField(value = "ANALYSISBEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date analysisBegin; private Date analysisBegin;
/** /**
@ -38,7 +38,7 @@ public class GardsAnalysesAuto implements Serializable {
*/ */
@TableField(value = "ANALYSISEND") @TableField(value = "ANALYSISEND")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date analysisEnd; private Date analysisEnd;
/** /**
@ -142,7 +142,7 @@ public class GardsAnalysesAuto implements Serializable {
*/ */
@TableField(value = "MODDATE") @TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date moddate; private Date moddate;
@TableField(value = "USEDGASPHD") @TableField(value = "USEDGASPHD")

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

@ -475,7 +475,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
Map<Integer, String> stationMap = (Map<Integer, String>)redisUtil.get("stationMap"); Map<Integer, String> stationMap = (Map<Integer, String>)redisUtil.get("stationMap");
Page<GardsSampleData> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); Page<GardsSampleData> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss"); Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
Date endDate = DateUtils.parseDate(DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss"); Date endDate = DateUtils.parseDate(DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
LambdaQueryWrapper<GardsSampleData> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GardsSampleData> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(GardsSampleData::getStationId, stationIds); queryWrapper.in(GardsSampleData::getStationId, stationIds);
queryWrapper.in(GardsSampleData::getSampleId, sampleIds); queryWrapper.in(GardsSampleData::getSampleId, sampleIds);