‘liusuyi’
2023-12-28 8e384e65b3fc9b0c9116cf2ec2c11e3ad3bc361e
优化雷达报警接收
3 files renamed
3 files modified
18 ■■■■ changed files
src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/ard/utils/sdk/hiksdk/service/FMSGCallBack.java 4 ●●● patch | view | raw | blame | history
src/main/java/com/ard/utils/sdk/hiksdk/service/HikClientUtil.java 5 ●●●● patch | view | raw | blame | history
src/main/java/com/ard/utils/sdk/hiksdk/service/LoginResultCallBack.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
@@ -9,8 +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.utils.sdk.hiksdk.common.GlobalVariable;
import com.ard.utils.sdk.hiksdk.service.impl.HikClientUtil;
import com.ard.utils.sdk.hiksdk.service.HikClientUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
@@ -9,7 +9,7 @@
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.sdk.hiksdk.service.impl.HikClientUtil;
import com.ard.utils.sdk.hiksdk.service.HikClientUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
@@ -113,7 +113,7 @@
                // 连接成功信息从Set拔除
                falseConnectSet.remove(ardEquipRadar);
                // 连接成功信息写入map
                tureConnectMap.put(host+"_"+port, ardEquipRadar);
                tureConnectMap.put(host+":"+port, ardEquipRadar);
                SuccessConnectMap.put(ardEquipRadar.getId(),futureListener.channel());
            }
        });
src/main/java/com/ard/utils/sdk/hiksdk/service/FMSGCallBack.java
File was renamed from src/main/java/com/ard/utils/sdk/hiksdk/service/impl/FMSGCallBack.java
@@ -1,4 +1,4 @@
package com.ard.utils.sdk.hiksdk.service.impl;
package com.ard.utils.sdk.hiksdk.service;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
@@ -9,7 +9,6 @@
import com.ard.alarm.external.service.impl.ArdEquipExternalServiceImpl;
import com.ard.utils.sdk.hiksdk.domain.*;
import com.ard.utils.minio.MinioUtil;
import com.ard.utils.sdk.hiksdk.domain.isapi.FaceCapture;
import com.ard.utils.sdk.hiksdk.domain.isapi.IsapiAlarm;
import com.ard.utils.util.ByteUtils;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
@@ -18,7 +17,6 @@
import com.ard.utils.mqtt.MqttProducer;
import com.ard.utils.util.IdUtils;
import com.sun.jna.Pointer;
import javafx.scene.Camera;
import lombok.extern.slf4j.Slf4j;
import java.io.*;
src/main/java/com/ard/utils/sdk/hiksdk/service/HikClientUtil.java
File was renamed from src/main/java/com/ard/utils/sdk/hiksdk/service/impl/HikClientUtil.java
@@ -1,4 +1,4 @@
package com.ard.utils.sdk.hiksdk.service.impl;
package com.ard.utils.sdk.hiksdk.service;
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.domain.CameraCmd;
@@ -423,4 +423,7 @@
            log.error("获取IP通道异常:" + ex.getMessage());
        }
    }
}
src/main/java/com/ard/utils/sdk/hiksdk/service/LoginResultCallBack.java
File was renamed from src/main/java/com/ard/utils/sdk/hiksdk/service/impl/LoginResultCallBack.java
@@ -1,4 +1,4 @@
package com.ard.utils.sdk.hiksdk.service.impl;
package com.ard.utils.sdk.hiksdk.service;
import com.ard.utils.sdk.hiksdk.common.GlobalVariable;
import com.ard.utils.sdk.hiksdk.domain.DeviceInfo;