优化

‘liusuyi’

2023-08-08 4920f3a1290f2061f7b81db78ce0dab7b6ae8fc2

优化

 src/main/java/com/ard/alarm/radar/service/impl/ArdEquipRadarServiceImpl.java

@@ -4,14 +4,8 @@
import com.ard.alarm.radar.domain.ArdEquipRadar;
import com.ard.alarm.radar.mapper.ArdEquipRadarMapper;
import com.ard.alarm.radar.service.IArdEquipRadarService;
import com.ard.utils.tcp.ClientInitialize;
import com.ard.utils.tcp.NettyTcpClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;

/**
 * radarService业务层处理

 src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java

@@ -1,14 +1,11 @@
package com.ard.alarm.tube.service;

import com.alibaba.fastjson2.JSON;
import com.ard.utils.DateUtils;
import com.ard.utils.other.DateUtils;
import com.ard.utils.mqtt.MqttConsumer;
import com.ard.utils.tcp.NettyTcpClient;
import com.ard.utils.udp.NettyUdpServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

 src/main/java/com/ard/config/MinioClientSingleton.java

@@ -1,20 +1,12 @@
package com.ard.config;

import com.ard.utils.SpringTool;
import com.ard.utils.other.SpringTool;
import io.minio.MinioClient;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.context.annotation.Bean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.integration.channel.DefaultHeaderChannelRegistry;
import org.springframework.integration.channel.PublishSubscribeChannel;
import org.springframework.stereotype.Component;

import java.io.IOException;
import java.util.Properties;

/**
 * @Description:

 src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java

@@ -7,15 +7,15 @@
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.service.IArdEquipExternalService;
import com.ard.config.MinioClientSingleton;
import com.ard.utils.ByteUtils;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.domain.AccessControlHostEventInfo;
import com.ard.utils.hiksdk.domain.CameraEventInfo;
import com.ard.utils.hiksdk.domain.ExternalAlarmEventInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ard.utils.hiksdk.util.minio.MinioUtils;
import com.ard.utils.DateUtils;
import com.ard.utils.SpringTool;
import com.ard.utils.other.DateUtils;
import com.ard.utils.other.SpringTool;
import com.ard.utils.mqtt.MqttConsumer;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;

 src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java

@@ -4,7 +4,7 @@
import com.ard.alarm.camera.domain.CameraCmd;
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.config.MinioClientSingleton;
import com.ard.utils.ByteUtils;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
@@ -14,8 +14,6 @@
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;

import java.io.*;
import java.nio.ByteBuffer;

 src/main/java/com/ard/utils/other/ByteUtils.java

File was renamed from src/main/java/com/ard/utils/ByteUtils.java
@@ -1,6 +1,5 @@
package com.ard.utils;
package com.ard.utils.other;

import javax.xml.bind.DatatypeConverter;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;

 src/main/java/com/ard/utils/other/DateUtils.java

File was renamed from src/main/java/com/ard/utils/DateUtils.java
@@ -1,4 +1,4 @@
package com.ard.utils;
package com.ard.utils.other;
import org.apache.commons.lang3.time.DateFormatUtils;

import java.lang.management.ManagementFactory;

 src/main/java/com/ard/utils/other/GisUtils.java

File was renamed from src/main/java/com/ard/utils/GisUtils.java
@@ -1,4 +1,4 @@
package com.ard.utils;
package com.ard.utils.other;

import org.gavaghan.geodesy.Ellipsoid;
import org.gavaghan.geodesy.GeodeticCalculator;

 src/main/java/com/ard/utils/other/LonlatConver.java

File was renamed from src/main/java/com/ard/utils/LonlatConver.java
@@ -1,4 +1,4 @@
package com.ard.utils;
package com.ard.utils.other;
/**
 * 经纬度转换工具
 * 刘苏义

 src/main/java/com/ard/utils/other/SpringTool.java

File was renamed from src/main/java/com/ard/utils/SpringTool.java
@@ -1,4 +1,4 @@
package com.ard.utils;
package com.ard.utils.other;

import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
@@ -8,7 +8,6 @@
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component;

import java.nio.ByteBuffer;
import java.util.Properties;

/**

 src/main/java/com/ard/utils/tcp/ClientHandler.java

@@ -1,24 +1,14 @@
package com.ard.utils.tcp;

/**
 * @Description:
 * @ClassName: ClientHandler
 * @Author: 刘苏义
 * @Date: 2023年07月05日13:13
 * @Version: 1.0
 **/

import com.alibaba.fastjson2.JSON;
import com.ard.alarm.radar.domain.ArdAlarmRadar;
import com.ard.alarm.radar.domain.ArdEquipRadar;
import com.ard.alarm.radar.domain.RadarAlarmData;
import com.ard.utils.ByteUtils;
import com.ard.utils.GisUtils;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.other.GisUtils;
import com.ard.utils.mqtt.MqttConsumer;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelId;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -31,12 +21,14 @@
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;

/**
 * 客户端处理器
 *
 * @author lijiamin
 */
 * @Description: 客户端处理器
 * @ClassName: ClientHandler
 * @Author: 刘苏义
 * @Date: 2023年07月05日13:13
 * @Version: 1.0
 **/

@Slf4j(topic = "netty")
public class ClientHandler extends SimpleChannelInboundHandler<ByteBuf> {
    private ChannelHandlerContext context;
@@ -307,7 +299,7 @@
                    afTy = ByteUtils.toLittleEndian(afTy);
                    float fTy = ByteUtils.bytesToFloat(afTy);
                    //  log.info("垂直角度:" + fTy);
                    Double[] radarXY = {radarLagitude, radarLagitude};
                    Double[] radarXY = {radarLongitude, radarLagitude};
                    Double[] alarmXY = GisUtils.CalculateCoordinates(radarXY, Distance, (double) fTx);
                    //  log.info("报警信息：" + "【id】" + id + "【name】" + alarmPointName + "【alarmType】" + alarmType + "【alarmTime】" + alarmTime + "【distance】" + Distance + "【P】" + fTx + "【T】" + fTy + "【X】" + alarmXY[0] + "【Y】" + alarmXY[1]);
                    ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();

 src/main/java/com/ard/utils/tcp/MessageParsing.java

@@ -1,6 +1,6 @@
package com.ard.utils.tcp;

import com.ard.utils.ByteUtils;
import com.ard.utils.other.ByteUtils;

import javax.xml.bind.DatatypeConverter;
import java.util.ArrayList;
@@ -65,8 +65,7 @@
       // System.out.println(DatatypeConverter.printHexBinary(payload));
        //计算负载的crc32值
        byte[] NewCrc32 = ByteUtils.parseCrc32(payload);
        System.out.println("old:"+DatatypeConverter.printHexBinary(oldCrc32));
        System.out.println("new:"+DatatypeConverter.printHexBinary(NewCrc32));

        //判断数据的crc32校验值和计算值是否相同
        if (Arrays.equals(oldCrc32, NewCrc32)) {
            return true;

 src/main/java/com/ard/utils/tcp/NettyTcpClient.java

File was deleted

 src/main/java/com/ard/utils/tcp/NettyTcpClientHandler.java

File was deleted

 src/main/java/com/ard/utils/udp/NettyUdpHandler.java

@@ -1,7 +1,7 @@
package com.ard.utils.udp;

import com.ard.alarm.tube.service.TubeAlarmService;
import com.ard.utils.SpringTool;
import com.ard.utils.other.SpringTool;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;