From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 110 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 c2d6b4b..bd78e95 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
@@ -2,6 +2,7 @@
import cn.gistack.sm.hk.constant.HkConstant;
import cn.gistack.sm.hk.constant.ProtocolConstant;
+import cn.gistack.sm.hk.service.HkService;
import cn.gistack.sm.hk.vo.HkVO;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
@@ -12,10 +13,9 @@
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.Map;
-import static cn.gistack.sm.hk.util.GetCameraPreviewURL.*;
+import static cn.gistack.sm.hk.util.GetCameraUtils.*;
/**
* @author zhongrj
@@ -28,6 +28,8 @@
@RequestMapping("/hk/hk")
@AllArgsConstructor
public class HkController {
+
+ private final HkService hkService;
/**
* 分页列表查询
@@ -53,6 +55,46 @@
public R queryHkPreviewUrl(HkVO hk) {
String url = "";
// 获取海康播放url
+ String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
+ if (null!=result) {
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Map map = (Map) jsonObject.get("data");
+ url = map.get("url").toString();
+ }
+ // 查询海康设备列表并返回
+ return R.data(url);
+ }
+
+ /**
+ * 海康播放url查询-可以传协议
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康播放url查询", notes = "海康设备-海康播放url查询")
+ @GetMapping(value = "/queryHkPreviewUrlCommon")
+ public R queryHkPreviewUrlCommon(HkVO hk) {
+ String url = "";
+ // 获取海康播放url
+ String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
+ if (null!=result) {
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Map map = (Map) jsonObject.get("data");
+ url = map.get("url").toString();
+ }
+ // 查询海康设备列表并返回
+ return R.data(url);
+ }
+
+ /**
+ * 海康播放url查询(Hls)
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-海康播放url查询(Hls)", notes = "海康设备-海康播放url查询(Hls)")
+ @GetMapping(value = "/queryHkPreviewUrlByHls")
+ public R queryHkPreviewUrlByHls(HkVO hk) {
+ String url = "";
+ // 获取海康播放url
String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
@@ -73,7 +115,7 @@
public R handleCameraPosition(HkVO hk) {
// 获取海康播放url
String result = controlling(HkConstant.controllingURLs,
- hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),null);
+ hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),hk.getPresetIndex());
// 返回
return R.data(result);
}
@@ -94,6 +136,20 @@
}
/**
+ * 查询监控点的预置点信息
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-查询监控点的预置点信息", notes = "海康设备-查询监控点的预置点信息")
+ @GetMapping(value = "/presetsSearchesUrls")
+ public R presetsSearchesUrls(HkVO hk) {
+ // 获取海康播放url
+ String result = presetsSearches(HkConstant.presetsSearchesUrls,hk.getCameraIndexCode());
+ // 返回
+ return R.data(result);
+ }
+
+ /**
* 抓图
* @param hk 查询参数
* @return
@@ -108,4 +164,55 @@
return R.data(result);
}
+ /**
+ * 懒加载树
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-懒加载树", notes = "海康设备-懒加载树")
+ @GetMapping(value = "/lazy-tree")
+ public R lazyTree(HkVO hk) {
+ // 查询海康设备懒加载树并返回
+ return R.data(hkService.lazyTree(hk));
+ }
+
+ /**
+ * 查询监控统计数量
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-查询监控统计数量", notes = "海康设备-查询监控统计数量")
+ @GetMapping(value = "/getHkStatisticData")
+ public R getHkStatisticData(HkVO hk,Query query) {
+ // 查询海康设备懒加载树并返回
+ return R.data(hkService.getHkStatisticData(hk,query));
+ }
+
+
+ /**
+ * 获取海康摄像头回放url
+ * @param hk 查询参数
+ * @return
+ */
+ @ApiOperation(value = "海康设备-获取海康摄像头回放url", notes = "海康设备-获取海康摄像头回放url")
+ @GetMapping(value = "/playbackURLs")
+ public R playbackURLs(HkVO hk) {
+ /**
+ * 组装请求参数
+ */
+ JSONObject jsonBody = new JSONObject();
+ jsonBody.put("cameraIndexCode", hk.getCameraIndexCode());
+ jsonBody.put("protocol", hk.getProtocol());
+ jsonBody.put("recordLocation", "1");
+ jsonBody.put("beginTime", hk.getBeginTime());
+ jsonBody.put("endTime", hk.getEndTime());
+ String body = jsonBody.toJSONString();
+
+ /**
+ * 调用接口并返回数据
+ * post请求application/json类型参数;
+ */
+ return R.data(common(HkConstant.playbackURLs, body));
+ }
+
}
--
Gitblit v1.9.3