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

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

Browse Source 
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
This commit is contained in:
xiaoguangbin 2024-07-16 14:35:57 +08:00
commit 277485ddda
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java
View File

@ -126,4 +126,8 @@ public class SymbolConstant {
public static final String LINE = "\n"; public static final String LINE = "\n";
public static final String AT = "@"; public static final String AT = "@";
public static final String VERTICAL = "|";
public static final char VERTICAL_CHAR = '|';
} }

11
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java
View File

@ -98,6 +98,17 @@ public class EnergySpectrumStruct {
*/ */
public double acquisition_live_time; public double acquisition_live_time;
/*************************** GPS Block ***********************/
/*
* 坐标: 经度值
* */
public double longitude;
/*
* 坐标: 纬度值
* */
public double latitude;
/************************* Collection Block ******************/ /************************* Collection Block ******************/
/** /**

8
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
View File

@ -222,15 +222,15 @@ public class SelfStationUtil extends AbstractLogOrReport {
Long count = hCounts.get(index.intValue()); Long count = hCounts.get(index.intValue());
if (count > 0){ if (count > 0){
HistogramData his = new HistogramData(); HistogramData his = new HistogramData();
his.setG(i); his.setG(j);
his.setB(j); his.setB(i);
his.setC(count); his.setC(count);
histogramDataList.add(his); histogramDataList.add(his);
histogramDataDList.add(his); histogramDataDList.add(his);
}else { }else {
HistogramData his = new HistogramData(); HistogramData his = new HistogramData();
his.setG(i); his.setG(j);
his.setB(j); his.setB(i);
his.setC(count); his.setC(count);
histogramDataDList.add(his); histogramDataDList.add(his);
} }