From 875d0dd423c9608b66d315728d89861f67dcceb3 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 26 Apr 2024 08:31:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E6=BB=A4=E6=B3=A2=E7=9A=84bug=202=E3=80=81=E6=B1=82?= =?UTF-8?q?=E9=87=8D=E5=BF=83=E5=87=BD=E6=95=B0=E7=9A=84=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=8D=8A=E5=BE=84=E6=94=B9=E4=B8=BA300mm=EF=BC=8C=E5=92=8C?= =?UTF-8?q?=E5=9D=8F=E7=82=B9=E9=97=A8=E9=99=90=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java | 6 +++--- .../java/com/imdroid/sideslope/bd/FocusCalculator1.java | 2 +- .../java/com/imdroid/sideslope/bd/FocusCalculator2.java | 2 +- .../com/imdroid/sideslope/calc/GNSSCalcFilterService.java | 4 ++++ .../imdroid/sideslope/calc/SingleLineGNSSCalcService.java | 3 ++- .../com/imdroid/beidou/test_device/task/BeidouDevice.java | 4 +++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java index cf79d544..bdd4687d 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java @@ -34,11 +34,11 @@ public class ZNYForwarder extends Forwarder{ /** * 每半小时转发GNSS解算结果 */ - /*@Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次 + @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次 private void checkDevice() { logger.info("zny checkDevice"); - checkOfflineDevice("2345078","2345073","2345065"); - }*/ + checkOfflineDevice("2345072","2345076","2345064"); + } @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次 private void forwardGnss() { diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java index 8382e057..2893d8f6 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java @@ -20,7 +20,7 @@ public class FocusCalculator1 implements FocusCalculator{ int gravityMinCount = 50; int gravityMaxCount = 300; double gravityInitR = 5;//mm - double gravityMaxR = 200;//mm + double gravityMaxR = 300;//mm double pointSelectedRate = 0.5; double iterStep = 1;//mm double[] referPoint; //参考点，一般是上一次计算的位置，用来辅助计算重心 diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java index 2585fab0..1ce6a63c 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java @@ -30,7 +30,7 @@ public class FocusCalculator2 extends FocusCalculator1{ public FocusCalculator2(){ super(); iterStep = 2;//2mm - gravityMaxR = 400; + gravityMaxR = 500; } @Override 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 18e83928..5d67de19 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 @@ -166,6 +166,8 @@ public class GNSSCalcFilterService { } void refreshFilterCycle(String deviceId, GnssGroupCalc groupCalc, GnssCalcData curCalcData){ + if(curCalcData.getAuxe()==null) return; + LocalDateTime now = LocalDateTime.now(); // 比较当前均值和FilterMinHour前的均值之差是否超过门限 LocalDateTime cmpTime = now.minusHours(groupCalc.getFilter_min_hour()); @@ -177,7 +179,9 @@ public class GNSSCalcFilterService { queryWrapper.last("limit 1"); queryWrapper.orderByDesc("createtime"); GnssCalcData gnssCalcData = repository.selectOne(queryWrapper); + if (gnssCalcData != null) { + if(gnssCalcData.getAuxe()==null) return; double gapE = Math.abs(gnssCalcData.getAuxe() - curCalcData.getAuxe()); double gapN = Math.abs(gnssCalcData.getAuxn() - curCalcData.getAuxn()); if (gapE >= groupCalc.getAuto_threshold() || gapN >= groupCalc.getAuto_threshold()) { 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 0e9f3cda..a9ceab44 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 @@ -125,7 +125,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { } catch (Exception e) { logger.error(e.toString()); } - },20, TimeUnit.SECONDS); + },30, TimeUnit.SECONDS); timerMap.put(device.getDeviceId(), future); } @@ -229,6 +229,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { } public void refreshGroupCalc(){ + groupCalcList.clear(); groupCalcList = groupCalcMapper.selectList(null); calculatorMap.clear(); logger.info("group paras changed"); diff --git a/sec-test-device/src/main/java/com/imdroid/beidou/test_device/task/BeidouDevice.java b/sec-test-device/src/main/java/com/imdroid/beidou/test_device/task/BeidouDevice.java index f2772ab1..6db71de8 100644 --- a/sec-test-device/src/main/java/com/imdroid/beidou/test_device/task/BeidouDevice.java +++ b/sec-test-device/src/main/java/com/imdroid/beidou/test_device/task/BeidouDevice.java @@ -77,6 +77,8 @@ public class BeidouDevice { executeAsD342("C:\\Users\\wd\\Desktop\\log\\2345076_0424_4xx.log"); executeAsD342("C:\\Users\\wd\\Desktop\\log\\2345076_0424_5xx.log"); */ + execute("C:\\Users\\wd\\Desktop\\log\\2353120_0424_1.log"); +/* executeAsD342("C:\\Users\\wd\\Desktop\\log\\2353120_0424_1.log"); executeAsD342("C:\\Users\\wd\\Desktop\\log\\2353120_0424_2.log"); executeAsD342("C:\\Users\\wd\\Desktop\\log\\2353120_0424_1xx.log"); @@ -84,7 +86,7 @@ public class BeidouDevice { executeAsD342("C:\\Users\\wd\\Desktop\\log\\2353120_0424_3xx.log"); executeAsD342("C:\\Users\\wd\\Desktop\\log\\2353120_0424_4xx.log"); executeAsD342("C:\\Users\\wd\\Desktop\\log\\2353120_0424_5xx.log"); - } +*/ } catch (Exception e){ }