From 181bf76862b7d2ccf4382bb782a9dd11cfb10c4e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 三月 2024 18:54:39 +0800
Subject: [PATCH] 优化节点在线状态

---
 src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 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 72641be..09f0abb 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
@@ -8,6 +8,8 @@
 import com.genersoft.iot.vmp.conf.UserSetting;
 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.service.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;
@@ -21,6 +23,7 @@
 import com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -79,37 +82,37 @@
 
     @GetMapping(value = "/media_server/list")
     @ResponseBody
-    @Operation(summary = "娴佸獟浣撴湇鍔″垪琛�")
+    @Operation(summary = "娴佸獟浣撴湇鍔″垪琛�", security = @SecurityRequirement(name = JwtUtils.HEADER))
     public List<MediaServerItem> getMediaServerList() {
         return mediaServerService.getAll();
     }
 
     @GetMapping(value = "/media_server/online/list")
     @ResponseBody
-    @Operation(summary = "鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�")
+    @Operation(summary = "鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�", security = @SecurityRequirement(name = JwtUtils.HEADER))
     public List<MediaServerItem> getOnlineMediaServerList() {
         return mediaServerService.getAllOnline();
     }
 
     @GetMapping(value = "/media_server/one/{id}")
     @ResponseBody
-    @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+    @Operation(summary = "鍋滄瑙嗛鍥炴斁", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "id", description = "娴佸獟浣撴湇鍔D", required = true)
     public MediaServerItem getMediaServer(@PathVariable String id) {
         return mediaServerService.getOne(id);
     }
 
-    @Operation(summary = "娴嬭瘯娴佸獟浣撴湇鍔�")
+    @Operation(summary = "娴嬭瘯娴佸獟浣撴湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "ip", description = "娴佸獟浣撴湇鍔P", required = true)
     @Parameter(name = "port", description = "娴佸獟浣撴湇鍔TT绔彛", required = true)
     @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 MediaServerItem checkMediaServer(@RequestParam String ip, @RequestParam int port, @RequestParam String secret, @RequestParam String type) {
+        return mediaServerService.checkMediaServer(ip, port, secret, type);
     }
 
-    @Operation(summary = "娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�")
+    @Operation(summary = "娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "ip", description = "娴佸獟浣撴湇鍔P", required = true)
     @Parameter(name = "port", description = "娴佸獟浣撴湇鍔TT绔彛", required = true)
     @GetMapping(value = "/media_server/record/check")
@@ -121,12 +124,12 @@
         }
     }
 
-    @Operation(summary = "淇濆瓨娴佸獟浣撴湇鍔�")
+    @Operation(summary = "淇濆瓨娴佸獟浣撴湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "mediaServerItem", description = "娴佸獟浣撲俊鎭�", required = true)
     @PostMapping(value = "/media_server/save")
     @ResponseBody
     public void saveMediaServer(@RequestBody MediaServerItem mediaServerItem) {
-        MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());
+        MediaServerItem mediaServerItemInDatabase = mediaServerService.getOneFromDatabase(mediaServerItem.getId());
 
         if (mediaServerItemInDatabase != null) {
             mediaServerService.update(mediaServerItem);
@@ -135,20 +138,16 @@
         }
     }
 
-    @Operation(summary = "绉婚櫎娴佸獟浣撴湇鍔�")
+    @Operation(summary = "绉婚櫎娴佸獟浣撴湇鍔�", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "id", description = "娴佸獟浣揑D", required = true)
     @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);
     }
 
 
-    @Operation(summary = "閲嶅惎鏈嶅姟")
+    @Operation(summary = "閲嶅惎鏈嶅姟", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @GetMapping(value = "/restart")
     @ResponseBody
     public void restart() {
@@ -173,7 +172,7 @@
 //        });
     };
 
-    @Operation(summary = "鑾峰彇绯荤粺淇℃伅淇℃伅")
+    @Operation(summary = "鑾峰彇绯荤粺淇℃伅淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @GetMapping(value = "/system/configInfo")
     @ResponseBody
     public SystemConfigInfo getConfigInfo() {
@@ -185,7 +184,7 @@
         return systemConfigInfo;
     }
 
-    @Operation(summary = "鑾峰彇鐗堟湰淇℃伅")
+    @Operation(summary = "鑾峰彇鐗堟湰淇℃伅", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @GetMapping(value = "/version")
     @ResponseBody
     public VersionPo VersionPogetVersion() {

--
Gitblit v1.8.0