diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java index 998e865b..3978517a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java @@ -126,4 +126,8 @@ public class SymbolConstant { public static final String LINE = "\n"; public static final String AT = "@"; + + public static final String VERTICAL = "|"; + + public static final char VERTICAL_CHAR = '|'; } \ No newline at end of file diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java index d0279728..ec50dd3c 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/native_jni/struct/EnergySpectrumStruct.java @@ -98,6 +98,17 @@ public class EnergySpectrumStruct { */ public double acquisition_live_time; + /*************************** GPS Block ***********************/ + /* + * 坐标: 经度值 + * */ + public double longitude; + + /* + * 坐标: 纬度值 + * */ + public double latitude; + /************************* Collection Block ******************/ /** diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java index 1b66d3e3..e670e3dc 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java @@ -222,15 +222,15 @@ public class SelfStationUtil extends AbstractLogOrReport { Long count = hCounts.get(index.intValue()); if (count > 0){ HistogramData his = new HistogramData(); - his.setG(i); - his.setB(j); + his.setG(j); + his.setB(i); his.setC(count); histogramDataList.add(his); histogramDataDList.add(his); }else { HistogramData his = new HistogramData(); - his.setG(i); - his.setB(j); + his.setG(j); + his.setB(i); his.setC(count); histogramDataDList.add(his); }