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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 0eaac34..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();
/**
@@ -377,7 +382,7 @@
// 根据水库名称、所在区域查询改水库的数量
Integer number = attResBaseService.getWaterCountByResNameAndCountyName(hk.getRegionName(),info.getCountyCode());
if (number>1){
- return info.getTownName() + hk.getRegionName();
+ return hk.getRegionName() + "(" + info.getTownName() + ")";
}else {
return hk.getRegionName();
}
--
Gitblit v1.9.3