From 3e02e496f6c3e4d2fae73b1d42a51d0ce35795dc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 24 三月 2024 15:51:19 +0800
Subject: [PATCH] 支持设置abl配置信息
---
src/main/java/com/genersoft/iot/vmp/media/abl/ABLRESTfulUtils.java | 4
src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java | 22 +++++++
src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java | 135 ++++++++++++++++++++++----------------------
3 files changed, 92 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
index 0d2f043..de65b64 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
@@ -141,7 +141,6 @@
if (data == null || data.isEmpty()) {
logger.info("[ABL-灏濊瘯杩炴帴]澶辫触, ID锛歿}, 鍦板潃锛� {}:{}", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}else {
-// ablServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), AblServerConfig.class);
ablServerConfig = AblServerConfig.getInstance(data);
initPort(mediaServerItem, ablServerConfig);
online(mediaServerItem, ablServerConfig);
@@ -166,7 +165,6 @@
logger.info("[ABL-灏濊瘯杩炴帴]澶辫触, ID锛歿}, 鍦板潃锛� {}:{}", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
offlineAblTimeMap.put(mediaServerItem.getId(), System.currentTimeMillis());
}else {
-// ablServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
ablServerConfig = AblServerConfig.getInstance(data);
initPort(mediaServerItem, ablServerConfig);
online(mediaServerItem, ablServerConfig);
@@ -189,13 +187,12 @@
JSONObject responseJSON = ablResTfulUtils.getServerConfig(mediaServerItem);
JSONArray data = responseJSON.getJSONArray("params");
if (data != null && !data.isEmpty()) {
-// config = JSON.parseObject(JSON.toJSONString(data.get(0)), AblServerConfig.class);
config = AblServerConfig.getInstance(data);
}
}
if (config != null) {
initPort(mediaServerItem, config);
- setAblConfig(mediaServerItem, false);
+ setAblConfig(mediaServerItem, false, config);
}
}
mediaServerService.update(mediaServerItem);
@@ -234,69 +231,73 @@
mediaServerItem.setHookAliveInterval(10F);
}
- public void setAblConfig(MediaServer mediaServerItem, boolean restart) {
-// logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
-// mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
-// String protocol = sslEnabled ? "https" : "http";
-// String hookPrefix = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
-//
-// Map<String, Object> param = new HashMap<>();
-// param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
-// if (mediaServerItem.getRtspPort() != 0) {
-// param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
-// }
-// param.put("hook.enable","1");
-// param.put("hook.on_flow_report","");
-// param.put("hook.on_play",String.format("%s/on_play", hookPrefix));
-// param.put("hook.on_http_access","");
-// param.put("hook.on_publish", String.format("%s/on_publish", hookPrefix));
-// param.put("hook.on_record_ts","");
-// param.put("hook.on_rtsp_auth","");
-// param.put("hook.on_rtsp_realm","");
-// param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrefix));
-// param.put("hook.on_shell_login","");
-// param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrefix));
-// param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrefix));
-// param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrefix));
-// param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrefix));
-// param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrefix));
-// param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrefix));
-// param.put("hook.on_record_mp4",String.format("%s/on_record_mp4", hookPrefix));
-// param.put("hook.timeoutSec","30");
-// param.put("hook.alive_interval", mediaServerItem.getHookAliveInterval());
-// // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
-// // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
-// // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
-// // 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
-// param.put("protocol.continue_push_ms", "3000" );
-// // 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
-// // 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
-// if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
-// param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
-// }
-//
-// if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
-// File recordPathFile = new File(mediaServerItem.getRecordPath());
-// param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
-// param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());
-// param.put("record.appName", recordPathFile.getName());
-// }
-//
-// JSONObject responseJSON = ablResTfulUtils.setServerConfig(mediaServerItem, param);
-//
-// if (responseJSON != null && responseJSON.getInteger("code") == 0) {
-// if (restart) {
-// logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
-// mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
-// ablResTfulUtils.restartServer(mediaServerItem);
-// }else {
-// logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛 {} -> {}:{}",
-// mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
-// }
-// }else {
-// logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆濯掍綋鏈嶅姟鑺傜偣澶辫触 {} -> {}:{}",
-// mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
-// }
+ public void setAblConfig(MediaServer mediaServerItem, boolean restart, AblServerConfig config) {
+ if (config.getHookEnable() == 0) {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣-ABL] 寮�鍚疕OOK鍔熻兘 锛歿}", mediaServerItem.getId());
+ JSONObject responseJSON = ablResTfulUtils.setConfigParamValue(mediaServerItem, "hook_enable", "1");
+ }
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ String protocol = sslEnabled ? "https" : "http";
+ String hookPrefix = String.format("%s://%s:%s/index/hook/abl", protocol, mediaServerItem.getHookIp(), serverPort);
+
+ Map<String, Object> param = new HashMap<>();
+ param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
+ if (mediaServerItem.getRtspPort() != 0) {
+ param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
+ }
+ param.put("hook.enable","1");
+ param.put("hook.on_flow_report","");
+ param.put("hook.on_play",String.format("%s/on_play", hookPrefix));
+ param.put("hook.on_http_access","");
+ param.put("hook.on_publish", String.format("%s/on_publish", hookPrefix));
+ param.put("hook.on_record_ts","");
+ param.put("hook.on_rtsp_auth","");
+ param.put("hook.on_rtsp_realm","");
+ param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrefix));
+ param.put("hook.on_shell_login","");
+ param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrefix));
+ param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrefix));
+ param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrefix));
+ param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrefix));
+ param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrefix));
+ param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrefix));
+ param.put("hook.on_record_mp4",String.format("%s/on_record_mp4", hookPrefix));
+ param.put("hook.timeoutSec","30");
+ param.put("hook.alive_interval", mediaServerItem.getHookAliveInterval());
+ // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆�
+ // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�)
+ // 姝ゅ弬鏁颁笉搴斿ぇ浜庢挱鏀惧櫒瓒呮椂鏃堕棿
+ // 浼樺寲姝ゆ秷鎭互鏇村揩鐨勬敹鍒版祦娉ㄩ攢浜嬩欢
+ param.put("protocol.continue_push_ms", "3000" );
+ // 鏈�澶氱瓑寰呮湭鍒濆鍖栫殑Track鏃堕棿锛屽崟浣嶆绉掞紝瓒呮椂涔嬪悗浼氬拷鐣ユ湭鍒濆鍖栫殑Track, 璁剧疆姝ら�夐」浼樺寲閭ｄ簺闊抽閿欒鐨勪笉瑙勮寖娴侊紝
+ // 绛墇lm鏀寔缁欐瘡涓猺tpServer璁剧疆鍏抽棴闊抽鐨勬椂鍊欏彲浠ヤ笉璁剧疆姝ら�夐」
+ if (mediaServerItem.isRtpEnable() && !ObjectUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
+ param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
+ }
+
+ if (!ObjectUtils.isEmpty(mediaServerItem.getRecordPath())) {
+ File recordPathFile = new File(mediaServerItem.getRecordPath());
+ param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath());
+ param.put("protocol.downloadRoot", recordPathFile.getParentFile().getPath());
+ param.put("record.appName", recordPathFile.getName());
+ }
+
+ JSONObject responseJSON = ablResTfulUtils.setConfigParamValue(mediaServerItem, param);
+
+ if (responseJSON != null && responseJSON.getInteger("code") == 0) {
+ if (restart) {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ ablResTfulUtils.restartServer(mediaServerItem);
+ }else {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆鎴愬姛 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ }
+ }else {
+ logger.info("[濯掍綋鏈嶅姟鑺傜偣] 璁剧疆濯掍綋鏈嶅姟鑺傜偣澶辫触 {} -> {}:{}",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
+ }
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLRESTfulUtils.java
index 02a9b66..de68662 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLRESTfulUtils.java
@@ -285,8 +285,8 @@
return sendPost(mediaServerItem, "getServerConfig",null, null);
}
- public JSONObject setServerConfig(MediaServer mediaServerItem, Map<String, Object> param){
- return sendPost(mediaServerItem,"setServerConfig",param, null);
+ public JSONObject setConfigParamValue(MediaServer mediaServerItem, String key, Object value){
+ return sendPost(mediaServerItem,"setConfigParamValue", param, null);
}
public JSONObject openRtpServer(MediaServer mediaServerItem, Map<String, Object> param){
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
index e7aac3a..5b6f0fb 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
@@ -126,6 +126,9 @@
@ConfigKeyId("on_stream_disconnect")
private String onStreamDisconnect;
+ @ConfigKeyId("on_record_mp4")
+ private String onRecordMp4;
+
@ConfigKeyId("on_delete_record_mp4")
private String onDeleteRecordMp4;
@@ -143,6 +146,9 @@
@ConfigKeyId("captureReplayType")
private Integer captureReplayType;
+
+ @ConfigKeyId("pictureMaxCount")
+ private Integer pictureMaxCount;
@ConfigKeyId("videoFileFormat")
private Integer videoFileFormat;
@@ -776,4 +782,20 @@
public void setRtcMaxPort(Integer rtcMaxPort) {
this.rtcMaxPort = rtcMaxPort;
}
+
+ public String getOnRecordMp4() {
+ return onRecordMp4;
+ }
+
+ public void setOnRecordMp4(String onRecordMp4) {
+ this.onRecordMp4 = onRecordMp4;
+ }
+
+ public Integer getPictureMaxCount() {
+ return pictureMaxCount;
+ }
+
+ public void setPictureMaxCount(Integer pictureMaxCount) {
+ this.pictureMaxCount = pictureMaxCount;
+ }
}
--
Gitblit v1.8.0