From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java
index 05cc175..7028ce7 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java
@@ -1,19 +1,11 @@
package com.ruoyi.media.service.impl;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.media.service.IMediaService;
-import com.ruoyi.utils.forest.MediaClient;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.ruoyi.media.mapper.VtduMapper;
import com.ruoyi.media.domain.Vtdu;
@@ -28,7 +20,7 @@
* @date 2023-08-29
*/
@Service
-@Slf4j
+@Slf4j(topic = "vtdu")
public class VtduServiceImpl implements IVtduService {
@Resource
private VtduMapper vtduMapper;
@@ -43,6 +35,7 @@
*/
@Override
public Vtdu selectVtduByName(String name) {
+
return vtduMapper.selectVtduByName(name);
}
@@ -65,7 +58,7 @@
*/
@Override
public int insertVtdu(Vtdu vtdu) {
- log.info("娴佸獟浣撱��" + vtdu.getName() + "銆戦�氶亾娣诲姞");
+ log.debug("娴佸獟浣撱��" + vtdu.getName() + "銆戦�氶亾娣诲姞");
Map<String, String> map = mediaService.addPath(vtdu.getName(), vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
vtdu.setRtspUrl(map.get("rtspUrl"));
vtdu.setRtmpUrl(map.get("rtmpUrl"));
@@ -88,7 +81,7 @@
@Override
public int updateVtdu(Vtdu vtdu) {
- log.info("娴佸獟浣撱��" + vtdu.getName() + "銆戦�氶亾鏇存柊");
+ log.debug("娴佸獟浣撱��" + vtdu.getName() + "銆戦�氶亾鏇存柊");
Map<String, String> map = mediaService.editPath(vtdu.getName(), vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
vtdu.setName(vtdu.getName());
vtdu.setRtspSource(vtdu.getRtspSource());
@@ -109,6 +102,9 @@
*/
@Override
public int deleteVtduByNames(String[] names) {
+ for (String name : names) {
+ log.debug("娴佸獟浣撱��" + name + "銆戦�氶亾鍒犻櫎");
+ }
mediaService.removePath(names);
return vtduMapper.deleteVtduByNames(names);
}
@@ -121,6 +117,8 @@
*/
@Override
public int deleteVtduByName(String name) {
+ mediaService.removePath(name);
+ log.debug("娴佸獟浣撱��" + name + "銆戦�氶亾鍒犻櫎");
return vtduMapper.deleteVtduByName(name);
}
--
Gitblit v1.9.3