From 5d3f307b44aa8df32c9d893764fb8525d51eda5c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 01 十一月 2023 14:07:32 +0800 Subject: [PATCH] 将录像存储路径迁移至wvp中配置,assist以有在需要视频合成的时候才会用 --- src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 123 +++------------------------------------- 1 files changed, 11 insertions(+), 112 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index 6bbb4bc..56f2a0c 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -419,17 +419,6 @@ if (serverItem.isAutoConfig()) { - // 鏌ョ湅assist鏈嶅姟鐨勫綍鍍忚矾寰勯厤缃� - if (serverItem.getRecordAssistPort() > 0 && userSetting.getRecordPath() == null) { - JSONObject info = assistRESTfulUtils.getInfo(serverItem, null); - if (info != null && info.getInteger("code") != null && info.getInteger("code") == 0 ) { - JSONObject dataJson = info.getJSONObject("data"); - if (dataJson != null) { - String recordPath = dataJson.getString("record"); - userSetting.setRecordPath(recordPath); - } - } - } setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable())); } final String zlmKeepaliveKey = zlmKeepaliveKeyPrefix + serverItem.getId(); @@ -587,11 +576,12 @@ param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex)); param.put("hook.on_send_rtp_stopped",String.format("%s/on_send_rtp_stopped", hookPrex)); param.put("hook.on_rtp_server_timeout",String.format("%s/on_rtp_server_timeout", hookPrex)); - if (mediaServerItem.getRecordAssistPort() > 0) { - param.put("hook.on_record_mp4",String.format("http://127.0.0.1:%s/api/record/on_record_mp4", mediaServerItem.getRecordAssistPort())); - }else { - param.put("hook.on_record_mp4",""); - } + param.put("hook.on_record_mp4",String.format("%s/on_record_mp4", hookPrex)); +// if (mediaServerItem.getRecordAssistPort() > 0) { +// param.put("hook.on_record_mp4",String.format("http://127.0.0.1:%s/api/record/on_record_mp4", mediaServerItem.getRecordAssistPort())); +// }else { +// param.put("hook.on_record_mp4",""); +// } param.put("hook.timeoutSec","20"); // 鎺ㄦ祦鏂紑鍚庡彲浠ュ湪瓒呮椂鏃堕棿鍐呴噸鏂拌繛鎺ヤ笂缁х画鎺ㄦ祦锛岃繖鏍锋挱鏀惧櫒浼氭帴鐫�鎾斁銆� // 缃�0鍏抽棴姝ょ壒鎬�(鎺ㄦ祦鏂紑浼氬鑷寸珛鍗虫柇寮�鎾斁鍣�) @@ -605,10 +595,9 @@ param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-")); } - if (userSetting.getRecordPath() != null) { - File recordPathFile = new File(userSetting.getRecordPath()); - File mp4SavePathFile = recordPathFile.getParentFile().getAbsoluteFile(); - param.put("protocol.mp4_save_path", mp4SavePathFile.getAbsoluteFile()); + if (mediaServerItem.getRecordPath() != null) { + File recordPathFile = new File(mediaServerItem.getRecordPath()); + param.put("protocol.mp4_save_path", recordPathFile.getParentFile().getPath()); param.put("record.appName", recordPathFile.getName()); } @@ -741,15 +730,6 @@ } @Override - public boolean checkRtpServer(MediaServerItem mediaServerItem, String app, String stream) { - JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaServerItem, stream); - if(rtpInfo.getInteger("code") == 0){ - return rtpInfo.getBoolean("exist"); - } - return false; - } - - @Override public MediaServerLoad getLoad(MediaServerItem mediaServerItem) { MediaServerLoad result = new MediaServerLoad(); result.setId(mediaServerItem.getId()); @@ -762,88 +742,7 @@ } @Override - public List<RecordFile> getRecords(String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems) { - Assert.notNull(app, "app涓嶅瓨鍦�"); - Assert.notNull(stream, "stream涓嶅瓨鍦�"); - Assert.notNull(startTime, "startTime涓嶅瓨鍦�"); - Assert.notNull(endTime, "endTime涓嶅瓨鍦�"); - Assert.notEmpty(mediaServerItems, "娴佸獟浣撳垪琛ㄤ负绌�"); - - CompletableFuture[] completableFutures = new CompletableFuture[mediaServerItems.size()]; - for (int i = 0; i < mediaServerItems.size(); i++) { - completableFutures[i] = getRecordFilesForOne(app, stream, startTime, endTime, mediaServerItems.get(i)); - } - List<RecordFile> result = new ArrayList<>(); - for (int i = 0; i < completableFutures.length; i++) { - try { - List<RecordFile> list = (List<RecordFile>) completableFutures[i].get(); - if (!list.isEmpty()) { - for (int g = 0; g < list.size(); g++) { - list.get(g).setMediaServerId(mediaServerItems.get(i).getId()); - } - result.addAll(list); - } - } catch (InterruptedException e) { - throw new RuntimeException(e); - } catch (ExecutionException e) { - throw new RuntimeException(e); - } - } - Comparator<RecordFile> comparator = Comparator.comparing(RecordFile::getFileName); - result.sort(comparator); - return result; - } - - @Override - public List<String> getRecordDates(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems) { - Assert.notNull(app, "app涓嶅瓨鍦�"); - Assert.notNull(stream, "stream涓嶅瓨鍦�"); - Assert.notEmpty(mediaServerItems, "娴佸獟浣撳垪琛ㄤ负绌�"); - CompletableFuture[] completableFutures = new CompletableFuture[mediaServerItems.size()]; - - for (int i = 0; i < mediaServerItems.size(); i++) { - completableFutures[i] = getRecordDatesForOne(app, stream, year, month, mediaServerItems.get(i)); - } - List<String> result = new ArrayList<>(); - CompletableFuture.allOf(completableFutures).join(); - for (CompletableFuture completableFuture : completableFutures) { - try { - List<String> list = (List<String>) completableFuture.get(); - result.addAll(list); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } catch (ExecutionException e) { - throw new RuntimeException(e); - } - } - Collections.sort(result); - return result; - } - - @Async - public CompletableFuture<List<String>> getRecordDatesForOne(String app, String stream, int year, int month, MediaServerItem mediaServerItem) { - JSONObject fileListJson = assistRESTfulUtils.getDateList(mediaServerItem, app, stream, year, month); - if (fileListJson != null && !fileListJson.isEmpty()) { - if (fileListJson.getString("code") != null && fileListJson.getInteger("code") == 0) { - JSONArray data = fileListJson.getJSONArray("data"); - return CompletableFuture.completedFuture(data.toJavaList(String.class)); - } - } - return CompletableFuture.completedFuture(new ArrayList<>()); - } - - @Async - public CompletableFuture<List<RecordFile>> getRecordFilesForOne(String app, String stream, String startTime, String endTime, MediaServerItem mediaServerItem) { - JSONObject fileListJson = assistRESTfulUtils.getFileList(mediaServerItem, 1, 100000000, app, stream, startTime, endTime); - if (fileListJson != null && !fileListJson.isEmpty()) { - if (fileListJson.getString("code") != null && fileListJson.getInteger("code") == 0) { - JSONObject data = fileListJson.getJSONObject("data"); - JSONArray list = data.getJSONArray("list"); - if (list != null) { - return CompletableFuture.completedFuture(list.toJavaList(RecordFile.class)); - } - } - } - return CompletableFuture.completedFuture(new ArrayList<>()); + public List<MediaServerItem> getAllWithAssistPort() { + return mediaServerMapper.queryAllWithAssistPort(); } } -- Gitblit v1.8.0