配置文件全部更改为配置类 优化包路径

‘liusuyi’

2023-12-05 745d5b90be7d8cdb8873b18d18b286fdc4b6913b

配置文件全部更改为配置类
优化包路径

 src/main/java/com/ard/alarm/apponekey/service/impl/ArdAlarmApponekeyServiceImpl.java

@@ -4,7 +4,7 @@

import com.alibaba.fastjson2.JSON;
import com.ard.utils.mqtt.MqttProducer;
import com.ard.utils.uuid.IdUtils;
import com.ard.utils.util.IdUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.ard.alarm.apponekey.domain.ArdAlarmApponekey;

 src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java

@@ -9,9 +9,7 @@
import com.ard.alarm.camera.domain.ArdCameras;

import com.ard.alarm.camera.mapper.ArdCamerasMapper;

import com.ard.alarm.camera.service.IArdCamerasService;

import com.ard.alarm.external.domain.ArdEquipExternal;

import com.ard.alarm.external.mapper.ArdEquipExternalMapper;

import com.ard.utils.hiksdk.service.impl.HikClientUtil;

import com.ard.utils.sdk.hiksdk.service.impl.HikClientUtil;

import com.baomidou.mybatisplus.core.conditions.Wrapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import lombok.extern.slf4j.Slf4j;

@@ -20,7 +18,6 @@
import org.springframework.core.annotation.Order;

import org.springframework.stereotype.Service;



import javax.annotation.PostConstruct;

import javax.annotation.Resource;



/**


 src/main/java/com/ard/alarm/digitization/config/Digit3Configuration.java

New file
@@ -0,0 +1,20 @@
package com.ard.alarm.digitization.config;

import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

/**
 * @Description:
 * @ClassName: Digit3Configuration
 * @Author: 刘苏义
 * @Date: 2023年12月05日8:58:02
 **/
@Data
@Configuration
@ConfigurationProperties("digitization3")
public class Digit3Configuration {

    private Boolean enabled;
}

 src/main/java/com/ard/alarm/digitization/service/impl/DataBridgeServiceImpl.java

@@ -1,6 +1,7 @@
package com.ard.alarm.digitization.service.impl;

import com.alibaba.fastjson2.JSON;
import com.ard.alarm.digitization.config.Digit3Configuration;
import com.ard.alarm.digitization.model.DataBridge;
import com.ard.alarm.digitization.service.DataBridgeService;
import com.ard.utils.jdbc.Query;
@@ -10,6 +11,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

@@ -25,14 +27,14 @@
public class DataBridgeServiceImpl implements DataBridgeService {

    public static Date lastTime;
    @Value("${spring.digitization3.enabled}")
    private Boolean enabled;
    @Resource
    Digit3Configuration digit3Config;

