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/FMSGCallBack.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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 7fe8ac7..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
@@ -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;
@@ -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 {
/**
@@ -49,19 +49,24 @@
String sDeviceIP = ByteUtils.bytesToStringZh(pAlarmer.sDeviceIP);
Integer wLinkPort = Integer.valueOf(pAlarmer.wLinkPort);
-
+ 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.info("鎶ヨ浜嬩欢绫诲瀷:lCommand:" + Integer.toHexString(lCommand));
+
HCNetSDK.NET_VCA_RULE_ALARM strVcaAlarm = new HCNetSDK.NET_VCA_RULE_ALARM();
strVcaAlarm.write();
Pointer pVCAInfo = strVcaAlarm.getPointer();
@@ -71,7 +76,7 @@
sTime = DateUtils.parseTime(strVcaAlarm.dwAbsTime);//浜嬩欢鏃堕棿
String ipaddr = new String(strVcaAlarm.struDevInfo.struDevIP.sIpV4).trim();//璁惧ip
Integer channel = Integer.valueOf(strVcaAlarm.struDevInfo.byChannel);//閫氶亾
- CameraEventInfo info = new CameraEventInfo();
+ info = new CameraEventInfo();
info.setAlarmName("浜哄憳琛屼负鍒嗘瀽");
info.setAlarmTime(sTime);
info.setCameraName(ardcamere.getName());
@@ -129,24 +134,26 @@
//endregion
break;
default:
- log.info("鏈煡琛屼负浜嬩欢绫诲瀷:" + 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.info("浜鸿劯妫�娴嬩簨浠朵笂鎶�");
+ log.debug("浜鸿劯妫�娴嬩簨浠朵笂鎶�(鏆備笉瑙ｆ瀽)"+Integer.toHexString(lCommand));
break;
case HCNetSDK.COMM_GISINFO_UPLOAD:
- log.info("GPS鎶ヨ淇℃伅涓婃姤");
+ log.debug("GPS鎶ヨ淇℃伅涓婃姤(鏆備笉瑙ｆ瀽)"+Integer.toHexString(lCommand));
break;
case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
- log.info("鎶ヨ涓绘満 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());
@@ -419,7 +430,7 @@
* 鎵撳嵃鎶ヨ涓绘満浜嬩欢鏃ュ織
*/
private void printLog(ExternalAlarmEventInfo info) {
- log.info("銆愭姤璀D銆�" + info.getAlarmId() + "銆愭姤璀﹀悕绉般��" + info.getAlarmName() +
+ log.debug("銆愭姤璀D銆�" + info.getAlarmId() + "銆愭姤璀﹀悕绉般��" + info.getAlarmName() +
"銆愰槻鍖篒D銆�" + info.getDefenseId() + "銆愰槻鍖哄悕绉般��" + info.getDefenseName() + "銆愮被鍨嬨��" + info.getAlarmType() +
"銆愭椂闂淬��" + info.getAlarmTime() + "銆愭姤璀︿富鏈篒D銆�" + info.getAlarmHostId());
}
@@ -428,7 +439,7 @@
* 鎵撳嵃闂ㄧ浜嬩欢鏃ュ織
*/
private void printLog(AccessControlHostEventInfo info) {
- log.info("銆愭姤璀D銆�" + info.getSerialNo() + "銆愯澶囩紪鍙枫��"+
+ log.debug("銆愭姤璀D銆�" + info.getSerialNo() + "銆愯澶囩紪鍙枫��"+
"銆愰棬缂栧彿銆�" + info.getDoorNo() + "銆愪簨浠剁被鍨嬨��" + info.getAlarmType() +
"銆愰槻鍖虹被鍨嬨��" + info.getDefenseType()+"銆愭椂闂淬��" + info.getAlarmTime() +
"銆愰棬绂佷富鏈篒D銆�" + info.getAcsId());
--
Gitblit v1.9.3