数字换流站继保视频平台接口对接修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -113,6 +113,10 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Value("${param.nrvideo.url}")
     private String nrvideoUrl;
+    
+    @Value("${param.nrflvbyvoideoid.url}")
+    private String nrflvByVoideoidUrl;
+
 
     @Value("${dcs.client-id}")
     private String clientId;
@@ -520,12 +524,12 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
 
     @Override
-    public String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code) {
+    public String getVideoUrl(String videoName, String presetIndex, String defaultUrl, String code) {
     	String url = "";
         if ("hls".equals(vedioFormat)) {
             url = getVideoUrl(code);
         } else {
-        	url = getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
+        	url = getFlvUrlByVideoId(code);
         }
         return ObjectUtils.isEmpty(url) ? defaultUrl : url;
     }
@@ -542,6 +546,35 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 		}
 		return url;
     }
+    
+    public String getFlvUrlByVideoId(String videoId) {
+        try {
+            Map<String, Object> request = new HashMap<String, Object>();
+            request.put("cameraId", videoId);
+            request.put("clientType", 1);
+            request.put("streamType", 1);
+            request.put("templetId ", "000004");
+            request.put("urlType", 4);
+            JSONObject json = new JSONObject(request);
+            log.info("request：{}", JSONObject.toJSONString(request));
+            log.info("nrvideoUrl=={}", nrflvByVoideoidUrl);
+            String content = HttpContentTypeUtil.sendHttpPostJson(nrflvByVoideoidUrl, json.toJSONString());
+            if (ObjectUtils.isEmpty(content)) {
+                log.error("getFlvUrlByVideoId=flv视频流接口获取失败,参数:{}" + JSONObject.toJSONString(request));
+            }
+            Map<String, Object> respond = JSONObject.parseObject(content, Map.class);
+            log.error("getFlvUrlByVideoId=flv视频流接口返回respond:{}" + JSONObject.toJSONString(respond));
+            if ("SUCCESS".equals(respond.get("resultDesc")) && respond.containsKey("url")) {
+                return respond.get("url").toString();
+            }
+
+            return "";
+        } catch (Exception e) {
+            log.error("getFlvUrlByVideoId=flv视频流接口获取失败:{}", e.getMessage());
+        }
+        return "";
+    }
+
 
     public String getFlvUrlByVideoIdOrPresetIndex(String videoId, String presetIndex) {
         try {
@@ -555,21 +588,21 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             request.put("messageType", "/video-service/transcode/getCameraPlaybackFlv/call");
             request.put("cameraId", videoId);
             request.put("rtsp ", rtsp);
-            String content = HttpContentTypeUtil.sendHttpGetWithHeader(nrvideoUrl, request);
             log.info("request：{}", JSONObject.toJSONString(request));
             log.info("nrvideoUrl=={}", nrvideoUrl);
+            String content = HttpContentTypeUtil.sendHttpGetWithHeader(nrvideoUrl, request);
             if (ObjectUtils.isEmpty(content)) {
-                log.error("flv视频流接口获取失败,参数:{}" + JSONObject.toJSONString(request));
+                log.error("getFlvUrlByVideoIdOrPresetIndex==flv视频流接口获取失败,参数:{}" + JSONObject.toJSONString(request));
             }
             Map<String, String> respond = JSONObject.parseObject(content, Map.class);
-            log.error("flv视频流接口返回respond:{}" + JSONObject.toJSONString(respond));
+            log.error("getFlvUrlByVideoIdOrPresetIndex==flv视频流接口返回respond:{}" + JSONObject.toJSONString(respond));
             if (respond.containsKey("url")) {
                 return respond.get("url");
             }
 
             return "";
         } catch (Exception e) {
-            log.error("flv视频流接口获取失败:{}", e.getMessage());
+            log.error("getFlvUrlByVideoIdOrPresetIndex==flv视频流接口获取失败:{}", e.getMessage());
         }
         return "";
     }
@@ -581,11 +614,11 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         videoRequest.put("messageType", "getCameraRTSP");
         videoRequest.put("cameraId", videoId);
         videoRequest.put("presetIndex", ObjectUtils.isEmpty(presetIndex) ? "1" : presetIndex);
-        String content = HttpContentTypeUtil.sendHttpGetWithHeader(htvideoUrl, videoRequest);
         log.info("videoRequest:{}", JSONObject.toJSONString(videoRequest));
         log.info("htvideoUrl=={}", htvideoUrl);
+        String content = HttpContentTypeUtil.sendHttpGetWithHeader(htvideoUrl, videoRequest);
         if (ObjectUtils.isEmpty(content)) {
-            log.error("接口获取失败,参数={}", JSONObject.toJSONString(videoRequest));
+            log.error("getRtspUrlByVideoIdOrPresetIndex==接口获取失败,参数={}", JSONObject.toJSONString(videoRequest));
         }
         Map<String, String> respond = JSONObject.parseObject(content, Map.class);
 

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -66,7 +66,10 @@ param.system.online.date = 2019-02-12
 # 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
 window.vedioFormat = hls
 # 航天视频服务地址
-param.htvideo.url="http://192.168.4.174:9001";
+param.htvideo.url=http://192.168.4.174:9001;
 # 南瑞视频转码服务地址
-param.nrvideo.url="http://198.87.103.158:8001";
+param.nrvideo.url=http://198.87.103.158:8001;
+
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live
 

amos-boot-system-equip/src/main/resources/application-docker.properties

@@ -69,3 +69,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/application-jcs.properties

@@ -76,3 +76,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/application-qa.properties

@@ -68,3 +68,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live

amos-boot-system-equip/src/main/resources/application-test.properties

@@ -61,3 +61,5 @@ window.vedioFormat = hls
 param.htvideo.url="";
 # 南瑞视频转码服务地址
 param.nrvideo.url="";
+#南瑞视频平台通过视频id获取flv格式视频播放地址
+param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live