From 4c0612c7ddb3dbac05714f8480e132083954317f Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 4 Sep 2024 08:57:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E7=AE=97=E6=B3=956?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imdroid/sideslope/calc/GNSSCalcFilterService.java | 5 ++--- .../imdroid/sideslope/calc/SingleLineGNSSCalcService.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java index 2b2fb541..a3426704 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java @@ -334,8 +334,7 @@ public class GNSSCalcFilterService { msgMapper.insert(gnssMsg); } - public double[] calcFilterValueByLastDay(GnssCalcData curCalcData, GnssGroupCalc groupCalc, - double xyCompressRate, double zCompressRate){ + public double[] calcFilterValueByLastDay(GnssCalcData curCalcData){ LocalDateTime now = curCalcData.getCreatetime(); LocalDateTime beginTime = now.minusHours(48); QueryWrapper query = new QueryWrapper<>(); @@ -367,6 +366,6 @@ public class GNSSCalcFilterService { for (GnssCalcData point:subList){ sumValue += getFunction.apply(point); } - return sumValue/points.size(); + return sumValue/subList.size(); } } diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java index ecad7ec2..51456e9d 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java @@ -246,7 +246,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { else if(focusCalculator.getReferPoint() == null){ if(latestRpos != null) focusCalculator.setReferPoint(latestRpos); else { - double[] avgEnu = gnssCalcFilterService.calcFilterValueByLastDay(locationRecord, groupCalc, 0.2, 0.1); + double[] avgEnu = gnssCalcFilterService.calcFilterValueByLastDay(locationRecord); logger.info("{} calc 24 hours filtered pos", deviceId); if (avgEnu != null) { ((FocusCalculator6) focusCalculator).setOriginalReferPoint(avgEnu);