    @Scheduled(cron = "0/5 * * * * ?")
    public void alarmHandler() {
        List<DataBridge> dataBridgeList;
        try {
            if(!enabled)
            if(!digit3Config.getEnabled())
            {
                return;
            }

 src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java

@@ -6,14 +6,12 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.mapper.ArdEquipExternalMapper;
import com.ard.alarm.external.service.IArdEquipExternalService;
import com.ard.utils.hiksdk.service.impl.HikClientUtil;
import com.ard.utils.sdk.hiksdk.service.impl.HikClientUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;

 src/main/java/com/ard/alarm/radar/controller/RadarController.java

@@ -4,9 +4,9 @@
import com.ard.alarm.radar.domain.GuideInfo;
import com.ard.alarm.radar.service.IArdEquipRadarService;
import com.ard.utils.http.AjaxResult;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.other.GisUtils;
import com.ard.utils.tcp.ClientInitialize;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.util.GisUtils;
import com.ard.utils.netty.tcp.ClientInitialize;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
@@ -16,8 +16,6 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;

/**
 * @Description: 雷达接口

 src/main/java/com/ard/alarm/stealelec/config/StealElecConfiguration.java

New file
@@ -0,0 +1,21 @@
package com.ard.alarm.stealelec.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

/**
 * @Description:
 * @ClassName: StealElecConfiguration
 * @Author: 刘苏义
 * @Date: 2023年12月05日9:00:33
 **/
@Configuration
@Data
@ConfigurationProperties(prefix = "stealelec")
public class StealElecConfiguration {

    private String url;

    private Boolean enabled;
}

 src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.ard.alarm.stealelec.config.StealElecConfiguration;
import com.ard.alarm.stealelec.domain.ArdAlarmStealelec;
import com.ard.utils.http.HttpUtils;
import com.ard.utils.mqtt.MqttProducer;
@@ -11,6 +12,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -26,10 +28,8 @@
@Service
public class StealElecAlarmService {

    @Value("${spring.stealelec.url}")
    private String stealElecUrl;
    @Value("${spring.stealelec.enabled}")
    private Boolean enabled;
@Resource
    StealElecConfiguration stealElecConfig;
    List<String> tempList = new ArrayList<>();

    /**
@@ -44,10 +44,10 @@
    @Scheduled(cron = "0/5 * * * * ?")
    public void alarmHandler() {
        try {
            if (!enabled) {
            if (!stealElecConfig.getEnabled()) {
                return;
            }
            String allAlarmData = HttpUtils.sendGet(stealElecUrl);
            String allAlarmData = HttpUtils.sendGet(stealElecConfig.getUrl());
            //剔除所有\符号
            String message = allAlarmData.replaceAll("\\\\", "");
            //剔除整个字符串首尾双引号

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

@@ -1,15 +1,19 @@
package com.ard.alarm.tube.service;

import com.alibaba.fastjson2.JSON;
import com.ard.utils.other.DateUtils;
import com.ard.utils.netty.config.NettyUdpConfiguration;
import com.ard.utils.util.DateUtils;
import com.ard.utils.mqtt.MqttProducer;
import com.ard.utils.udp.NettyUdpServer;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioDatagramChannel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -24,25 +28,7 @@
 **/
@Service
@Slf4j(topic = "tube")
@Order(3)
public class TubeAlarmService {
    @Resource
    NettyUdpServer nettyUdpServer;

    @Value("${spring.netty.udp.port}")
    private Integer udpPort;
    @Value("${spring.netty.udp.enabled}")
    private String UdpServerEnable;

    @PostConstruct
    public void init() {
        if (UdpServerEnable.equals("false")) {
            return;
        }
        nettyUdpServer.init(udpPort);
        log.debug("管线泄露UDP服务已启动");
    }


    @Async("alarm")
    public void alarmHandler(String message) {
@@ -81,6 +67,5 @@
            log.error("tube报警数据推送异常：" + ex.getMessage());
        }
    }


}

 src/main/java/com/ard/utils/constants/Constants.java

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

/**
 * @Description: 通用常量信息

 src/main/java/com/ard/utils/http/HttpUtils.java

@@ -18,11 +18,9 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;

import com.ard.utils.Constants;
import com.ard.utils.constants.Constants;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * 通用http发送方法

 src/main/java/com/ard/utils/minio/MinioConfig.java

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

import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@@ -14,13 +16,12 @@

@Configuration
@Slf4j(topic = "minio")
@ConfigurationProperties("minio")
@Data
public class MinioConfig {

    @Value("${spring.minio.endpoint}")
    private String endpoint;
    @Value("${spring.minio.accessKey}")
    private String accessKey;
    @Value("${spring.minio.secretKey}")
    private String secretKey;

    @Bean

 src/main/java/com/ard/utils/minio/MinioUtil.java

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

import com.ard.utils.other.StringUtils;
import com.ard.utils.uuid.IdUtils;
import com.ard.utils.util.StringUtils;
import com.ard.utils.util.IdUtils;
import io.minio.*;
import io.minio.http.Method;
import io.minio.messages.*;

 src/main/java/com/ard/utils/mqtt/MqttConfiguration.java

New file
@@ -0,0 +1,32 @@
package com.ard.utils.mqtt;

import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

/**
 * @Description:
 * @ClassName: MqttConfiguration
 * @Author: 刘苏义
 * @Date: 2023年12月05日8:51:24
 **/
@Data
@Configuration
@ConfigurationProperties("mqtt")
public class MqttConfiguration {

    private Boolean enabled;

    private String host;

    private String clientId;

    private String username;

    private String password;

    private int timeout;

    private int keepalive;
}

 src/main/java/com/ard/utils/mqtt/MqttProducer.java

@@ -9,6 +9,7 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;

/**
@@ -22,27 +23,15 @@
@Slf4j(topic = "mqtt")
@Order(1)
public class MqttProducer implements ApplicationRunner {
    @Value("${spring.mqtt.enabled}")
    private Boolean MQTT_ENABLED;
    @Value("${spring.mqtt.host}")
    private String MQTT_HOST;
    @Value("${spring.mqtt.clientId}")
    private String MQTT_CLIENT_ID;
    @Value("${spring.mqtt.username}")
    private String MQTT_USER_NAME;
    @Value("${spring.mqtt.password}")
    private String MQTT_PASSWORD;
    @Value("${spring.mqtt.timeout}")
    private int MQTT_TIMEOUT;
    @Value("${spring.mqtt.keepalive}")
    private int MQTT_KEEP_ALIVE;
    @Resource
    MqttConfiguration mqttConfig;

    private static MqttClient client;

    @Override
    public void run(ApplicationArguments args) {
        log.debug("初始化并启动mqtt......");
        if (MQTT_ENABLED) {
        if (mqttConfig.getEnabled()) {
            this.connect();
        }
    }
@@ -70,7 +59,7 @@
    public void getClient() {
        try {
            if (null == client) {
                client = new MqttClient(MQTT_HOST, MQTT_CLIENT_ID, new MemoryPersistence());
                client = new MqttClient(mqttConfig.getHost(), mqttConfig.getClientId(), new MemoryPersistence());
            }
            log.debug("--创建mqtt客户端");
        } catch (Exception e) {
@@ -84,12 +73,12 @@
    public MqttConnectOptions getOptions() {
        MqttConnectOptions options = new MqttConnectOptions();
        //设置用户名密码
        options.setUserName(MQTT_USER_NAME);
        options.setPassword(MQTT_PASSWORD.toCharArray());
        options.setUserName(mqttConfig.getUsername());
        options.setPassword(mqttConfig.getPassword().toCharArray());
        // 设置超时时间
        options.setConnectionTimeout(MQTT_TIMEOUT);
        options.setConnectionTimeout(mqttConfig.getTimeout());
        // 设置会话心跳时间
        options.setKeepAliveInterval(MQTT_KEEP_ALIVE);
        options.setKeepAliveInterval(mqttConfig.getKeepalive());
        // 是否清除session
        options.setCleanSession(false);
        log.debug("--生成mqtt配置对象");

 src/main/java/com/ard/utils/netty/config/NettyTcpConfiguration.java

New file
@@ -0,0 +1,18 @@
package com.ard.utils.netty.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

/**
 * @Description:
 * @ClassName: NettyTcpConfiguration
 * @Author: 刘苏义
 * @Date: 2023年12月05日9:14:16
 **/
@Configuration
@Data
@ConfigurationProperties(prefix = "netty.tcp")
public class NettyTcpConfiguration {
    Boolean enabled;
}

 src/main/java/com/ard/utils/netty/config/NettyUdpConfiguration.java

New file
@@ -0,0 +1,21 @@
package com.ard.utils.netty.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

/**
 * @Description:
 * @ClassName: NettyConfiguration
 * @Author: 刘苏义
 * @Date: 2023年12月05日9:07:18
 **/
@Configuration
@Data
@ConfigurationProperties(prefix = "netty.udp")
public class NettyUdpConfiguration {

    private Integer port;
    private Boolean enabled;

}

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

File was renamed from src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -1,11 +1,11 @@
package com.ard.utils.tcp;
package com.ard.utils.netty.tcp;

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.other.ByteUtils;
import com.ard.utils.other.GisUtils;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.util.GisUtils;
import com.ard.utils.mqtt.MqttProducer;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -13,7 +13,6 @@
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;

import javax.xml.bind.DatatypeConverter;
import java.net.InetSocketAddress;
@@ -22,7 +21,7 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;

import static com.ard.utils.other.ByteUtils.toLittleEndian;
import static com.ard.utils.util.ByteUtils.toLittleEndian;

/**
 * @Description: 客户端处理器

 src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java

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

/**
 * @Description:
@@ -10,19 +10,18 @@

import com.ard.alarm.radar.domain.ArdEquipRadar;
import com.ard.alarm.radar.service.IArdEquipRadarService;
import com.ard.utils.netty.config.NettyTcpConfiguration;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
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.stereotype.Component;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -39,12 +38,10 @@
@Slf4j(topic = "netty")
@Order(2)
public class ClientInitialize implements ApplicationRunner {

    @Resource
    NettyTcpConfiguration nettyTcpConfig;
    @Resource
    IArdEquipRadarService ardEquipRadarService;

    @Value("${spring.netty.tcp.enabled}")
    private Boolean tcpClientEnable;

    private Bootstrap bootstrap;
    public static CopyOnWriteArraySet<ArdEquipRadar> falseConnectSet = new CopyOnWriteArraySet();
@@ -127,7 +124,7 @@
     */
    @Override
    public void run(ApplicationArguments args) {
        if (!tcpClientEnable) {
        if (!nettyTcpConfig.getEnabled()) {
            return;
        }
        initNettyTcp();//初始化nettyTcp
@@ -135,7 +132,7 @@
        for (ArdEquipRadar ardEquipRadar : ardEquipRadars) {
            String host = ardEquipRadar.getIp();
            Integer port = Integer.valueOf(ardEquipRadar.getPort());
            log.debug("TCP client try to connect radar【：" + host + ":" + port+"】");
            log.debug("TCP client try to connect radar【" + host + ":" + port+"】");
            connectServer(ardEquipRadar);//连接每一个雷达服务
        }
    }

 src/main/java/com/ard/utils/netty/tcp/DynamicClient.java

File was renamed from src/main/java/com/ard/utils/tcp/DynamicClient.java
@@ -1,13 +1,13 @@
package com.ard.utils.tcp;
package com.ard.utils.netty.tcp;

import com.ard.alarm.radar.domain.ArdEquipRadar;
import com.ard.alarm.radar.service.IArdEquipRadarService;
import com.ard.utils.netty.config.NettyTcpConfiguration;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioSocketChannel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -28,9 +28,8 @@
public class DynamicClient {
    @Resource
    IArdEquipRadarService ardEquipRadarService;

    @Value("${spring.netty.tcp.enabled}")
    private Boolean tcpClientEnable;
    @Resource
    NettyTcpConfiguration nettyTcpConfig;

    private static List<Channel> serverChannels = new ArrayList<>();
    public static ConcurrentHashMap<Channel, ArdEquipRadar> ConnectMap = new ConcurrentHashMap();
@@ -128,7 +127,7 @@
     */
    //@Override
    public void run(ApplicationArguments args) {
        if (!tcpClientEnable) {
        if (!nettyTcpConfig.getEnabled()) {
            return;
        }
        EventLoopGroup group = new NioEventLoopGroup();

 src/main/java/com/ard/utils/netty/tcp/DynamicClientHandler.java

File was renamed from src/main/java/com/ard/utils/tcp/DynamicClientHandler.java
@@ -1,12 +1,12 @@
package com.ard.utils.tcp;
package com.ard.utils.netty.tcp;

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.mqtt.MqttProducer;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.other.GisUtils;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.util.GisUtils;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
@@ -18,8 +18,8 @@
import java.util.*;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import static com.ard.utils.other.ByteUtils.byteToBitString;
import static com.ard.utils.other.ByteUtils.toLittleEndian;
import static com.ard.utils.util.ByteUtils.byteToBitString;
import static com.ard.utils.util.ByteUtils.toLittleEndian;

/**
 * @Description: 客户端数据处理器（备用）

 src/main/java/com/ard/utils/netty/tcp/DynamicClientInitializer.java

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

import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;

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

File was renamed from src/main/java/com/ard/utils/tcp/MessageParsing.java
@@ -1,6 +1,6 @@
package com.ard.utils.tcp;
package com.ard.utils.netty.tcp;

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

import javax.xml.bind.DatatypeConverter;
import java.util.ArrayList;

 src/main/java/com/ard/utils/netty/udp/InitUdpServer.java

New file
@@ -0,0 +1,29 @@
package com.ard.utils.netty.udp;

import com.ard.utils.netty.config.NettyUdpConfiguration;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;

/**
 * @Description: 初始化启动nettyUdp服务
 * @ClassName: InitUdpServer
 * @Author: 刘苏义
 * @Date: 2023年12月05日9:59:50
 **/
@Component
public class InitUdpServer {
    @Resource
    NettyUdpServer nettyUdpServer;
    @Resource
    NettyUdpConfiguration nettyUdpConfig;

    @PostConstruct
    void start()
    {
        if(nettyUdpConfig.getEnabled()) {
            nettyUdpServer.start(nettyUdpConfig.getPort());
        }
    }
}

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

File was renamed from src/main/java/com/ard/utils/udp/NettyUdpHandler.java
@@ -1,7 +1,7 @@
package com.ard.utils.udp;
package com.ard.utils.netty.udp;

import com.ard.alarm.tube.service.TubeAlarmService;
import com.ard.utils.spring.SpringUtils;
import com.ard.utils.util.SpringUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
@@ -11,7 +11,7 @@

import java.nio.charset.Charset;

@Slf4j(topic = "tube")
@Slf4j(topic = "netty")
public class NettyUdpHandler extends SimpleChannelInboundHandler<DatagramPacket> {

    @Override

 src/main/java/com/ard/utils/netty/udp/NettyUdpServer.java

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

import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFuture;
@@ -11,15 +11,20 @@
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.stereotype.Component;

/**
 * netty服务异步初始化
 * 刘苏义
 * 2023/12/5 10:04:51
 */
@EnableAsync
@Component
@Slf4j(topic = "tube")
@Slf4j(topic = "netty")
public class NettyUdpServer {
    /**
     * 启动服务
     */
    @Async("alarm")
    public void init(int port) {
    public void start(int port) {
        //表示服务器连接监听线程组，专门接受 accept 新的客户端client 连接
        EventLoopGroup bossLoopGroup = new NioEventLoopGroup();
        try {

 src/main/java/com/ard/utils/sdk/hiksdk/common/GlobalVariable.java

File was renamed from src/main/java/com/ard/utils/hiksdk/common/GlobalVariable.java
@@ -1,7 +1,6 @@
package com.ard.utils.hiksdk.common;
package com.ard.utils.sdk.hiksdk.common;

import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.external.domain.ArdEquipExternal;
import lombok.Data;
import java.util.HashMap;
import java.util.Map;

 src/main/java/com/ard/utils/sdk/hiksdk/domain/AccessControlHostEventInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/AccessControlHostEventInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.Data;


 src/main/java/com/ard/utils/sdk/hiksdk/domain/CameraEventInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/CameraEventInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.Data;


 src/main/java/com/ard/utils/sdk/hiksdk/domain/DeviceInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/DeviceInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.Data;


 src/main/java/com/ard/utils/sdk/hiksdk/domain/ExternalAlarmEventInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/ExternalAlarmEventInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.Data;


 src/main/java/com/ard/utils/sdk/hiksdk/domain/FaceMatchEventInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/FaceMatchEventInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.Data;


 src/main/java/com/ard/utils/sdk/hiksdk/domain/FaceSnapEventInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/FaceSnapEventInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.Data;


 src/main/java/com/ard/utils/sdk/hiksdk/domain/recordInfo.java

File was renamed from src/main/java/com/ard/utils/hiksdk/domain/recordInfo.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.domain;
package com.ard.utils.sdk.hiksdk.domain;

import lombok.AllArgsConstructor;
import lombok.Data;

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

File was renamed from src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.service.impl;
package com.ard.utils.sdk.hiksdk.service.impl;

import com.alibaba.fastjson2.JSON;
import com.ard.alarm.camera.domain.ArdCameras;
@@ -6,14 +6,14 @@
import com.ard.alarm.camera.service.impl.ArdCamerasServiceImpl;
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.service.impl.ArdEquipExternalServiceImpl;
import com.ard.utils.hiksdk.domain.*;
import com.ard.utils.sdk.hiksdk.domain.*;
import com.ard.utils.minio.MinioUtil;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ard.utils.other.DateUtils;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
import com.ard.utils.sdk.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ard.utils.util.DateUtils;
import com.ard.utils.mqtt.MqttProducer;
import com.ard.utils.uuid.IdUtils;
import com.ard.utils.util.IdUtils;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;

@@ -23,7 +23,7 @@
import java.util.Date;
import java.util.Optional;

import static com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK.*;
import static com.ard.utils.sdk.hiksdk.util.hikSdkUtil.HCNetSDK.*;

/**
 * @ClassName: FMSGCallBack

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

File was renamed from src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
@@ -1,15 +1,13 @@
package com.ard.utils.hiksdk.service.impl;

package com.ard.utils.sdk.hiksdk.service.impl;


import com.ard.alarm.camera.domain.ArdCameras;

import com.ard.alarm.camera.domain.CameraCmd;

import com.ard.alarm.external.domain.ArdEquipExternal;

import com.ard.utils.minio.MinioUtil;

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;

import com.ard.utils.spring.SpringUtils;

import com.sun.jna.Native;

import com.ard.utils.util.ByteUtils;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
import com.ard.utils.sdk.hiksdk.domain.DeviceInfo;
import com.ard.utils.sdk.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.sun.jna.Platform;

import com.sun.jna.Pointer;

import com.sun.jna.ptr.IntByReference;


 src/main/java/com/ard/utils/sdk/hiksdk/service/impl/LoginResultCallBack.java

File was renamed from src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
@@ -1,8 +1,8 @@
package com.ard.utils.hiksdk.service.impl;
package com.ard.utils.sdk.hiksdk.service.impl;

import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
import com.ard.utils.sdk.hiksdk.domain.DeviceInfo;
import com.ard.utils.sdk.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;


 src/main/java/com/ard/utils/sdk/hiksdk/util/hikSdkUtil/HCNetSDK.java

File was renamed from src/main/java/com/ard/utils/hiksdk/util/hikSdkUtil/HCNetSDK.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.util.hikSdkUtil;

package com.ard.utils.sdk.hiksdk.util.hikSdkUtil;


import com.ard.utils.sdk.LibraryLoad;

import com.sun.jna.*;


 src/main/java/com/ard/utils/sdk/hiksdk/util/hikSdkUtil/HIKSDKStructure.java

File was renamed from src/main/java/com/ard/utils/hiksdk/util/hikSdkUtil/HIKSDKStructure.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.util.hikSdkUtil;
package com.ard.utils.sdk.hiksdk.util.hikSdkUtil;

import com.sun.jna.Structure;


 src/main/java/com/ard/utils/sdk/hiksdk/util/imageUtil/waterMarkUtil.java

File was renamed from src/main/java/com/ard/utils/hiksdk/util/imageUtil/waterMarkUtil.java
@@ -1,4 +1,4 @@
package com.ard.utils.hiksdk.util.imageUtil;
package com.ard.utils.sdk.hiksdk.util.imageUtil;

/**
 * @ClassName WaterMarkUtil

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

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

import javax.xml.bind.DatatypeConverter;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.zip.CRC32;

import static oracle.security.pki.util.SignatureAlgorithms.i;

/**
 * @Description: 字节工具类

 src/main/java/com/ard/utils/util/CodeGeneration.java

File was renamed from src/main/java/com/ard/utils/other/CodeGeneration.java
@@ -1,11 +1,9 @@
package com.ard.utils.other;
package com.ard.utils.util;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.Oracle12cDialect;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.config.*;
import com.baomidou.mybatisplus.generator.config.querys.OracleQuery;
import com.baomidou.mybatisplus.generator.config.querys.PostgreSqlQuery;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import java.util.Collections;

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

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

import java.lang.management.ManagementFactory;

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

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

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

 src/main/java/com/ard/utils/util/IdUtils.java

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


/**

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

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

 src/main/java/com/ard/utils/util/SpringUtils.java

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

import com.ard.utils.other.StringUtils;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;

 src/main/java/com/ard/utils/util/StringUtils.java

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

import java.util.ArrayList;
import java.util.Collection;

 src/main/java/com/ard/utils/util/UUID.java

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

import com.ard.utils.exception.UtilException;
package com.ard.utils.util;

import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

 src/main/java/com/ard/utils/util/UtilException.java

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

/**
 * @Description:

 src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@
  netty:

    udp:

      port: 40000

      enabled: true

    enabled: false

    tcp:

      enabled: true

  # mqtt配置

@@ -47,11 +47,12 @@
    enabled: true

  # 盗电接口地址

  stealelec:

    enabled: true

  enabled: false

    url: http://iot.zhdk.net:8090/Warning/GetWarning?userName=cy4oil

  # 三厂数字化地址

# 三场数字化

  digitization3:

    enabled: true

  enabled: false

  # minio配置

  minio:

    endpoint: http://192.168.2.15:9001

@@ -64,11 +65,11 @@
# 日志等级配置

logging:

  level:

    hikSdk: debug

    mqtt: info

    netty: info

    hikSdk: info

    mqtt: debug

    netty: debug

    external: info

    camera: debug

    camera: info

    tube: info

    digitization3: info

    stealAlarm: info


 src/main/resources/application-prod.yml

@@ -1,4 +1,7 @@
#生产环境
# 开发环境
server:
  port: 8088
# spring配置
spring:
  servlet:
    multipart:
@@ -6,15 +9,14 @@
      max-file-size: 30MB
      max-request-size: 30MB
  datasource:
      #  使用druid数据库连接池
    druid:
        #开启druid监控web
      stat-view-servlet:
        enabled: true
      driver-class-name: org.postgresql.Driver
      url: jdbc:postgresql://112.98.126.2:35432/ry-vue?stringtype=unspecified
      url: jdbc:postgresql://192.168.2.15:5432/ry-vue
      username: postgres
      password: Yykj.2017
      password: postgres
      #最大连接数
      maxActive: 30
      #最小连接数
@@ -34,18 +36,12 @@
      enabled: true
    tcp:
      enabled: true
  # minio配置
  minio:
    endpoint: http://127.0.0.1:9001
    accessKey: admin
    secretKey: xzx12345
  # mqtt配置
  mqtt:
    host: tcp://192.168.1.15:1883
    clientId: cc3
  host: tcp://192.168.2.15:1883
  clientId: client-2272
    username: admin
    password: xzx12345
    topic: tube
  password: admin
    timeout: 100
    keepalive: 60
    enabled: true
@@ -54,19 +50,26 @@
    enabled: false
    url: http://iot.zhdk.net:8090/Warning/GetWarning?userName=cy4oil
  # 三厂数字化地址
# 三场数字化
  digitization3:
    enabled: false
# minio配置
minio:
  endpoint: http://192.168.2.15:9001
  accessKey: admin
  secretKey: xzx12345
# mybatis-plus配置
mybatis-plus:
  type-aliases-package: com.ard.alarm.**.domain
  mapper-locations: classpath:/mapper/*.xml
server:
  port: 8088
# 日志等级配置
logging:
  level:
    hikSdk: debug
    hikSdk: info
    mqtt: debug
    netty: info
    external: info
    camera: info
    tube: info
    digitization3: info
    stealAlarm: info