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/HkController.java | 5 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java | 10 +++++-----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 11 +++++++++--
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
index 8d4b5d0..cafa836 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
@@ -72,6 +72,7 @@
HkConstant.previewURLs,
hk.getCameraIndexCode(),
ProtocolConstant.WS,
+ null==hk.getTransmode()?1:hk.getTransmode(),
expand,
null==hk.getStreamType()?1:hk.getStreamType());
if (null!=result) {
@@ -101,6 +102,7 @@
HkConstant.previewURLs,
hk.getCameraIndexCode(),
hk.getProtocol(),
+ null==hk.getTransmode()?1:hk.getTransmode(),
expand,
null==hk.getStreamType()?1:hk.getStreamType());
if (null!=result) {
@@ -130,6 +132,7 @@
HkConstant.previewURLs,
hk.getCameraIndexCode(),
ProtocolConstant.HLS,
+ null==hk.getTransmode()?1:hk.getTransmode(),
expand,
null==hk.getStreamType()?1:hk.getStreamType());
if (null!=result) {
@@ -240,6 +243,7 @@
jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
jsonBody.put("protocol", hk.getProtocol());
jsonBody.put("recordLocation", "1");
+ jsonBody.put("transmode", null==hk.getTransmode()?1:hk.getTransmode());
jsonBody.put("beginTime", hk.getBeginTime());
jsonBody.put("endTime", hk.getEndTime());
String body = jsonBody.toJSONString();
@@ -266,6 +270,7 @@
jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
jsonBody.put("streamType",null==hk.getStreamType()?1:hk.getStreamType());
jsonBody.put("protocol", hk.getProtocol());
+ jsonBody.put("transmode", null==hk.getTransmode()?1:hk.getTransmode());
String body = jsonBody.toJSONString();
/**
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);
// 立即返回
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 dab6dcd..d2d286a 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
@@ -84,10 +84,17 @@
* @param url 视频预览url
* @param cameraIndexCode 监控点唯一标识
* @param protocol
+ * @param transmode
* @param expand
* @return
*/
- public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol,String expand,Integer streamType) {
+ public static String GetCameraPreviewURL(Integer type,
+ String url,
+ String cameraIndexCode,
+ String protocol,
+ Integer transmode,
+ String expand,
+ Integer streamType) {
/**
* 组装请求参数
*/
@@ -95,7 +102,7 @@
jsonBody.put("cameraIndexCode", cameraIndexCode);
jsonBody.put("streamType",streamType);
jsonBody.put("protocol", protocol);
- jsonBody.put("transmode", 1);
+ jsonBody.put("transmode", transmode);
if (null!= expand && !expand.equals("")) {
jsonBody.put("expand", expand);
}
--
Gitblit v1.9.3