From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 65cb8a6..c6c024e 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
@@ -13,7 +13,7 @@
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.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -83,14 +83,14 @@
@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 +98,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 +108,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 +128,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 +143,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);
}
@@ -242,11 +238,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