From 380c2d0e157bc3276604d204d075e4041ebd64aa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 08 May 2024 18:26:11 +0800
Subject: [PATCH] 海康视频事件订阅调整（修改配置信息）
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java | 4 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java | 15 +++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 9 +++++++++
3 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
index bc118df..b8baf08 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
@@ -37,6 +37,21 @@
public static final String AppSecret = "1eyDaLIxOU4XBC8P7Jyr";
/**
+ * EventAppKey 算法
+ */
+ public static final String EventAppKey = "26514872";
+
+ /**
+ * EventAppSecret 算法
+ */
+ public static final String EventAppSecret = "7t767HTMOjWu1k2ui3Ho";
+
+ /**
+ * Event_NEW_HOST 算法
+ */
+ public static final String Event_NEW_HOST = "10.42.7.244:443";
+
+ /**
* 分页获取监控点资源 url
*/
public static final String cameras = "/api/resource/v1/cameras";
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java
index 6dc8071..7436063 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java
@@ -109,6 +109,7 @@
*/
@GetMapping(value = "/eventSubscriptionByEventTypes")
public R eventSubscriptionByEventTypes(EventVO eventVO) {
+ eventVO.setType(3);
String result = addEventSubscriptionByEventTypes(eventVO, HkConstant.eventSubscriptionByEventTypesURLs);
log.info("事件订阅返回信息：" + result);
JSONObject jsonObject1 = JSONObject.parseObject(result);
@@ -123,6 +124,7 @@
*/
@GetMapping(value = "/eventUnSubscriptionByEventTypes")
public R eventUnSubscriptionByEventTypes(EventVO eventVO) {
+ eventVO.setType(3);
String result = removeEventSubscriptionByEventTypes(eventVO, HkConstant.eventUnSubscriptionByEventTypesURLs);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
@@ -136,6 +138,7 @@
*/
@GetMapping(value = "/eventSubscriptionView")
public R eventSubscriptionView(EventVO eventVO) {
+ eventVO.setType(3);
String result = getEventSubscriptionView(eventVO, HkConstant.eventSubscriptionViewURLs);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
@@ -153,6 +156,7 @@
JSONObject jsonObject = JSON.parseObject(data);
String prettyData = JSON.toJSONString(jsonObject, SerializerFeature.PrettyFormat,
SerializerFeature.WriteMapNullValue);
+ log.info("收到事件：" + jsonObject);
// 异步保存数据
asyncHkEventService.saveHkEventInfo(prettyData);
// 立即返回
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
index 0f31906..dab6dcd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
@@ -41,6 +41,15 @@
// 秘钥appSecret
ArtemisConfig.appSecret = HkConstant.AppSecret;
+ if (type==3) {
+ // 秘钥appKey
+ ArtemisConfig.appKey = HkConstant.EventAppKey;
+ // 秘钥appSecret
+ ArtemisConfig.appSecret = HkConstant.EventAppSecret;
+ // host
+ ArtemisConfig.host = HkConstant.Event_NEW_HOST;
+ }
+
/**
* STEP3：设置接口的URI地址
--
Gitblit v1.9.3