From 8c80a8d7d70d0aa19fe194df49c21a88d2ba7589 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 26 十月 2023 20:58:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/util/VideoUtil.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
index ab5e2fc..7490765 100644
--- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
@@ -186,7 +186,7 @@
config.setHost(HOST); // 浠ｇ悊API缃戝叧nginx鏈嶅姟鍣╥p绔彛
config.setAppKey(APP_KEY); // 绉橀挜appkey
config.setAppSecret(APP_SECRET);// 绉橀挜appSecret
- final String getSecurityApi = ARTEMIS_PATH + "/api/resource/v1/cameras/previewURLs"; // 鎺ュ彛璺緞
+ final String getSecurityApi = ARTEMIS_PATH + "/api/video/v1/cameras/previewURLs"; // 鎺ュ彛璺緞
Map<String, String> path = new HashMap<String, String>(2) {
{
put("https://", getSecurityApi);
@@ -210,8 +210,53 @@
String body = jsonBody.toString();
//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, query, null, "application/json", head);
+ System.out.println("娴峰悍瀹屾垚璇锋眰");
try {
String strResult = EntityUtils.toString(result.getEntity());
+ System.out.println("娴峰悍杩斿洖缁撴灉锛�" + strResult);
+ HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class);
+ if ("0".equals(responseResult.getCode())) {
+ com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData();
+ String url = jsonObject.getString("url");
+ return url;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
+
+ public String getKHPresets(String code) throws Exception {
+
+ ArtemisConfig config = new ArtemisConfig();
+ config.setHost(HOST); // 浠ｇ悊API缃戝叧nginx鏈嶅姟鍣╥p绔彛
+ config.setAppKey(APP_KEY); // 绉橀挜appkey
+ config.setAppSecret(APP_SECRET);// 绉橀挜appSecret
+ final String getSecurityApi = ARTEMIS_PATH + "/api/video/v1/presets/searches"; // 鎺ュ彛璺緞
+ Map<String, String> path = new HashMap<String, String>(2) {
+ {
+ put("https://", getSecurityApi);
+ }
+ };
+ Map<String, String> head = new HashMap<String, String>(2) { //get璇锋眰鐨刪ead鍙傛暟
+ {
+ put("headpost", "sky-test");
+ }
+ };
+ Map<String, String> query = new HashMap<String, String>(2) { //get璇锋眰鐨刪ead鍙傛暟
+ {
+ put("domainId", "0");
+ }
+ };
+ JSONObject jsonBody = new JSONObject();
+ jsonBody.put("cameraIndexCode", code);
+ String body = jsonBody.toString();
+ //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
+ HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, query, null, "application/json", head);
+ System.out.println("娴峰悍瀹屾垚璇锋眰-getKHPresets");
+ try {
+ String strResult = EntityUtils.toString(result.getEntity());
+ System.out.println("娴峰悍杩斿洖缁撴灉-getKHPresets锛�" + strResult);
HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class);
if ("0".equals(responseResult.getCode())) {
com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData();
--
Gitblit v1.8.0