From 31062ccd2c6012e82fc7a640ee1e898ef4c7793c Mon Sep 17 00:00:00 2001 From: weidong Date: Sat, 28 Sep 2024 11:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/imdroid/secapi/dto/TenantMapper.java | 2 +- .../java/com/imdroid/secapi/dto/UserMapper.java | 3 ++- .../com/imdroid/beidou_fwd/service/MQTTClient.java | 6 ++++-- .../com/imdroid/beidou_fwd/task/Forwarder.java | 2 +- .../imdroid/beidou_fwd/task/GXXfzForwarder.java | 2 +- .../imdroid/beidou_fwd/task/KingMaForwarder.java | 4 +++- .../com/imdroid/beidou_fwd/task/ZNYForwarder.java | 2 +- .../com/imdroid/sideslope/bd/FocusCalculator3.java | 6 +++++- .../com/imdroid/sideslope/bd/FocusCalculator4.java | 5 ++++- .../sideslope/calc/GNSSCalcFilterService.java | 2 +- .../sideslope/calc/SingleLineGNSSCalcService.java | 4 +++- .../executor/D31xConfigAckMessageExecutor.java | 2 +- .../executor/D341LocationMessageExecutor.java | 2 +- .../executor/D342LocationMessageExecutor.java | 2 +- .../executor/D350TestMessageExecutor.java | 6 ------ .../executor/D3F0SelfCheckMessageExecutor.java | 14 ++++++++------ .../D3F2StopIndicationMessageExecutor.java | 2 +- .../imdroid/sideslope/message/D350TestMessage.java | 2 -- .../imdroid/sideslope/server/OnlineChannels.java | 5 ++++- .../sideslope/server/tcp/RtcmTcpServer.java | 5 ++++- .../sideslope/server/udp/RtcmUdpHandler.java | 2 +- .../com/imdroid/sideslope/web/ApiController.java | 2 +- .../imdroid/sec_exapi/controller/DeviceApi.java | 5 +++-- .../imdroid/sec_exapi/controller/GnssDataApi.java | 5 ++++- .../sec_exapi/entity/DeviceQueryResponse.java | 10 +++++++--- .../imdroid/ntripproxy/service/OnlineChannels.java | 3 --- .../com/imdroid/ntripproxy/service/UDPClient.java | 1 + 27 files changed, 63 insertions(+), 43 deletions(-) diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java b/sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java index 9350775c..e100afce 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java @@ -1,7 +1,7 @@ package com.imdroid.secapi.dto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Mapper; /** * 用户配置，一个用户由name（手机号）唯一确定 diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java b/sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java index ec031a8e..17606058 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java @@ -1,7 +1,8 @@ package com.imdroid.secapi.dto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** * 用户配置，一个用户由name（手机号）唯一确定 diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/MQTTClient.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/MQTTClient.java index ee9bf82d..54a4fd59 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/MQTTClient.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/MQTTClient.java @@ -1,8 +1,10 @@ package com.imdroid.beidou_fwd.service; -import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java index 00dacb48..8d7c00ff 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java @@ -132,7 +132,7 @@ public class Forwarder { for(GnssDeviceJoin device:gnssDeviceList){ if(device.getOpmode() != GnssDevice.OP_MODE_USE) continue; String projectId = device.getProject_id(); - if(device.getProject2_id()!=null && !device.getProject2_id().isBlank()) { + if(device.getProject2_id()!=null && !device.getProject2_id().isEmpty()) { // 推送组2用项目2的id号 String fwdGroupId2 = device.getFwd_group_id2(); if (fwdGroupId2 != null && fwdGroupId2.equals(fwdGroupId)) { diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java index 6c394531..19d7f137 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java @@ -5,7 +5,7 @@ import com.imdroid.beidou_fwd.service.TCPClient; import com.imdroid.beidou_fwd.service.TCPListener; import com.imdroid.common.util.GsonUtil; import com.imdroid.common.util.NumberUtils; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssCalcData; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java index 503785a4..6579bf09 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java @@ -6,7 +6,9 @@ import com.imdroid.beidou_fwd.entity.KingMaData; import com.imdroid.common.util.GsonUtil; import com.imdroid.common.util.HttpUtils; import com.imdroid.common.util.NumberUtils; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssCalcData; +import com.imdroid.secapi.dto.GnssStatusMsg; +import com.imdroid.secapi.dto.GnssStatusMsgMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; 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 3e8dffc3..d48fd7bd 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 @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import java.time.LocalDateTime; -import java.util.*; +import java.util.List; @Component @Configuration diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java index a208dbc6..a06a40e8 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java @@ -3,7 +3,11 @@ package com.imdroid.sideslope.bd; import com.imdroid.sideslope.sal.Device; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + import static com.imdroid.sideslope.bd.GeoCoordConverterUtil.*; /** diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator4.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator4.java index e66a8309..7134d274 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator4.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator4.java @@ -3,7 +3,10 @@ package com.imdroid.sideslope.bd; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; /** * 1.简化重心计算，选取和参考点最近的50%的点求均值 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 8bb4ad51..583df40f 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 @@ -1,9 +1,9 @@ package com.imdroid.sideslope.calc; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.imdroid.common.util.NumberUtils; import com.imdroid.secapi.dto.*; import com.imdroid.sideslope.sal.Device; -import com.imdroid.common.util.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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 223c35e7..2ce8ef88 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 @@ -21,7 +21,9 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; /** * @author Layton * @date 2023/2/4 19:22 diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D31xConfigAckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D31xConfigAckMessageExecutor.java index cd151f61..af71cb09 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D31xConfigAckMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D31xConfigAckMessageExecutor.java @@ -1,7 +1,7 @@ package com.imdroid.sideslope.executor; -import com.imdroid.secapi.client.BeidouClient; import com.imdroid.common.util.ByteUtil; +import com.imdroid.secapi.client.BeidouClient; import com.imdroid.sideslope.message.D31xConfigAckMessage; import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.sal.DeviceService; 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 d7de3c6c..a72c5a97 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 @@ -1,12 +1,12 @@ package com.imdroid.sideslope.executor; +import com.imdroid.common.util.ThreadManager; import com.imdroid.secapi.client.BeidouClient; import com.imdroid.sideslope.bd.Gga; import com.imdroid.sideslope.calc.GNSSDataCalcService; import com.imdroid.sideslope.message.D341LocationMessage; import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.sal.DeviceService; -import com.imdroid.common.util.ThreadManager; import com.imdroid.sideslope.service.DataPersistService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java index 673a2192..3ea6b1a0 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java @@ -1,10 +1,10 @@ package com.imdroid.sideslope.executor; +import com.imdroid.common.util.ThreadManager; import com.imdroid.sideslope.calc.MultiLineGNSSCalcService; import com.imdroid.sideslope.message.D342LocationMessage; import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.sal.DeviceService; -import com.imdroid.common.util.ThreadManager; import com.imdroid.sideslope.service.DataPersistService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350TestMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350TestMessageExecutor.java index 07309a1e..805721bc 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350TestMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350TestMessageExecutor.java @@ -1,16 +1,10 @@ package com.imdroid.sideslope.executor; -import com.imdroid.secapi.client.BeidouClient; import com.imdroid.sideslope.message.D350TestMessage; -import com.imdroid.sideslope.sal.DeviceService; -import com.imdroid.sideslope.service.DataPersistService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.Resource; - /** * @author Layton * @date 2023/2/2 20:40 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 f787175d..54bd1f63 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 @@ -1,13 +1,15 @@ package com.imdroid.sideslope.executor; import com.imdroid.common.util.HexUtil; -import com.imdroid.secapi.client.BeidouClient; -import com.imdroid.secapi.dto.*; -import com.imdroid.sideslope.message.D3F0SelfCheckMessage; -import com.imdroid.sideslope.sal.DeviceService; -import com.imdroid.sideslope.sal.Device; -import com.imdroid.sideslope.service.DataPersistService; import com.imdroid.common.util.ThreadManager; +import com.imdroid.secapi.client.BeidouClient; +import com.imdroid.secapi.dto.GnssMsg; +import com.imdroid.secapi.dto.GnssMsgMapper; +import com.imdroid.secapi.dto.GnssStatus; +import com.imdroid.sideslope.message.D3F0SelfCheckMessage; +import com.imdroid.sideslope.sal.Device; +import com.imdroid.sideslope.sal.DeviceService; +import com.imdroid.sideslope.service.DataPersistService; import com.imdroid.sideslope.web.ApiController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java index 23ca41c3..b6be25d7 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java @@ -1,5 +1,6 @@ package com.imdroid.sideslope.executor; +import com.imdroid.common.util.ThreadManager; import com.imdroid.secapi.client.BeidouClient; import com.imdroid.secapi.dto.GnssTrxMsg; import com.imdroid.sideslope.calc.MultiLineGNSSCalcService; @@ -7,7 +8,6 @@ import com.imdroid.sideslope.message.D3F2StopIndicationMessage; import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.sal.DeviceService; import com.imdroid.sideslope.service.DataPersistService; -import com.imdroid.common.util.ThreadManager; import com.imdroid.sideslope.service.WarningService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D350TestMessage.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D350TestMessage.java index 1e492185..5790d882 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D350TestMessage.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D350TestMessage.java @@ -1,8 +1,6 @@ package com.imdroid.sideslope.message; import com.imdroid.sideslope.bd.Gga; -import com.imdroid.sideslope.bd.Tilt; -import com.imdroid.sideslope.bd.UBXUtil; import io.netty.buffer.ByteBuf; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java index 2a7a7d36..95159c08 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java @@ -3,7 +3,10 @@ package com.imdroid.sideslope.server; import io.netty.channel.Channel; import java.net.InetSocketAddress; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpServer.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpServer.java index 366ee2c4..4d0cf71c 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpServer.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpServer.java @@ -1,7 +1,10 @@ package com.imdroid.sideslope.server.tcp; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.logging.LogLevel; 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 998f47b2..d5596fe1 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 @@ -1,11 +1,11 @@ package com.imdroid.sideslope.server.udp; +import com.imdroid.common.util.DataTypeUtil; import com.imdroid.sideslope.exception.UnSupportedMessageException; import com.imdroid.sideslope.executor.BizExecutors; import com.imdroid.sideslope.executor.MessageParser; import com.imdroid.sideslope.message.BaseMessage; import com.imdroid.sideslope.server.OnlineChannels; -import com.imdroid.common.util.DataTypeUtil; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; 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 544bbc0b..33c5a929 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,12 +1,12 @@ package com.imdroid.sideslope.web; +import com.imdroid.common.util.DataTypeUtil; import com.imdroid.secapi.client.HttpResp; import com.imdroid.sideslope.calc.MultiLineGNSSCalcService; import com.imdroid.sideslope.calc.SingleLineGNSSCalcService; import com.imdroid.sideslope.sal.LocalDeviceServiceImpl; import com.imdroid.sideslope.server.DeviceChannel; import com.imdroid.sideslope.server.OnlineChannels; -import com.imdroid.common.util.DataTypeUtil; import com.imdroid.sideslope.service.WarningService; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/DeviceApi.java b/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/DeviceApi.java index 9db33490..54ca1abd 100644 --- a/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/DeviceApi.java +++ b/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/DeviceApi.java @@ -2,7 +2,8 @@ package com.imdroid.sec_exapi.controller; import com.imdroid.common.util.GsonUtil; import com.imdroid.sec_exapi.entity.DeviceQueryResponse; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssStatusJoin; +import com.imdroid.secapi.dto.GnssStatusMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +32,7 @@ public class DeviceApi { deviceQueryResponse.OK(); for(GnssStatusJoin device:deviceList){ deviceQueryResponse.addDevice(device.getDeviceid(),device.getName(), - device.getUpdatetime().format(formatter)); + device.getUpdatetime().format(formatter),device.getState()); } String json = GsonUtil.toJson(deviceQueryResponse); logger.info(json); diff --git a/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/GnssDataApi.java b/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/GnssDataApi.java index 388fed74..da846617 100644 --- a/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/GnssDataApi.java +++ b/sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/GnssDataApi.java @@ -6,7 +6,10 @@ import com.github.yulichang.query.MPJQueryWrapper; import com.imdroid.common.util.GsonUtil; import com.imdroid.common.util.NumberUtils; import com.imdroid.sec_exapi.entity.GnssQueryResponse; -import com.imdroid.secapi.dto.*; +import com.imdroid.secapi.dto.GnssCalcData; +import com.imdroid.secapi.dto.GnssCalcDataMapper; +import com.imdroid.secapi.dto.GnssDevice; +import com.imdroid.secapi.dto.GnssDeviceMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sec-exapi/src/main/java/com/imdroid/sec_exapi/entity/DeviceQueryResponse.java b/sec-exapi/src/main/java/com/imdroid/sec_exapi/entity/DeviceQueryResponse.java index 4d0b6bb1..fc9ed105 100644 --- a/sec-exapi/src/main/java/com/imdroid/sec_exapi/entity/DeviceQueryResponse.java +++ b/sec-exapi/src/main/java/com/imdroid/sec_exapi/entity/DeviceQueryResponse.java @@ -1,5 +1,6 @@ package com.imdroid.sec_exapi.entity; +import com.imdroid.secapi.dto.GnssStatus; import lombok.Data; import java.util.ArrayList; @@ -11,16 +12,19 @@ public class DeviceQueryResponse extends BasicResponse{ String deviceId;//设备编号 String pointName;//测点名称 String updateTime; + Short state = 1;//0离线，1在线 - public Device(String deviceId, String pointName, String updateTime){ + public Device(String deviceId, String pointName, String updateTime, Short state){ this.deviceId = deviceId; this.pointName = pointName; this.updateTime = updateTime; + if(state==GnssStatus.STATE_OFFLINE) this.state = GnssStatus.STATE_OFFLINE; + else this.state = GnssStatus.STATE_ACTIVE; } } List data=new ArrayList<>(); - public void addDevice(String deviceId, String pointName, String updateTime){ - data.add(new Device(deviceId, pointName, updateTime)); + public void addDevice(String deviceId, String pointName, String updateTime, Short state){ + data.add(new Device(deviceId, pointName, updateTime,state)); } } diff --git a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/OnlineChannels.java b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/OnlineChannels.java index db3d9ded..74512c8d 100644 --- a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/OnlineChannels.java +++ b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/OnlineChannels.java @@ -3,12 +3,9 @@ package com.imdroid.ntripproxy.service; import io.netty.channel.Channel; import java.net.InetSocketAddress; -import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; /** * @author Layton diff --git a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java index f3673aa7..31651ab0 100644 --- a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java +++ b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java @@ -3,6 +3,7 @@ package com.imdroid.ntripproxy.service; import com.imdroid.common.util.DataTypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress;