From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 177 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 100 insertions(+), 77 deletions(-)
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..cb5f10d 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
@@ -16,6 +16,7 @@
import java.util.Map;
import static cn.gistack.sm.hk.constant.HkConstant.ARTEMIS_PATH;
+import static cn.gistack.sm.hk.util.GetCameraUtils.GetCameraPreviewURL;
public class GetCameraUtils {
@@ -26,12 +27,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
@@ -67,11 +76,14 @@
/**
* 获取视频预览数据
*
- * @param url 视频预览url
+ * @param type 类型，新/老
+ * @param url 视频预览url
* @param cameraIndexCode 监控点唯一标识
+ * @param protocol
+ * @param expand
* @return
*/
- public static String GetCameraPreviewURL(String url, String cameraIndexCode, String protocol) {
+ public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol,String expand) {
/**
* 组装请求参数
*/
@@ -80,10 +92,12 @@
jsonBody.put("streamType", 0);
jsonBody.put("protocol", protocol);
jsonBody.put("transmode", 1);
-// jsonBody.put("expand", "streamform=ps");
+ if (null!= expand && !expand.equals("")) {
+ jsonBody.put("expand", expand);
+ }
String body = jsonBody.toJSONString();
// 调用公共方法
- return common(url,body);
+ return common(type,url,body);
}
/**
@@ -93,7 +107,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 +130,7 @@
jsonBody.put("expressions", list);
String body = jsonBody.toJSONString();
System.out.println(jsonBody);
- return common(url,body);
+ return common(type,url,body);
}
@@ -126,7 +141,7 @@
* @param cameraIndexCode 监控点唯一标识
* @return
*/
- public static String GetTalkURLs(String url, String cameraIndexCode) {
+ public static String GetTalkURLs(Integer type, String url, String cameraIndexCode) {
/**
* 组装请求参数
*/
@@ -140,7 +155,7 @@
jsonBody.put("talkIndexCode", "ce744c4c67df464f92994185d825b6fa");
jsonBody.put("protocol", "wss");
String body = jsonBody.toJSONString();
- return common(url,body);
+ return common(type,url,body);
}
/**
@@ -152,7 +167,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 +188,7 @@
/**
* 调用接口
*/
- return common(url,body);
+ return common(type,url,body);
}
/**
@@ -182,7 +198,7 @@
* @param cameraIndexCode 监控点唯一标识
* @return
*/
- public static String presetsSearches(String url,String cameraIndexCode) {
+ public static String presetsSearches(Integer type,String url,String cameraIndexCode) {
/**
* 组装请求参数
*/
@@ -192,7 +208,7 @@
/**
* 调用接口
*/
- return common(url,body);
+ return common(type,url,body);
}
@@ -207,7 +223,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 +244,7 @@
/**
* 调用接口
*/
- return common(url,body);
+ return common(type,url,body);
}
@@ -237,7 +254,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 +267,7 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return common(url, body);
+ return common(type,url, body);
}
/**
@@ -259,7 +276,7 @@
* @param url 监控资源url
* @return
*/
- public static String manualCaptureUrls(String url,String cameraIndexCode) {
+ public static String manualCaptureUrls(Integer type,String url,String cameraIndexCode) {
/**
* 组装请求参数
*/
@@ -271,70 +288,76 @@
* 调用接口并返回数据
* post请求application/json类型参数;
*/
- return common(url, body);
+ return common(type,url, body);
}
// public static void main(String[] args) {
//
-//// String result = GetCameraResourcePage(1, 10, HkConstant.cameras);
-////
-//// JSONObject jsonObject1 = JSONObject.parseObject(result);
-//// JSONObject res1 = (JSONObject) jsonObject1.get("data");
-//// JSONArray arr1 = JSON.parseArray(res1.getString("list"));
-//// JSONObject data1 = (JSONObject) arr1.get(1);
-//// String code1 = data1.get("cameraIndexCode").toString();
+// String previewURL = GetCameraPreviewURL(1, HkConstant.previewURLs,
+// "0c4f30948dde4998a676ec6983119cb5",
+// "rtsp",
+// "transcode=1&videotype=h264");
+// System.out.println("previewURL = " + previewURL);
+
+// String result = GetCameraResourcePage(1, 10, HkConstant.cameras);
//
-// // 云台控制
-//// String right = controlling(HkConstant.controllingURLs,
-//// "ff1f050afd1c47829dec1ec14575c9e3",
-//// 0,
-//// "ZOOM_OUT",
-//// null,
-//// null
-//// );
-//// System.out.println("right = " + right);
+// JSONObject jsonObject1 = JSONObject.parseObject(result);
+// JSONObject res1 = (JSONObject) jsonObject1.get("data");
+// JSONArray arr1 = JSON.parseArray(res1.getString("list"));
+// JSONObject data1 = (JSONObject) arr1.get(1);
+// String code1 = data1.get("cameraIndexCode").toString();
+
+ // 云台控制
+// String right = controlling(HkConstant.controllingURLs,
+// "ff1f050afd1c47829dec1ec14575c9e3",
+// 0,
+// "ZOOM_OUT",
+// null,
+// null
+// );
+// System.out.println("right = " + right);
+
+// // 放大
+// String big = selZoomURLs(HkConstant.selZoomURLs,
+// "ff1f050afd1c47829dec1ec14575c9e3",
+// 55,
+// 58,
+// 22,
+// 23
+// );
+// System.out.println("big = " + big);
+
+ // 抓图
+// String manualCapture = manualCaptureUrls(HkConstant.manualCaptureUrls,
+// "ff1f050afd1c47829dec1ec14575c9e3");
+// System.out.println("manualCapture = " + manualCapture);
+
+ //根据设备编号获取子节点编号
+// String result2 = QueryCameraPreviewURL(HkConstant.camerasID, code1, "camera", "parentIndexCode");
//
-//// // 放大
-//// String big = selZoomURLs(HkConstant.selZoomURLs,
-//// "ff1f050afd1c47829dec1ec14575c9e3",
-//// 55,
-//// 58,
-//// 22,
-//// 23
-//// );
-//// System.out.println("big = " + big);
-//
-// // 抓图
-//// String manualCapture = manualCaptureUrls(HkConstant.manualCaptureUrls,
-//// "ff1f050afd1c47829dec1ec14575c9e3");
-//// System.out.println("manualCapture = " + manualCapture);
-//
-// //根据设备编号获取子节点编号
-//// String result2 = QueryCameraPreviewURL(HkConstant.camerasID, code1, "camera", "parentIndexCode");
-////
-//// JSONObject jsonObject2 = JSONObject.parseObject(result2);
-//// JSONObject res2 = (JSONObject) jsonObject2.get("data");
-//// JSONArray arr2 = JSON.parseArray(res2.getString("list"));
-//// JSONObject data2 = (JSONObject) arr2.get(0);
-//// String code2 = data2.get("indexCode").toString();
-// //ff1f050afd1c47829dec1ec14575c9e3
-// //e2cb261e14144f53a300769839d54753
-// //根据子节点编号获取设备播放地址
-//// String result3 = GetCameraPreviewURL(HkConstant.previewURLs,
-//// "0113d3498d2e41caaf9e5355d1575da3", ProtocolConstant.WS);
-//// JSONObject jsonObject = JSONObject.parseObject(result3);
-//// Map map = (Map) jsonObject.get("data");
-// //根据子节点编号获取音频对讲地址
-//// String result4 = GetTalkURLs(HkConstant.talkURLs, code1);
-//
-//// System.out.println("result结果示例: " + result);
-//// System.out.println("result1 = " + result1);
-//// System.out.println("result2 = " + result2);
-//// System.out.println("result3 = " + result3);
-//// System.out.println("url = " + map.get("url"));
-//// System.out.println("result4 = " + result4);
-//
-// // 查询回放url
+// JSONObject jsonObject2 = JSONObject.parseObject(result2);
+// JSONObject res2 = (JSONObject) jsonObject2.get("data");
+// JSONArray arr2 = JSON.parseArray(res2.getString("list"));
+// JSONObject data2 = (JSONObject) arr2.get(0);
+// String code2 = data2.get("indexCode").toString();
+ //ff1f050afd1c47829dec1ec14575c9e3
+ //e2cb261e14144f53a300769839d54753
+ //根据子节点编号获取设备播放地址
+// String result3 = GetCameraPreviewURL(HkConstant.previewURLs,
+// "0113d3498d2e41caaf9e5355d1575da3", ProtocolConstant.WS);
+// JSONObject jsonObject = JSONObject.parseObject(result3);
+// Map map = (Map) jsonObject.get("data");
+ //根据子节点编号获取音频对讲地址
+// String result4 = GetTalkURLs(HkConstant.talkURLs, code1);
+
+// System.out.println("result结果示例: " + result);
+// System.out.println("result1 = " + result1);
+// System.out.println("result2 = " + result2);
+// System.out.println("result3 = " + result3);
+// System.out.println("url = " + map.get("url"));
+// System.out.println("result4 = " + result4);
+
+ // 查询回放url
// HkVO hk = new HkVO();
// hk.setCameraIndexCode("0c4f30948dde4998a676ec6983119cb5");
// hk.setBeginTime("2023-05-08T11:52:16.000+08:00");
--
Gitblit v1.9.3