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

优化import

Browse Source
This commit is contained in:
weidong 2024-09-28 11:57:55 +08:00
parent 676190fc0a
commit 31062ccd2c
27 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java
View File

@ -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（手机号）唯一确定

3
sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java
View File

@ -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（手机号）唯一确定

6
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/MQTTClient.java
View File

@ -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;

2
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
View File

@ -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)) {

2
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java
View File

@ -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;

4
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java
View File

@ -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;

2
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java
View File

@ -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

6
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator3.java
View File

@ -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.*;
/**

5
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/FocusCalculator4.java
View File

@ -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%的点求均值

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/GNSSCalcFilterService.java
View File

@ -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;

4
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java
View File

@ -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

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D31xConfigAckMessageExecutor.java
View File

@ -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;

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java
View File

@ -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;

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D342LocationMessageExecutor.java
View File

@ -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;

6
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D350TestMessageExecutor.java
View File

@ -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

14
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
View File

@ -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;

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
View File

@ -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;

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/message/D350TestMessage.java
View File

@ -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;

5
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/OnlineChannels.java
View File

@ -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;

5
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpServer.java
View File

@ -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;

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/udp/RtcmUdpHandler.java
View File

@ -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;

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/web/ApiController.java
View File

@ -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;

5
sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/DeviceApi.java
View File

@ -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);

5
sec-exapi/src/main/java/com/imdroid/sec_exapi/controller/GnssDataApi.java
View File

@ -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;

10
sec-exapi/src/main/java/com/imdroid/sec_exapi/entity/DeviceQueryResponse.java
View File

@ -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<Device> 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));
}
}

3
sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/OnlineChannels.java
View File

@ -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

1
sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java
View File

@ -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;