From 6859fcae5d1fd7ff28553032aaaaff0fc04a49b2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 10 八月 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("绉诲姩渚︽祴銆佽棰戜涪澶便�侀伄鎸°�両O淇″彿閲忕瓑鎶ヨ淇℃伅(鏆備笉瑙ｆ瀽)"+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() + "銆愯鍒檌d銆�" + info.getRuleId() + "銆愮被鍨嬨��" + info.getAlarmType() +
+ log.debug("銆愯鍒欍��" + info.getAlarmName() + "銆愯鍒檌d銆�" + info.getRuleId() + "銆愮被鍨嬨��" + info.getAlarmType() +
"銆愭椂闂淬��" + info.getAlarmTime() + "銆愮浉鏈篿d銆�" + info.getCameraId() + "銆愮浉鏈恒��" + info.getCameraName() +
"銆怚P銆�" + 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