From 0a6b45e096ef6487927368f83ed75057e6105657 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 30 Mar 2023 17:37:24 +0800
Subject: [PATCH] 1. 海康api 集成，实现海康摄像头列表查询 2. 巡查路线新增树查询
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 5 ++++-
1 files changed, 4 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 4573e2e..552fbb9 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
@@ -1,6 +1,7 @@
package cn.gistack.sm.hk.controller;
import cn.gistack.sm.hk.constant.HkConstant;
+import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -30,8 +31,10 @@
@ApiOperation(value = "海康设备-分页列表查询", notes = "海康设备-分页列表查询")
@GetMapping(value = "/queryHkList")
public R queryHkList(Query query) {
+ String result = GetCameraResourcePage(query.getCurrent(), query.getSize(), HkConstant.cameras);
+ JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
- return R.data(GetCameraResourcePage(query.getCurrent(), query.getSize(), HkConstant.cameras));
+ return R.data(jsonObject1);
}
}
--
Gitblit v1.9.3