From 6859fcae5d1fd7ff28553032aaaaff0fc04a49b2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Thu, 10 Aug 2023 14:22:48 +0800
Subject: [PATCH] 优化日志
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 4 ++--
src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java | 2 --
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 31 +++++++++++++++++++++----------
src/main/resources/logback-spring.xml | 2 +-
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
index 2be5717..0df027b 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
@@ -32,7 +32,7 @@
* @Date: 2023年02月15日 12:16
* @Version: 1.0
**/
-@Slf4j(topic = "hiksdk")
+@Slf4j(topic = "hikSdk")
public class FMSGCallBack implements HCNetSDK.FMSGCallBack_V31 {
/**
@@ -52,16 +52,21 @@
CameraEventInfo info;
String sTime;//事件时间
String url = "";//事件图片
+ Boolean isSnapPic=true;
//lCommand是传的报警类型
+// log.debug("报警事件类型:lCommand:" + Integer.toHexString(lCommand));
switch (lCommand) {
+ case HCNetSDK.COMM_ALARM_V30:
+ //log.debug("移动侦测、视频丢失、遮挡、IO信号量等报警信息(暂不解析)"+Integer.toHexString(lCommand));
case HCNetSDK.COMM_ALARM_RULE:
+ log.debug("行为分析信息报警信息"+Integer.toHexString(lCommand));
//region 行为分析信息
ArdCameras ardCameras = new ArdCameras();
ardCameras.setIp(sDeviceIP);
ardCameras.setPort(wLinkPort);
IArdCamerasService ardCamerasService = SpringTool.getApplicationContext().getBean(IArdCamerasService.class);
ArdCameras ardcamere = ardCamerasService.selectArdCamerasList(ardCameras).get(0);
- log.debug("报警事件类型:lCommand:" + Integer.toHexString(lCommand));
+
HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm = new HCNetSDK.NET_VCA_RULE_ALARM();
strVcaAlarm.write();
Pointer pVCAInfo = strVcaAlarm.getPointer();
@@ -129,24 +134,26 @@
//endregion
break;
default:
- log.debug("未知行为事件类型:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
- printLog(info);
+ // log.debug("未知行为事件类型:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
+ isSnapPic=false;
break;
}
//endregion
//图片存入minio
- url = savePicture(info);
- info.setPicUrl(url);
+ if(isSnapPic) {
+ url = savePicture(info);
+ info.setPicUrl(url);
+ }
publishMqtt(info);
break;
case HCNetSDK.COMM_UPLOAD_FACESNAP_RESULT:
- log.debug("人脸检测事件上报");
+ log.debug("人脸检测事件上报(暂不解析)"+Integer.toHexString(lCommand));
break;
case HCNetSDK.COMM_GISINFO_UPLOAD:
- log.debug("GPS报警信息上报");
+ log.debug("GPS报警信息上报(暂不解析)"+Integer.toHexString(lCommand));
break;
case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
- log.debug("报警主机 CID 报告报警上传");
+ log.debug("报警主机 CID 报告报警上传"+Integer.toHexString(lCommand));
//region 报警主机报警处理
ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
ardEquipExternal.setIp(sDeviceIP);
@@ -395,6 +402,10 @@
private String savePicture(CameraEventInfo info) {
CameraCmd cmd = new CameraCmd();
ArdCameras Cameras = GlobalVariable.cameraMap.get(info.getCameraIp());
+ if(Cameras==null)
+ {
+ return "";
+ }
cmd.setCameraId(Cameras.getId());
cmd.setChannelNum(info.getCameraChannel());
cmd.setBucketName("pic");
@@ -409,7 +420,7 @@
* 打印通用光电日志
*/
private void printLog(CameraEventInfo info) {
- log.info("【规则】" + info.getAlarmName() + "【规则id】" + info.getRuleId() + "【类型】" + info.getAlarmType() +
+ log.debug("【规则】" + info.getAlarmName() + "【规则id】" + info.getRuleId() + "【类型】" + info.getAlarmType() +
"【时间】" + info.getAlarmTime() + "【相机id】" + info.getCameraId() + "【相机】" + info.getCameraName() +
"【IP】" + info.getCameraIp() + "【通道】" + info.getCameraChannel() + "【型号】" + info.getCameraType() +
"【图片】" + info.getPicUrl() + "【坐标】" + info.getLongitude() + "," + info.getLatitude());
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
index 523fd76..428c3fe 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
@@ -225,6 +225,7 @@
log.error("初始化报警主机异常：" + ex.getMessage());
}
}
+
/**
* @描述 登录所有门禁主机
* @参数 []
@@ -251,6 +252,7 @@
log.error("初始化报警主机异常：" + ex.getMessage());
}
}
+
/**
* @描述 注销登录
* @参数 [dvrLogin]
@@ -259,7 +261,6 @@
* @创建时间 2023/1/17 16:12
* @修改人和其它信息
*/
-
public static boolean loginOut(String cameraId) {
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
return false;
@@ -277,7 +278,6 @@
*
* @param cmd
*/
-
public static boolean isOnLine(CameraCmd cmd) {
String cameraId = cmd.getCameraId();
if (!GlobalVariable.loginMap.containsKey(cameraId)) {
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
index 49d6575..2c12155 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
@@ -1,7 +1,5 @@
package com.ard.utils.hiksdk.service.impl;
-import com.ard.alarm.camera.domain.ArdCameras;
-import com.ard.alarm.camera.domain.CameraCmd;
import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 2264a59..f65b886 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -157,7 +157,7 @@
<appender-ref ref="mqtt"/>
</logger>
<!--hiksdk日志打印等级-->
- <logger name="hikSdk" level="debug">
+ <logger name="hikSdk" level="DEBUG">
<appender-ref ref="hikSdk"/>
</logger>
</configuration>
--
Gitblit v1.9.3