From d51b83069ba25a338bf8350477e8818f45599a91 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 24 Jan 2025 22:46:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sideslope/bd/FocusCalculator1.java | 6 ++--- .../sideslope/bd/FocusCalculator2.java | 2 +- .../sideslope/bd/FocusCalculator5.java | 4 ++-- .../sideslope/bd/FocusCalculator6.java | 2 +- .../calc/SingleLineGNSSCalcService.java | 22 +++++++++---------- .../executor/D341LocationMessageExecutor.java | 4 ++-- .../D3F0SelfCheckMessageExecutor.java | 2 +- .../D3F2StopIndicationMessageExecutor.java | 2 +- .../sideslope/server/tcp/RtcmTcpHandler.java | 2 +- .../sideslope/service/WarningServiceImpl.java | 1 - 10 files changed, 23 insertions(+), 24 deletions(-) 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 6e152231..57131f52 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 @@ -152,7 +152,7 @@ public class FocusCalculator1 implements FocusCalculator{ // 求初始重心 double[] focus = focusPointObj(selectPoints); - logger.info("seed focus {},{},{},select size {}",focus[0],focus[1],focus[2],selectPoints.size()); + logger.debug("seed focus {},{},{},select size {}",focus[0],focus[1],focus[2],selectPoints.size()); // 迭代计算重心，直到选出50%的点 List filteredPoints=null; @@ -165,10 +165,10 @@ public class FocusCalculator1 implements FocusCalculator{ if(filteredPoints.size() == 0) continue; focus = focusPoint(filteredPoints); }while ((double)filteredPoints.size()/pointList.size() < pointSelectedRate); - if(null!=filteredPoints) logger.info("calc focus r:{}, point num:{}",r,filteredPoints.size()); + if(null!=filteredPoints) logger.debug("calc focus r:{}, point num:{}",r,filteredPoints.size()); return focus; }else{ - logger.info("calc focus iter num:0, point num:{}",selectPoints.size()); + logger.debug("calc focus iter num:0, point num:{}",selectPoints.size()); return focus; } 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 0d3eeba1..f32987a0 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 @@ -99,7 +99,7 @@ public class FocusCalculator2 extends FocusCalculator1{ while (iterator.hasNext()){ pointList.addAll(iterator.next().getValue()); } - logger.info("total fixed point num to calculated: {},{},{}",pointList.size(), + logger.debug("total fixed point num to calculated: {},{},{}",pointList.size(), cyclePointList.get(0).getKey(), cyclePointList.get(cyclePointList.size()-1).getKey()); if(pointList.size() >= gravityMaxCount){ diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator5.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator5.java index d4f872f5..3dbdc048 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator5.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator5.java @@ -87,7 +87,7 @@ public class FocusCalculator5 implements FocusCalculator{ pointList.clear(); } else{ - logger.info("{} num of fixed points:{}, less than {}",deviceId, pointList.size(),minPointNum); + logger.debug("{} num of fixed points:{}, less than {}",deviceId, pointList.size(),minPointNum); } tilts.clear(); counterNoB562 = 0; @@ -148,7 +148,7 @@ public class FocusCalculator5 implements FocusCalculator{ //取交集 eList.retainAll(nList); eList.retainAll(uList); - logger.info("{} fixed point selected: {}", deviceId, eList.size()); + logger.debug("{} fixed point selected: {}", deviceId, eList.size()); if(eList.size() == 0) return null; //求均值 diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator6.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator6.java index e3f01512..2a0e76f4 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator6.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator6.java @@ -63,7 +63,7 @@ public class FocusCalculator6 implements FocusCalculator{ pointList.clear(); } else{ - logger.info("{} num of fixed points:{}, less than {}",deviceId, pointList.size(),minPointNum); + logger.debug("{} num of fixed points:{}, less than {}",deviceId, pointList.size(),minPointNum); } tilts.clear(); counterNoB562 = 0; 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 b1388a08..61fb2180 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 @@ -136,14 +136,14 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { double[] doubles = message.getB562_loc();//unit: mm if(doubles !=null) { focusCalculator.addXyz(doubles, message.getCreateTime()); - logger.info("测站{}的b562单次解析结果:{}", deviceId,Arrays.toString(doubles)); + logger.debug("测站{}的b562单次解析结果:{}", deviceId,Arrays.toString(doubles)); } // 单次GGA Gga gga = message.getGga(); if(gga != null) { focusCalculator.addGGA(gga); - logger.info("测站{}的gga单次解析结果:{},{},{},{}",deviceId, + logger.debug("测站{}的gga单次解析结果:{},{},{},{}",deviceId, gga.getLongitude(), gga.getLatitude(), gga.getAltitude(), gga.getQuality()); if(groupCalc.getVer() == 7 && focusCalculator.isJump()){ logger.info("{}发生周跳",deviceId); @@ -227,11 +227,11 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { }*/ Tilt tilt = focusCalculator.avgTilt(); - logger.info("测站 {} 的b562相对坐标重心:{}", deviceId, Arrays.toString(b562Result)); - logger.info("测站 {} 参考坐标:{}", deviceId, Arrays.toString(referPos)); + logger.debug("测站 {} 的b562相对坐标重心:{}", deviceId, Arrays.toString(b562Result)); + logger.debug("测站 {} 参考坐标:{}", deviceId, Arrays.toString(referPos)); //logger.info("测站 {} 的惯导相对坐标:{}", deviceId, Arrays.toString(r9250Result)); //logger.info("测站 {} 的相对坐标融合值:{}", deviceId, Arrays.toString(mergeResult)); - logger.info("测站 {} 的Tilt平均值:{}", deviceId, tilt); + logger.debug("测站 {} 的Tilt平均值:{}", deviceId, tilt); /* if (mergeResult != null && b562Result != null) { //这里检查一下result，过滤1千米外非正常数据 @@ -299,7 +299,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { if(latestRpos != null) focusCalculator.setReferPoint(latestRpos); else { double[] avgEnu = gnssCalcFilterService.calcFilterValueByLastDay(locationRecord); - logger.info("{} calc 24 hours filtered pos", deviceId); + logger.debug("{} calc 24 hours filtered pos", deviceId); if (avgEnu != null) { ((FocusCalculator6) focusCalculator).setOriginalReferPoint(avgEnu); } @@ -324,23 +324,23 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { if(focusCalculator2.isOriginalReferPointSet()) { if (locationRecord.getEnabled() && locationRecord.getRpose() != null) { focusCalculator2.setReferPoint(new double[]{locationRecord.getRpose(), locationRecord.getRposn(), locationRecord.getRposd()}); - logger.info("{} set reference pos to filter result:{},{},{}", + logger.debug("{} set reference pos to filter result:{},{},{}", deviceId, locationRecord.getRpose(), locationRecord.getRposn(), locationRecord.getRposd()); } else{ - logger.info("{} reference pos not changed",deviceId); + logger.debug("{} reference pos not changed",deviceId); } } else{ // 查询设备有没有配置初始位置 if(device.getIPose()!=null){ focusCalculator2.setOriginalReferPoint(new double[]{device.getIPose(),device.getIPosn(),device.getIPosd()}); - logger.info("{} set reference pos to init pos:{},{},{}", + logger.debug("{} set reference pos to init pos:{},{},{}", deviceId,device.getIPose(),device.getIPosn(),device.getIPosd()); } else{ focusCalculator.setReferPoint(b562Result); - logger.info("{} set reference pos to b562 result",deviceId); + logger.debug("{} set reference pos to b562 result",deviceId); } } } @@ -386,7 +386,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { queryWrapper.last("limit 1"); GnssCalcData gnssCalcData = dataMapper.selectOne(queryWrapper); if(gnssCalcData != null){ - logger.info("{} getLatestPos", deviceId); + logger.debug("{} getLatestPos", deviceId); return new double[]{gnssCalcData.getRpose(),gnssCalcData.getRposn(),gnssCalcData.getRposd()}; } return null; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java index 013a5944..4448da94 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java @@ -100,13 +100,13 @@ public class D341LocationMessageExecutor implements Executor { @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { - logger.info("channel inactive"); + logger.debug("channel inactive"); ctx.close(); } diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java index 5530f374..f676fb88 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java @@ -286,7 +286,6 @@ public class WarningServiceImpl implements WarningService { queryWrapper.last("limit 1"); WarningMsg warningMsg = warningMsgMapper.selectOne(queryWrapper); if(warningMsg!=null){ - logger.info("update warningMsg {}",warningMsg.getId()); warningMsg.setCleartime(LocalDateTime.now()); warningMsgMapper.updateById(warningMsg); }