From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 7a417c8..a7d6041 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -9,11 +9,8 @@
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.security.JwtUtils;
-import com.genersoft.iot.vmp.media.IMediaServerService;
-import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
-import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -40,8 +37,6 @@
@RequestMapping("/api/server")
public class ServerController {
- @Autowired
- private ZlmHttpHookSubscribe zlmHttpHookSubscribe;
@Autowired
private IMediaServerService mediaServerService;
@@ -76,21 +71,19 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
- @Autowired
- private SendRtpPortManager sendRtpPortManager;
@GetMapping(value = "/media_server/list")
@ResponseBody
@Operation(summary = "娴佸獟浣撴湇鍔″垪琛�", security = @SecurityRequirement(name = JwtUtils.HEADER))
- public List<MediaServerItem> getMediaServerList() {
+ public List<MediaServer> getMediaServerList() {
return mediaServerService.getAll();
}
@GetMapping(value = "/media_server/online/list")
@ResponseBody
@Operation(summary = "鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�", security = @SecurityRequirement(name = JwtUtils.HEADER))
- public List<MediaServerItem> getOnlineMediaServerList() {
+ public List<MediaServer> getOnlineMediaServerList() {
return mediaServerService.getAllOnline();
}
@@ -98,7 +91,7 @@
@ResponseBody
@Operation(summary = "鍋滄瑙嗛鍥炴斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "娴佸獟浣撴湇鍔D", required = true)
- public MediaServerItem getMediaServer(@PathVariable String id) {
+ public MediaServer getMediaServer(@PathVariable String id) {
return mediaServerService.getOne(id);
}
@@ -108,8 +101,8 @@
@Parameter(name = "secret", description = "娴佸獟浣撴湇鍔ecret", required = true)
@GetMapping(value = "/media_server/check")
@ResponseBody
- public MediaServerItem checkMediaServer(@RequestParam String ip, @RequestParam int port, @RequestParam String secret) {
- return mediaServerService.checkMediaServer(ip, port, secret);
+ public MediaServer checkMediaServer(@RequestParam String ip, @RequestParam int port, @RequestParam String secret, @RequestParam String type) {
+ return mediaServerService.checkMediaServer(ip, port, secret, type);
}
@Operation(summary = "娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@@ -128,8 +121,8 @@
@Parameter(name = "mediaServerItem", description = "娴佸獟浣撲俊鎭�", required = true)
@PostMapping(value = "/media_server/save")
@ResponseBody
- public void saveMediaServer(@RequestBody MediaServerItem mediaServerItem) {
- MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());
+ public void saveMediaServer(@RequestBody MediaServer mediaServerItem) {
+ MediaServer mediaServerItemInDatabase = mediaServerService.getOneFromDatabase(mediaServerItem.getId());
if (mediaServerItemInDatabase != null) {
mediaServerService.update(mediaServerItem);
@@ -143,11 +136,7 @@
@DeleteMapping(value = "/media_server/delete")
@ResponseBody
public void deleteMediaServer(@RequestParam String id) {
- if (mediaServerService.getOne(id) == null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒版鑺傜偣");
- }
mediaServerService.delete(id);
- mediaServerService.deleteDb(id);
}
@@ -221,13 +210,6 @@
return jsonObject;
}
- @GetMapping(value = "/hooks")
- @ResponseBody
- @Operation(summary = "鑾峰彇褰撳墠鎵�鏈塰ook")
- public List<IHookSubscribe> getHooks() {
- return zlmHttpHookSubscribe.getAll();
- }
-
@GetMapping(value = "/system/info")
@ResponseBody
@Operation(summary = "鑾峰彇绯荤粺淇℃伅")
@@ -242,11 +224,11 @@
@Operation(summary = "鑾峰彇璐熻浇淇℃伅")
public List<MediaServerLoad> getMediaLoad() {
List<MediaServerLoad> result = new ArrayList<>();
- List<MediaServerItem> allOnline = mediaServerService.getAllOnline();
+ List<MediaServer> allOnline = mediaServerService.getAllOnline();
if (allOnline.size() == 0) {
return result;
}else {
- for (MediaServerItem mediaServerItem : allOnline) {
+ for (MediaServer mediaServerItem : allOnline) {
result.add(mediaServerService.getLoad(mediaServerItem));
}
}
--
Gitblit v1.8.0