From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index ee89f0a..c4c4ca8 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -1709,18 +1709,21 @@
map.put("deviceCode", (String) list.get(0).get("serialNumber"));
map.put("chl", (String) list.get(0).get("channelNumber"));
+
//请求视频播放地址
String params = HttpClientUtils.doGet("https://web.byisf.com:18000/GetPlayUrl", map);
Map<String, Object> data = (Map<String, Object>) JSONObject.parse(params);
- Map<String, Object> datas = (Map<String, Object>) JSONObject.parse(data.get("data").toString());
- String m3u8 = datas.get("m3u8").toString();
+ if (!data.get("code").toString().equals("-1")){
+ Map<String, Object> datas = (Map<String, Object>) JSONObject.parse(data.get("data").toString());
+ String m3u8 = datas.get("m3u8").toString();
- Map<String, String> rmap = new HashMap<>();
- rmap.put("url", m3u8);
+ Map<String, String> rmap = new HashMap<>();
+ rmap.put("url", m3u8);
- //请求视频录制
- //String rvideo = HttpClientUtils.doPost("https://web.byisf.com/api/blade-jfpts/rvideo/rVoids", rmap);
+ //请求视频录制
+ //String rvideo = HttpClientUtils.doPost("https://web.byisf.com/api/blade-jfpts/rvideo/rVoids", rmap);
+ }
}
outData.add("LEOK#@");
--
Gitblit v1.9.3