Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

修改b562解状态定义，和gnss模块定义保持一致

Browse Source
This commit is contained in:
weidong 2023-11-22 10:28:11 +08:00
parent 23f1c3d6f3
commit 3c6642accb
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator1.java
View File

@ -60,8 +60,8 @@ public class FocusCalculator1 implements FocusCalculator{
*/ */
@Override @Override
public void addXyz(double[] xyz){ public void addXyz(double[] xyz){
if(xyz[3] == UBXUtil.NO_B562) counterNoB562++; if((int)xyz[3] == UBXUtil.NO_B562) counterNoB562++;
else if(xyz[3] == UBXUtil.NO_FIX_RESULT) counterNoFixed++; else if((int)xyz[3] == UBXUtil.NO_FIX_RESULT) counterNoFixed++;
else { else {
counterFixedResult ++; counterFixedResult ++;
if (filter(xyz)) { if (filter(xyz)) {

4
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator2.java
View File

@ -32,8 +32,8 @@ public class FocusCalculator2 implements FocusCalculator{
*/ */
@Override @Override
public void addXyz(double[] xyz){ public void addXyz(double[] xyz){
if(xyz[3] == UBXUtil.NO_B562) counterNoB562++; if((int)xyz[3] == UBXUtil.NO_B562) counterNoB562++;
else if(xyz[3] == UBXUtil.NO_FIX_RESULT) counterNoFixed++; else if((int)xyz[3] == UBXUtil.NO_FIX_RESULT) counterNoFixed++;
else { else {
counterFixedResult ++; counterFixedResult ++;
if (filter(xyz)) { if (filter(xyz)) {

4
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/UBXUtil.java
View File

@ -14,9 +14,9 @@ public class UBXUtil {
* @return x,y,z 东，北，竖直 东为正数，北为正数，朝上为正数 * @return x,y,z 东，北，竖直 东为正数，北为正数，朝上为正数
*/ */
public static int FIX_RESULT = 0; public static int FIX_RESULT = 2;
public static int NO_FIX_RESULT = 1; public static int NO_FIX_RESULT = 1;
public static int NO_B562 = 2; public static int NO_B562 = 0;
public static double[] getLocation(ByteBuf data){ public static double[] getLocation(ByteBuf data){
boolean has_b562 = false; boolean has_b562 = false;

3
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/GNSSDeviceLocationRecordServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.imdroid.sideslope.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.imdroid.secapi.dto.*; import com.imdroid.secapi.dto.*;
import com.imdroid.sideslope.bd.Tilt; import com.imdroid.sideslope.bd.Tilt;
import com.imdroid.sideslope.bd.UBXUtil;
import com.imdroid.sideslope.message.D341LocationMessage; import com.imdroid.sideslope.message.D341LocationMessage;
import com.imdroid.sideslope.util.NumberUtils; import com.imdroid.sideslope.util.NumberUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -176,7 +177,7 @@ public class GNSSDeviceLocationRecordServiceImpl implements GNSSDeviceLocationRe
data.setYaw(tilt.getYaw()); data.setYaw(tilt.getYaw());
data.setShock(tilt.getShock()); data.setShock(tilt.getShock());
double[] b562_loc = message.getB562_loc(); double[] b562_loc = message.getB562_loc();
if(b562_loc!=null) { if((int)b562_loc[3] == UBXUtil.FIX_RESULT) {
data.setB562e(b562_loc[0]); data.setB562e(b562_loc[0]);
data.setB562n(b562_loc[1]); data.setB562n(b562_loc[1]);
data.setB562d(b562_loc[2]); data.setB562d(b562_loc[2]);