From 290bbeecfd1aff271260e3766c5af62e1a099a20 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 12 Jun 2023 15:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 410c17d..ed7d708 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
@@ -39,7 +39,7 @@
@ApiOperation(value = "海康设备-分页列表查询", notes = "海康设备-分页列表查询")
@GetMapping(value = "/queryHkList")
public R queryHkList(Query query) {
- String result = GetCameraResourcePage(query.getCurrent(), query.getSize(), HkConstant.cameras);
+ String result = GetCameraResourcePage(1,query.getCurrent(), query.getSize(), HkConstant.cameras);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
return R.data(jsonObject1);
@@ -55,7 +55,7 @@
public R queryHkPreviewUrl(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
+ String result = GetCameraPreviewURL(hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -75,7 +75,7 @@
public R queryHkPreviewUrlCommon(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
+ String result = GetCameraPreviewURL(hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -95,7 +95,7 @@
public R queryHkPreviewUrlByHls(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
+ String result = GetCameraPreviewURL(hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -114,7 +114,7 @@
@GetMapping(value = "/handleCameraPosition")
public R handleCameraPosition(HkVO hk) {
// 获取海康播放url
- String result = controlling(HkConstant.controllingURLs,
+ String result = controlling(hk.getType(),HkConstant.controllingURLs,
hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),hk.getPresetIndex());
// 返回
return R.data(result);
@@ -129,7 +129,7 @@
@GetMapping(value = "/selZoom")
public R selZoom(HkVO hk) {
// 获取海康播放url
- String result = selZoomURLs(HkConstant.selZoomURLs,
+ String result = selZoomURLs(hk.getType(),HkConstant.selZoomURLs,
hk.getCameraIndexCode(),hk.getStartX(),hk.getStartY(),hk.getEndX(),hk.getEndY());
// 返回
return R.data(result);
@@ -144,7 +144,7 @@
@GetMapping(value = "/presetsSearchesUrls")
public R presetsSearchesUrls(HkVO hk) {
// 获取海康播放url
- String result = presetsSearches(HkConstant.presetsSearchesUrls,hk.getCameraIndexCode());
+ String result = presetsSearches(hk.getType(),HkConstant.presetsSearchesUrls,hk.getCameraIndexCode());
// 返回
return R.data(result);
}
@@ -158,7 +158,7 @@
@GetMapping(value = "/manualCapture")
public R manualCapture(HkVO hk) {
// 获取海康播放url
- String result = manualCaptureUrls(HkConstant.manualCaptureUrls,
+ String result = manualCaptureUrls(hk.getType(),HkConstant.manualCaptureUrls,
hk.getCameraIndexCode());
// 返回
return R.data(result);
@@ -212,7 +212,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return R.data(common(HkConstant.playbackURLs, body));
+ return R.data(common(hk.getType(),HkConstant.playbackURLs, body));
}
/**
@@ -235,7 +235,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return R.data(common(HkConstant.talkURLs, body));
+ return R.data(common(hk.getType(),HkConstant.talkURLs, body));
}
}
--
Gitblit v1.9.3