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/controller/HkController.java | 20 +++++-----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java | 26 ++++++------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java | 5 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 47 ++++++++++++++---------
5 files changed, 61 insertions(+), 42 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
index d1606cd..9a431d4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
@@ -12,6 +12,11 @@
*/
public static final String HOST = "36.134.79.80:1443";
+ /**
+ * newPost
+ */
+ public static final String NEW_HOST = "223.76.234.232:1443";
+
/**
* STEP2：设置OpenAPI接口的上下文
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 410c17d..ed7d708 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
@@ -39,7 +39,7 @@
@ApiOperation(value = "海康设备-分页列表查询", notes = "海康设备-分页列表查询")
@GetMapping(value = "/queryHkList")
public R queryHkList(Query query) {
- String result = GetCameraResourcePage(query.getCurrent(), query.getSize(), HkConstant.cameras);
+ String result = GetCameraResourcePage(1,query.getCurrent(), query.getSize(), HkConstant.cameras);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
return R.data(jsonObject1);
@@ -55,7 +55,7 @@
public R queryHkPreviewUrl(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
+ String result = GetCameraPreviewURL(hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.WS);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -75,7 +75,7 @@
public R queryHkPreviewUrlCommon(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
+ String result = GetCameraPreviewURL(hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), hk.getProtocol());
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -95,7 +95,7 @@
public R queryHkPreviewUrlByHls(HkVO hk) {
String url = "";
// 获取海康播放url
- String result = GetCameraPreviewURL(HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
+ String result = GetCameraPreviewURL(hk.getType(),HkConstant.previewURLs, hk.getCameraIndexCode(), ProtocolConstant.HLS);
if (null!=result) {
JSONObject jsonObject = JSONObject.parseObject(result);
Map map = (Map) jsonObject.get("data");
@@ -114,7 +114,7 @@
@GetMapping(value = "/handleCameraPosition")
public R handleCameraPosition(HkVO hk) {
// 获取海康播放url
- String result = controlling(HkConstant.controllingURLs,
+ String result = controlling(hk.getType(),HkConstant.controllingURLs,
hk.getCameraIndexCode(),hk.getAction(),hk.getCommand(),hk.getSpeed(),hk.getPresetIndex());
// 返回
return R.data(result);
@@ -129,7 +129,7 @@
@GetMapping(value = "/selZoom")
public R selZoom(HkVO hk) {
// 获取海康播放url
- String result = selZoomURLs(HkConstant.selZoomURLs,
+ String result = selZoomURLs(hk.getType(),HkConstant.selZoomURLs,
hk.getCameraIndexCode(),hk.getStartX(),hk.getStartY(),hk.getEndX(),hk.getEndY());
// 返回
return R.data(result);
@@ -144,7 +144,7 @@
@GetMapping(value = "/presetsSearchesUrls")
public R presetsSearchesUrls(HkVO hk) {
// 获取海康播放url
- String result = presetsSearches(HkConstant.presetsSearchesUrls,hk.getCameraIndexCode());
+ String result = presetsSearches(hk.getType(),HkConstant.presetsSearchesUrls,hk.getCameraIndexCode());
// 返回
return R.data(result);
}
@@ -158,7 +158,7 @@
@GetMapping(value = "/manualCapture")
public R manualCapture(HkVO hk) {
// 获取海康播放url
- String result = manualCaptureUrls(HkConstant.manualCaptureUrls,
+ String result = manualCaptureUrls(hk.getType(),HkConstant.manualCaptureUrls,
hk.getCameraIndexCode());
// 返回
return R.data(result);
@@ -212,7 +212,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return R.data(common(HkConstant.playbackURLs, body));
+ return R.data(common(hk.getType(),HkConstant.playbackURLs, body));
}
/**
@@ -235,7 +235,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return R.data(common(HkConstant.talkURLs, body));
+ return R.data(common(hk.getType(),HkConstant.talkURLs, body));
}
}
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");
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
index 4a2de49..e1ef040 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
@@ -26,12 +26,20 @@
* @param body
* @return
*/
- public static String common(String url, String body) {
+ public static String common(Integer type,String url, String body) {
/**
* STEP1：设置平台参数，根据实际情况,设置host appkey appsecret 三个参数.
*/
// artemis网关服务器ip端口
- ArtemisConfig.host = HkConstant.HOST;
+ if (null==type){
+ ArtemisConfig.host = HkConstant.HOST;
+ }
+ if (type==1) {
+ ArtemisConfig.host = HkConstant.HOST;
+ }
+ if (type==2) {
+ ArtemisConfig.host = HkConstant.NEW_HOST;
+ }
// 秘钥appKey
ArtemisConfig.appKey = HkConstant.AppKey;
// 秘钥appSecret
@@ -71,7 +79,7 @@
* @param cameraIndexCode 监控点唯一标识
* @return
*/
- public static String GetCameraPreviewURL(String url, String cameraIndexCode, String protocol) {
+ public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol) {
/**
* 组装请求参数
*/
@@ -83,7 +91,7 @@
// jsonBody.put("expand", "streamform=ps");
String body = jsonBody.toJSONString();
// 调用公共方法
- return common(url,body);
+ return common(type,url,body);
}
/**
@@ -93,7 +101,8 @@
* @param cameraCode 监控点唯一标识
* @return
*/
- public static String QueryCameraPreviewURL(String url,
+ public static String QueryCameraPreviewURL(Integer type,
+ String url,
String cameraCode,
String resourceType,
String key) {
@@ -115,7 +124,7 @@
jsonBody.put("expressions", list);
String body = jsonBody.toJSONString();
System.out.println(jsonBody);
- return common(url,body);
+ return common(type,url,body);
}
@@ -126,7 +135,7 @@
* @param cameraIndexCode 监控点唯一标识
* @return
*/
- public static String GetTalkURLs(String url, String cameraIndexCode) {
+ public static String GetTalkURLs(Integer type, String url, String cameraIndexCode) {
/**
* 组装请求参数
*/
@@ -140,7 +149,7 @@
jsonBody.put("talkIndexCode", "ce744c4c67df464f92994185d825b6fa");
jsonBody.put("protocol", "wss");
String body = jsonBody.toJSONString();
- return common(url,body);
+ return common(type,url,body);
}
/**
@@ -152,7 +161,8 @@
* @param command 命令
* @return
*/
- public static String controlling(String url,
+ public static String controlling(Integer type,
+ String url,
String cameraIndexCode,
Integer action,
String command,
@@ -172,7 +182,7 @@
/**
* 调用接口
*/
- return common(url,body);
+ return common(type,url,body);
}
/**
@@ -182,7 +192,7 @@
* @param cameraIndexCode 监控点唯一标识
* @return
*/
- public static String presetsSearches(String url,String cameraIndexCode) {
+ public static String presetsSearches(Integer type,String url,String cameraIndexCode) {
/**
* 组装请求参数
*/
@@ -192,7 +202,7 @@
/**
* 调用接口
*/
- return common(url,body);
+ return common(type,url,body);
}
@@ -207,7 +217,8 @@
* @param endY 命令
* @return
*/
- public static String selZoomURLs(String url,
+ public static String selZoomURLs(Integer type,
+ String url,
String cameraIndexCode,
Integer startX,
Integer startY,
@@ -227,7 +238,7 @@
/**
* 调用接口
*/
- return common(url,body);
+ return common(type,url,body);
}
@@ -237,7 +248,7 @@
* @param url 监控资源url
* @return
*/
- public static String GetCameraResourcePage(Integer pageNo, Integer pageSize, String url) {
+ public static String GetCameraResourcePage(Integer type,Integer pageNo, Integer pageSize, String url) {
/**
* 组装请求参数
*/
@@ -250,7 +261,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return common(url, body);
+ return common(type,url, body);
}
/**
@@ -259,7 +270,7 @@
* @param url 监控资源url
* @return
*/
- public static String manualCaptureUrls(String url,String cameraIndexCode) {
+ public static String manualCaptureUrls(Integer type,String url,String cameraIndexCode) {
/**
* 组装请求参数
*/
@@ -271,7 +282,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return common(url, body);
+ return common(type,url, body);
}
// public static void main(String[] args) {
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
index 3013c6f..4200075 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
@@ -125,5 +125,8 @@
*/
private String endTime;
-
+ /**
+ * 类型 1：老平台 2：新平台
+ */
+ private Integer type;
}
--
Gitblit v1.9.3