From aaa07634fa899b7346dfd61c6f70962adbc1dca5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 20 十月 2023 08:55:02 +0800
Subject: [PATCH] 1. 增加聚焦值和获取接口。 2. 增加视频编码获取接口。 3. 流媒体通过编码自动切换是否转码。
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
index 5d84867..bbd910c 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -84,14 +84,14 @@
mediaInfo.setMaxReaders(100);
mediaInfo.setSourceprotocol("tcp");
- List<String> nameList=new ArrayList<>();
+ List<String> nameList = new ArrayList<>();
String paths = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
nameList.add(item.getName());
}
- if(!nameList.contains(name)) {
+ if (!nameList.contains(name)) {
mediaClient.addPath(name, mediaInfo);
}
Map<String, String> map = new HashMap<>();
@@ -127,9 +127,10 @@
mediaInfo.setMaxReaders(100);
mediaInfo.setSourceprotocol("tcp");
- mediaClient.editPath(name, mediaInfo);
+ if (checkNameExist(name)) {
+ mediaClient.editPath(name, mediaInfo);
+ }
- // Map<String,String> map=new HashMap<>();
map.put("rtspUrl", rtspUrl);
map.put("rtmpUrl", rtmpUrl);
map.put("webrtcUrl", webrtcUrl);
@@ -169,13 +170,16 @@
@Override
public void removePath(String[] names) {
for (String name : names) {
- mediaClient.removePath(name);
+ if(checkNameExist(name)) {
+ mediaClient.removePath(name);}
}
}
@Override
public void removePath(String name) {
- mediaClient.removePath(name);
+ if(checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
}
@Override
@@ -448,22 +452,45 @@
return false;
}
}
+
/**
- * 鑾峰彇娴佸獟浣搉ame鍒楄〃
+ * 鑾峰彇娴佸獟浣搉ame鍒楄〃
* 鍒樿嫃涔�
* 2023/10/13 14:19:07
*/
@Override
public List<String> getNameList() {
- List<String> nameList=new ArrayList<>();
- String paths = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
- for (Items item : items) {
- nameList.add(item.getName());
+ List<String> nameList = new ArrayList<>();
+ try {
+ String paths = mediaClient.paths();
+ JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
+ List<Items> items = jsonsRoot.getItems();
+ for (Items item : items) {
+ nameList.add(item.getName());
+ }
+ }
+ catch (Exception ex)
+ {
+ log.error(ex.getMessage());
}
return nameList;
}
+
+ /**
+ * 妫�鏌ュ悕绉版槸鍚﹀瓨鍦�
+ * 鍒樿嫃涔�
+ * 2023/10/19 15:18:45
+ */
+ @Override
+ public boolean checkNameExist(String name) {
+ boolean result = false;
+ List<String> nameList = getNameList();
+ if (nameList.contains(name)) {
+ result = true;
+ }
+ return result;
+ }
+
/**
* 閰嶇疆娴佸獟浣撳弬鏁�
*/
--
Gitblit v1.9.3