From 6e8071d820aa55173e64fd25609caa3b6b9af98a Mon Sep 17 00:00:00 2001
From: bradyx <xushanbin@zdjtcm.com>
Date: 星期三, 15 五月 2024 13:52:16 +0800
Subject: [PATCH] fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index 688fc80..df2c9a2 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -18,6 +18,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -59,7 +60,7 @@
* @param online
* @return
*/
- @RequestMapping(value = "/list")
+ @GetMapping(value = "/list")
public JSONObject list( @RequestParam(required = false)Integer start,
@RequestParam(required = false)Integer limit,
@RequestParam(required = false)String q,
@@ -105,7 +106,7 @@
return result;
}
- @RequestMapping(value = "/channellist")
+ @GetMapping(value = "/channellist")
public JSONObject channellist( String serial,
@RequestParam(required = false)String channel_type,
@RequestParam(required = false)String code ,
@@ -186,7 +187,7 @@
* @param timeout 瓒呮椂鏃堕棿(绉�) 榛樿鍊�: 15
* @return
*/
- @RequestMapping(value = "/fetchpreset")
+ @GetMapping(value = "/fetchpreset")
private DeferredResult<Object> list(String serial,
@RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code,
--
Gitblit v1.8.0