From df42877cfd997c46fce3e76557ff2eedccb64224 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 13 Apr 2023 17:47:34 +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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 53bb7a8..c2d6b4b 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
@@ -15,8 +15,7 @@
import java.util.HashMap;
import java.util.Map;
-import static cn.gistack.sm.hk.util.GetCameraPreviewURL.GetCameraPreviewURL;
-import static cn.gistack.sm.hk.util.GetCameraPreviewURL.GetCameraResourcePage;
+import static cn.gistack.sm.hk.util.GetCameraPreviewURL.*;
/**
* @author zhongrj
@@ -54,7 +53,7 @@
public R queryHkPreviewUrl(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
+ String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -64,4 +63,49 @@
return R.data(url);
}
+ /**
+ * 海康摄像头云台的控制（摄像头左右旋转画面）
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康摄像头云台的控制", notes = "海康设备-海康摄像头云台的控制")
+ @GetMapping(value = "/handleCameraPosition")
+ public R handleCameraPosition(HkVO hk) {
+ // 获取海康播放url
+ String result = controlling(HkConstant.controllingURLs,
+ hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),null);
+ // 返回
+ return R.data(result);
+ }
+
+ /**
+ * 海康摄像头电子放大
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康摄像头电子放大", notes = "海康设备-海康摄像头电子放大")
+ @GetMapping(value = "/selZoom")
+ public R selZoom(HkVO hk) {
+ // 获取海康播放url
+ String result = selZoomURLs(HkConstant.selZoomURLs,
+ hk.getCameraIndexCode(),hk.getStartX(),hk.getStartY(),hk.getEndX(),hk.getEndY());
+ // 返回
+ return R.data(result);
+ }
+
+ /**
+ * 抓图
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-抓图", notes = "海康设备-抓图")
+ @GetMapping(value = "/manualCapture")
+ public R manualCapture(HkVO hk) {
+ // 获取海康播放url
+ String result = manualCaptureUrls(HkConstant.manualCaptureUrls,
+ hk.getCameraIndexCode());
+ // 返回
+ return R.data(result);
+ }
+
}
--
Gitblit v1.9.3