From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/util/VideoUtil.java | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 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 e99ce7b..cb8bc5d 100644
--- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java
@@ -123,7 +123,7 @@
return objectMapper.readTree(monitorReq.getBody()).get("url").textValue();
} catch (Exception ex) {
- System.out.println("鑾峰彇瑙嗛寮傚父锛�" + ex);
+ System.out.println("鑾峰彇瑙嗛寮傚父锛�" + ex.getMessage());
return "鑾峰彇鍦板潃澶辫触锛岃妫�鏌ode鍊�";
}
}
@@ -135,11 +135,58 @@
private final String APP_SECRET = "LElVf9Ct3ykStZHCmFNZ";
public PageResult<Camera> callPostCameras(Integer pageNo, Integer pageSize, String treeCode) throws Exception {
+ System.out.println("娴峰悍瑙嗛-callPostCameras");
ArtemisConfig config = new ArtemisConfig();
config.setHost(HOST); // 浠ｇ悊API缃戝叧nginx鏈嶅姟鍣╥p绔彛
config.setAppKey(APP_KEY); // 绉橀挜appkey
config.setAppSecret(APP_SECRET);// 绉橀挜appSecret
+ System.out.println("娴峰悍瑙嗛-鍒濆鍖朿onfig");
final String getSecurityApi = ARTEMIS_PATH + "/api/resource/v1/cameras"; // 鎺ュ彛璺緞
+ 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");
+ }
+ };
+ JSONObject jsonBody = new JSONObject();
+ jsonBody.put("pageNo", pageNo);
+ jsonBody.put("pageSize", pageSize);
+ jsonBody.put("treeCode", treeCode);
+ String body = jsonBody.toString();
+ System.out.println("娴峰悍瑙嗛寮�濮嬭姹傦細");
+ //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
+ HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, null, null, "application/json", head);
+ try {
+ String strResult = EntityUtils.toString(result.getEntity());
+ HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class);
+ System.out.println("娴峰悍瑙嗛缁撴灉锛�" + responseResult.toString());
+ if ("0".equals(responseResult.getCode())) {
+ com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData();
+ String strList = jsonObject.getString("list");
+ Integer total = Integer.parseInt(jsonObject.getString("total"));
+ Integer resultPageSize = Integer.parseInt(jsonObject.getString("pageSize"));
+ Integer resultPageNo = Integer.parseInt(jsonObject.getString("pageNo"));
+ List<Camera> ls = com.alibaba.fastjson.JSONObject.parseArray(strList, Camera.class);
+ PageResult<Camera> pageResult = new PageResult<>(total, resultPageSize, resultPageNo, ls);
+ return pageResult;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public String getKHVideo(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/resource/v1/cameras/previewURLs"; // 鎺ュ彛璺緞
Map<String, String> path = new HashMap<String, String>(2) {
{
put("https://", getSecurityApi);
@@ -156,9 +203,10 @@
}
};
JSONObject jsonBody = new JSONObject();
- jsonBody.put("pageNo", pageNo);
- jsonBody.put("pageSize", pageSize);
- jsonBody.put("treeCode", treeCode);
+ jsonBody.put("cameraIndexCode", code);
+ jsonBody.put("streamType", 0);
+ jsonBody.put("protocol", "hls");
+ jsonBody.put("transmode", 0);
String body = jsonBody.toString();
//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, query, null, "application/json", head);
@@ -167,17 +215,12 @@
HttpResponseResult responseResult = com.alibaba.fastjson.JSONObject.parseObject(strResult, HttpResponseResult.class);
if ("0".equals(responseResult.getCode())) {
com.alibaba.fastjson.JSONObject jsonObject = responseResult.getData();
- String strList = jsonObject.getString("list");
- Integer total = Integer.parseInt(jsonObject.getString("total"));
- Integer resultPageSize = Integer.parseInt(jsonObject.getString("pageSize"));
- Integer resultPageNo = Integer.parseInt(jsonObject.getString("pageNo"));
- List<Camera> ls = com.alibaba.fastjson.JSONObject.parseArray(strList, Camera.class);
- PageResult<Camera> pageResult = new PageResult<>(total, resultPageSize, resultPageNo, ls);
- return pageResult;
+ String url = jsonObject.getString("url");
+ return url;
}
} catch (Exception e) {
e.printStackTrace();
}
- return null;
+ return "";
}
}
--
Gitblit v1.8.0