From b63dccee424ee9dfb8944ead15ff084ff62d63fa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 10 May 2024 18:22:37 +0800
Subject: [PATCH] 对接及事件查询订阅调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
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 7436063..3063c3b 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,9 +109,9 @@
*/
@GetMapping(value = "/eventSubscriptionByEventTypes")
public R eventSubscriptionByEventTypes(EventVO eventVO) {
- eventVO.setType(3);
+ eventVO.setType(null==eventVO.getType()?1:eventVO.getType());
String result = addEventSubscriptionByEventTypes(eventVO, HkConstant.eventSubscriptionByEventTypesURLs);
- log.info("事件订阅返回信息：" + result);
+// log.info("事件订阅返回信息：" + result);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
return R.data(jsonObject1);
@@ -124,7 +124,7 @@
*/
@GetMapping(value = "/eventUnSubscriptionByEventTypes")
public R eventUnSubscriptionByEventTypes(EventVO eventVO) {
- eventVO.setType(3);
+ eventVO.setType(null==eventVO.getType()?1:eventVO.getType());
String result = removeEventSubscriptionByEventTypes(eventVO, HkConstant.eventUnSubscriptionByEventTypesURLs);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
@@ -138,7 +138,7 @@
*/
@GetMapping(value = "/eventSubscriptionView")
public R eventSubscriptionView(EventVO eventVO) {
- eventVO.setType(3);
+ eventVO.setType(null==eventVO.getType()?1:eventVO.getType());
String result = getEventSubscriptionView(eventVO, HkConstant.eventSubscriptionViewURLs);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
@@ -156,7 +156,7 @@
JSONObject jsonObject = JSON.parseObject(data);
String prettyData = JSON.toJSONString(jsonObject, SerializerFeature.PrettyFormat,
SerializerFeature.WriteMapNullValue);
- log.info("收到事件：" + jsonObject);
+// log.info("收到事件：" + jsonObject);
// 异步保存数据
asyncHkEventService.saveHkEventInfo(prettyData);
// 立即返回
--
Gitblit v1.9.3