From 6968839f21fb05bf6e3204c2040ee47130006cd0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 27 十二月 2020 08:19:34 +0800
Subject: [PATCH] 修复空指针异常
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 316 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 265 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 0ea162e..1116ae5 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -1,152 +1,366 @@
package com.genersoft.iot.vmp.media.zlm;
+import java.math.BigInteger;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.IpUtil;
+import com.genersoft.iot.vmp.vmanager.service.IPlayService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
- * @author: songww
+ * @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48
*/
@RestController
-@RequestMapping("/hook/zlm")
+@RequestMapping("/index/hook")
public class ZLMHttpHookListener {
private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
-
+
+
+ @Autowired
+ private SIPCommander cmder;
+
+ @Autowired
+ private IPlayService playService;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMHttpHookSubscribe subscribe;
+
+ @Value("${media.autoApplyPlay}")
+ private boolean autoApplyPlay;
+
+ @Value("${media.ip}")
+ private String mediaIp;
+
+ @Value("${media.port}")
+ private int mediaPort;
+
/**
* 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
*
*/
- @PostMapping("/on_flow_report")
- public ResponseEntity onFlowReport(){
- // TODO Auto-generated method stub
+ @ResponseBody
+ @PostMapping(value = "/on_flow_report", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){
- return null;
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+ // TODO Auto-generated method stub
+
+
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* 璁块棶http鏂囦欢鏈嶅姟鍣ㄤ笂hls涔嬪鐨勬枃浠舵椂瑙﹀彂銆�
*
*/
- @PostMapping("/on_http_access")
- public ResponseEntity onHttpAccess(){
+ @ResponseBody
+ @PostMapping(value = "/on_http_access", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onHttpAccess(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
// TODO Auto-generated method stub
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("err", "");
+ ret.put("path", "");
+ ret.put("second", 600);
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* 鎾斁鍣ㄩ壌鏉冧簨浠讹紝rtsp/rtmp/http-flv/ws-flv/hls鐨勬挱鏀鹃兘灏嗚Е鍙戞閴存潈浜嬩欢銆�
*
*/
- @PostMapping("/on_play")
- public ResponseEntity onPlay(){
+ @ResponseBody
+ @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onPlay(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_play API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
// TODO Auto-generated method stub
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* rtsp/rtmp/rtp鎺ㄦ祦閴存潈浜嬩欢銆�
*
*/
- @PostMapping("/on_publish")
- public ResponseEntity onPublish(){
+ @ResponseBody
+ @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onPublish(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+ String app = json.getString("app");
+ String streamId = json.getString("id");
+
+ ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
+ if (subscribe != null) subscribe.response(json);
+
+
// TODO Auto-generated method stub
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ ret.put("enableHls", true);
+ ret.put("enableMP4", false);
+ ret.put("enableRtxp", true);
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* 褰曞埗mp4瀹屾垚鍚庨�氱煡浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
*
*/
- @PostMapping("/on_record_mp4")
- public ResponseEntity onRecordMp4(){
+ @ResponseBody
+ @PostMapping(value = "/on_record_mp4", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
// TODO Auto-generated method stub
- return null;
- }
-
- /**
- * 璇tsp娴佹槸鍚﹀紑鍚痳tsp涓撶敤鏂瑰紡鐨勯壌鏉冧簨浠讹紝寮�鍚悗鎵嶄細瑙﹀彂on_rtsp_auth浜嬩欢銆傞渶瑕佹寚鍑虹殑鏄痳tsp涔熸敮鎸乽rl鍙傛暟閴存潈锛屽畠鏀寔涓ょ鏂瑰紡閴存潈銆�
- *
- */
- @PostMapping("/on_rtsp_auth")
- public ResponseEntity onRtspAuth(){
- // TODO Auto-generated method stub
-
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* rtsp涓撶敤鐨勯壌鏉冧簨浠讹紝鍏堣Е鍙憃n_rtsp_realm浜嬩欢鐒跺悗鎵嶄細瑙﹀彂on_rtsp_auth浜嬩欢銆�
*
*/
- @PostMapping("/on_rtsp_realm")
- public ResponseEntity onRtspRealm(){
+ @ResponseBody
+ @PostMapping(value = "/on_rtsp_realm", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onRtspRealm(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
// TODO Auto-generated method stub
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("realm", "");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+ }
+
+
+ /**
+ * 璇tsp娴佹槸鍚﹀紑鍚痳tsp涓撶敤鏂瑰紡鐨勯壌鏉冧簨浠讹紝寮�鍚悗鎵嶄細瑙﹀彂on_rtsp_auth浜嬩欢銆傞渶瑕佹寚鍑虹殑鏄痳tsp涔熸敮鎸乽rl鍙傛暟閴存潈锛屽畠鏀寔涓ょ鏂瑰紡閴存潈銆�
+ *
+ */
+ @ResponseBody
+ @PostMapping(value = "/on_rtsp_auth", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onRtspAuth(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+ // TODO Auto-generated method stub
+
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("encrypted", false);
+ ret.put("passwd", "test");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* shell鐧诲綍閴存潈锛孼LMediaKit鎻愪緵绠�鍗曠殑telnet璋冭瘯鏂瑰紡锛屼娇鐢╰elnet 127.0.0.1 9000鑳借繘鍏ediaServer杩涚▼鐨剆hell鐣岄潰銆�
*
*/
- @PostMapping("/on_shell_login")
- public ResponseEntity onShellLogin(){
+ @ResponseBody
+ @PostMapping(value = "/on_shell_login", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onShellLogin(@RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
// TODO Auto-generated method stub
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* rtsp/rtmp娴佹敞鍐屾垨娉ㄩ攢鏃惰Е鍙戞浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
*
*/
- @PostMapping("/on_stream_changed")
- public ResponseEntity onStreamChanged(){
- // TODO Auto-generated method stub
+ @ResponseBody
+ @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onStreamChanged(@RequestBody JSONObject json){
- return null;
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+ // 娴佹秷澶辩Щ闄edis play
+ String app = json.getString("app");
+ String streamId = json.getString("stream");
+ boolean regist = json.getBoolean("regist");
+ StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
+ if ("rtp".equals(app) && !regist ) {
+ if (streamInfo!=null){
+ storager.stopPlay(streamInfo);
+ }else{
+ streamInfo = storager.queryPlaybackByStreamId(streamId);
+ storager.stopPlayback(streamInfo);
+ }
+ }
+
+
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* 娴佹棤浜鸿鐪嬫椂浜嬩欢锛岀敤鎴峰彲浠ラ�氳繃姝や簨浠堕�夋嫨鏄惁鍏抽棴鏃犱汉鐪嬬殑娴併��
*
*/
- @PostMapping("/on_stream_none_reader")
- public ResponseEntity onStreamNoneReader(){
- // TODO Auto-generated method stub
+ @ResponseBody
+ @PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){
- return null;
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_stream_none_reader API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+
+ String streamId = json.getString("stream");
+
+ cmder.streamByeCmd(streamId);
+ StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
+ if (streamInfo!=null){
+ storager.stopPlay(streamInfo);
+ }else{
+ streamInfo = storager.queryPlaybackByStreamId(streamId);
+ storager.stopPlayback(streamInfo);
+ }
+
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("close", true);
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* 娴佹湭鎵惧埌浜嬩欢锛岀敤鎴峰彲浠ュ湪姝や簨浠惰Е鍙戞椂锛岀珛鍗冲幓鎷夋祦锛岃繖鏍峰彲浠ュ疄鐜版寜闇�鎷夋祦锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
*
*/
- @PostMapping("/on_stream_not_found")
- public ResponseEntity onStreamNotFound(){
- // TODO Auto-generated method stub
+ @ResponseBody
+ @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onStreamNotFound(@RequestBody JSONObject json){
- return null;
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+ // TODO Auto-generated method stub
+
+ if (autoApplyPlay) {
+ String app = json.getString("app");
+ String streamId = json.getString("stream");
+ StreamInfo streamInfo = storager.queryPlayByStreamId(streamId);
+ if ("rtp".equals(app) && streamId.indexOf("gb_play") > -1 && streamInfo == null) {
+ String[] s = streamId.split("_");
+ if (s.length == 4) {
+ String deviceId = s[2];
+ String channelId = s[3];
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device != null) {
+ UUID uuid = UUID.randomUUID();
+ cmder.playStreamCmd(device, channelId, (JSONObject response) -> {
+ logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString());
+ playService.onPublishHandlerForPlay(response, deviceId, channelId, uuid.toString());
+ }, null);
+ }
+
+ }
+
+ }
+
+ }
+
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
/**
* 鏈嶅姟鍣ㄥ惎鍔ㄤ簨浠讹紝鍙互鐢ㄤ簬鐩戝惉鏈嶅姟鍣ㄥ穿婧冮噸鍚紱姝や簨浠跺鍥炲涓嶆晱鎰熴��
*
*/
- @PostMapping("/on_server_started")
- public ResponseEntity onServerStarted(){
+ @ResponseBody
+ @PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
+ public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject json){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("ZLM HOOK on_server_started API璋冪敤锛屽弬鏁帮細" + json.toString());
+ }
+
+// String data = json.getString("data");
+// List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);
+// MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);
+ MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
+ mediaServerConfig.setLocalIP(mediaIp);
+ storager.updateMediaInfo(mediaServerConfig);
// TODO Auto-generated method stub
- return null;
+ JSONObject ret = new JSONObject();
+ ret.put("code", 0);
+ ret.put("msg", "success");
+ return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
}
}
--
Gitblit v1.8.0