From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 30 十一月 2023 16:48:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/util/VideoUtil.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 49 insertions(+), 4 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 0906ea8..48bde5e 100644 --- a/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java +++ b/ycl-platform/src/main/java/com/ycl/util/VideoUtil.java @@ -135,13 +135,12 @@ 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(); - System.out.println("娴峰悍瑙嗛-config"); config.setHost(HOST); // 浠g悊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) { { @@ -187,7 +186,7 @@ config.setHost(HOST); // 浠g悊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); @@ -208,11 +207,57 @@ jsonBody.put("streamType", 0); jsonBody.put("protocol", "hls"); jsonBody.put("transmode", 0); + jsonBody.put("expand","transcode=1&videotype=h264"); + String body = jsonBody.toString(); + //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆 + HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, null, null, "application/json", null); + 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); // 浠g悊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