From 1909c7f71fc1b0e290678a3efe95b62d0b9df75e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 六月 2024 10:08:09 +0800
Subject: [PATCH] 调整参数名称
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java | 14 +++++++-------
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 6 +++---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
index c718681..e315d92 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -43,9 +43,9 @@
/**
* 鍋滄涓�璺帹娴�
* @param app 搴旂敤鍚�
- * @param streamId 娴両D
+ * @param stream 娴両D
*/
- boolean stop(String app, String streamId);
+ boolean stop(String app, String stream);
/**
* 鏂扮殑鑺傜偣鍔犲叆
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
index a64b71a..3213eb9 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
@@ -274,19 +274,19 @@
}
@Override
- public boolean stop(String app, String streamId) {
- logger.info("[鎺ㄦ祦 ] 鍋滄娴侊細 {}/{}", app, streamId);
- StreamPushItem streamPushItem = streamPushMapper.selectOne(app, streamId);
+ public boolean stop(String app, String stream) {
+ logger.info("[鎺ㄦ祦 ] 鍋滄娴侊細 {}/{}", app, stream);
+ StreamPushItem streamPushItem = streamPushMapper.selectOne(app, stream);
if (streamPushItem != null) {
gbStreamService.sendCatalogMsg(streamPushItem, CatalogEvent.DEL);
}
- platformGbStreamMapper.delByAppAndStream(app, streamId);
- gbStreamMapper.del(app, streamId);
- int delStream = streamPushMapper.del(app, streamId);
+ platformGbStreamMapper.delByAppAndStream(app, stream);
+ gbStreamMapper.del(app, stream);
+ int delStream = streamPushMapper.del(app, stream);
if (delStream > 0) {
MediaServer mediaServerItem = mediaServerService.getOne(streamPushItem.getMediaServerId());
- mediaServerService.closeStreams(mediaServerItem,app, streamId);
+ mediaServerService.closeStreams(mediaServerItem,app, stream);
}
return true;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 010b2f2..3717e69 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -112,9 +112,9 @@
@ResponseBody
@Operation(summary = "涓涓�涓帹娴�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
- @Parameter(name = "streamId", description = "娴乮d", required = true)
- public void stop(String app, String streamId){
- if (!streamPushService.stop(app, streamId)){
+ @Parameter(name = "stream", description = "娴乮d", required = true)
+ public void stop(String app, String stream){
+ if (!streamPushService.stop(app, stream)){
throw new ControllerException(ErrorCode.ERROR100);
}
}
--
Gitblit v1.8.0