From 78569191047cb1b5f7c33944c8d16aa3a49c8188 Mon Sep 17 00:00:00 2001 From: weidong Date: Sun, 10 Dec 2023 08:57:44 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fixed:=20message=20head=E6=94=B9=E4=B8=BA?= =?UTF-8?q?Int=E5=9E=8B=EF=BC=8C=E4=BE=BF=E4=BA=8E=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sideslope/executor/D3F0SelfCheckMessageExecutor.java | 6 +++--- .../com/imdroid/sideslope/server/udp/RtcmUdpHandler.java | 2 +- .../imdroid/sideslope/service/DataPersistServiceImpl.java | 2 +- .../main/java/com/imdroid/sideslope/web/ApiController.java | 6 ------ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java index e0b2ebdd..2eb0f717 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java @@ -33,13 +33,13 @@ public class D3F0SelfCheckMessageExecutor implements Executor { dataPersistService.saveDeviceState(message); }); + // 通知beidou服务 + beidouClient.onDeviceActive(message.getId()); + // 存储最新设备状态信息到数据库中 return null; } diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java index d15caa25..256a919f 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java @@ -74,7 +74,7 @@ public class RtcmUdpHandler extends ChannelInboundHandlerAdapter { void procMessage(BaseMessage message, ChannelHandlerContext ctx, InetSocketAddress senderAddr){ // 为加快处理速度，只有收到D3F0/D3F2时才更新通道，包括对端地址和绑定imei DeviceChannel deviceChannel = null; - if (message.getHeader() == (short) 0xD3F0 || message.getHeader() == (short) 0xD3F2) { + if (message.getHeader() == 0xD3F0 || message.getHeader() == 0xD3F2) { OnlineChannels.INSTANCE.updateDeviceChannel(message.getId(), ctx.channel(), senderAddr); } else deviceChannel = OnlineChannels.INSTANCE.getDeviceChannel(message.getId()); diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java index 38f77c29..94779961 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java @@ -103,7 +103,7 @@ public class DataPersistServiceImpl implements DataPersistService { gnssMsg.setTenantid(message.getTenantId()); gnssMsg.setCreatetime(message.getCreateTime()); gnssMsg.setDeviceid(message.getId()); - gnssMsg.setMsgtype(((int)message.getHeader())&0xFFFF); + gnssMsg.setMsgtype(message.getHeader()); gnssMsg.setMsglen(message.getLen()); msgMapper.insert(gnssMsg); } diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/web/ApiController.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/web/ApiController.java index 77f16a09..0a0f5bef 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/web/ApiController.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/web/ApiController.java @@ -1,7 +1,6 @@ package com.imdroid.sideslope.web; import com.imdroid.secapi.client.HttpResp; -import com.imdroid.sideslope.calc.GNSSCalcService; import com.imdroid.sideslope.server.DeviceChannel; import com.imdroid.sideslope.server.OnlineChannels; import com.imdroid.sideslope.util.DataTypeUtil; @@ -9,9 +8,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.net.URLDecoder; @@ -28,9 +25,6 @@ public class ApiController { private final Logger logger = LoggerFactory.getLogger(ApiController.class); - @Autowired - private GNSSCalcService gnssCalcService; - @PostMapping(value = "/config") public HttpResp config(String deviceId, String configuration) { Map status = new HashMap<>();