From e8ce7b13646fb144a6d2d99c564ef899531d892c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 20 Apr 2023 14:14:02 +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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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..79a835b 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;
/**
* 分页列表查询
@@ -108,4 +110,28 @@
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));
+ }
+
}
--
Gitblit v1.9.3