From 4cea15786ac20e01944fa796b87e5e77f722768e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 12 Jun 2023 15:33:29 +0800
Subject: [PATCH] 海康相关查询新增type类型
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java
index f24a2ab..51960eb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java
@@ -54,11 +54,11 @@
// 获取根区域编号
String rootRegionId = getRootRegionId(hk);
// 查询摄像头统计数据（需要有在线状态）
- hashMap.put("total",getCameraStatisticCount(rootRegionId,null));
- hashMap.put("onlineTotal",getCameraStatisticCount(rootRegionId,1));
- hashMap.put("offlineTotal",getCameraStatisticCount(rootRegionId,0));
+ hashMap.put("total",getCameraStatisticCount(hk.getType(),rootRegionId,null));
+ hashMap.put("onlineTotal",getCameraStatisticCount(hk.getType(),rootRegionId,1));
+ hashMap.put("offlineTotal",getCameraStatisticCount(hk.getType(),rootRegionId,0));
// 查询摄像头集合数据
- hashMap.put("list",getCameraStatisticList(rootRegionId, hk,query));
+ hashMap.put("list",getCameraStatisticList(hk.getType(),rootRegionId, hk,query));
// 返回数据
return hashMap;
}
@@ -90,7 +90,7 @@
* @param cameraIndexCode
* @return
*/
- private String getCameraAddress(String regionIndexCode,String cameraIndexCode) {
+ private String getCameraAddress(Integer type,String regionIndexCode,String cameraIndexCode) {
// 组装请求参数
JSONObject jsonBody = new JSONObject();
jsonBody.put("regionIndexCodes", Arrays.asList(regionIndexCode));
@@ -102,7 +102,7 @@
list.add(map);
jsonBody.put("expressions", list);
String body = jsonBody.toJSONString();
- String result = GetCameraUtils.common(regionInfoUrls, body);
+ String result = GetCameraUtils.common(type,regionInfoUrls, body);
// 数据处理
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject data = (JSONObject) jsonObject.get("data");
@@ -117,12 +117,12 @@
* @param cameraIndexCode
* @return
*/
- private JSONObject getCameraDetail(String cameraIndexCode) {
+ private JSONObject getCameraDetail(Integer type,String cameraIndexCode) {
// 组装请求参数
JSONObject jsonBody = new JSONObject();
jsonBody.put("cameraIndexCode", cameraIndexCode);
String body = jsonBody.toJSONString();
- String result = GetCameraUtils.common(camerasIndexCodeUrls, body);
+ String result = GetCameraUtils.common(type,camerasIndexCodeUrls, body);
// 数据处理
JSONObject jsonObject = JSONObject.parseObject(result);
// 返回
@@ -136,7 +136,7 @@
* @param query
* @return
*/
- private JSONObject getCameraStatisticList(String regionId, HkVO hk,Query query) {
+ private JSONObject getCameraStatisticList(Integer type,String regionId, HkVO hk,Query query) {
// 组装请求参数
JSONObject jsonBody = new JSONObject();
jsonBody.put("regionId", regionId);
@@ -146,7 +146,7 @@
jsonBody.put("status",hk.getStatus());
}
String body = jsonBody.toJSONString();
- String result = GetCameraUtils.common(onlineCameraGetUrls, body);
+ String result = GetCameraUtils.common(type,onlineCameraGetUrls, body);
// 数据处理
JSONObject jsonObject = JSONObject.parseObject(result);
// 返回数据
@@ -159,7 +159,7 @@
* @param status
* @return
*/
- private String getCameraStatisticCount(String regionId,Integer status) {
+ private String getCameraStatisticCount(Integer type,String regionId,Integer status) {
// 组装请求参数
JSONObject jsonBody = new JSONObject();
jsonBody.put("regionId", regionId);
@@ -167,7 +167,7 @@
jsonBody.put("status",status);
}
String body = jsonBody.toJSONString();
- String result = GetCameraUtils.common(onlineCameraGetUrls, body);
+ String result = GetCameraUtils.common(type,onlineCameraGetUrls, body);
// 数据处理
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject data = (JSONObject) jsonObject.get("data");
@@ -183,7 +183,7 @@
// 组装请求参数
JSONObject jsonBody = new JSONObject();
String body = jsonBody.toJSONString();
- String result = GetCameraUtils.common(regionsRootUrls, body);
+ String result = GetCameraUtils.common(hk.getType(),regionsRootUrls, body);
// 数据处理
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject data = (JSONObject) jsonObject.get("data");
--
Gitblit v1.9.3