From d353fdce7cb957aa0f5d9d51d0ad4205c96e156c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 21 十月 2023 11:57:12 +0800
Subject: [PATCH] 1、流媒体升级1.2.0，修改部分forest接口 2、登录设备判断编码自动配置转码 3、增加sdk聚焦模式切换 4、增加sdk视场角获取并定时上传
---
ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 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 456fad4..ee991af 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,11 +1,11 @@
package com.ruoyi.media.service.impl;
import java.util.List;
+import java.util.Map;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.media.service.IMediaService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.ruoyi.media.mapper.VtduMapper;
import com.ruoyi.media.domain.Vtdu;
@@ -20,9 +20,12 @@
* @date 2023-08-29
*/
@Service
+@Slf4j(topic = "sdk")
public class VtduServiceImpl implements IVtduService {
@Resource
private VtduMapper vtduMapper;
+ @Resource
+ private IMediaService mediaService;
/**
* 鏌ヨ娴佸獟浣撶鐞�
@@ -32,6 +35,7 @@
*/
@Override
public Vtdu selectVtduByName(String name) {
+
return vtduMapper.selectVtduByName(name);
}
@@ -54,7 +58,16 @@
*/
@Override
public int insertVtdu(Vtdu vtdu) {
- vtdu.setCreateBy(SecurityUtils.getUserId());
+ 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"));
+ vtdu.setWebrtcUrl(map.get("webrtcUrl"));
+
+ vtdu.setName(vtdu.getName());
+ vtdu.setRtspSource(vtdu.getRtspSource());
+ vtdu.setIsCode(vtdu.getIsCode());
+ vtdu.setMode(vtdu.getMode());
vtdu.setCreateTime(DateUtils.getNowDate());
return vtduMapper.insertVtdu(vtdu);
}
@@ -67,7 +80,16 @@
*/
@Override
public int updateVtdu(Vtdu vtdu) {
- vtdu.setUpdateBy(SecurityUtils.getUserId());
+
+ 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());
+ vtdu.setIsCode(vtdu.getIsCode());
+ vtdu.setMode(vtdu.getMode());
+ vtdu.setRtspUrl(map.get("rtspUrl"));
+ vtdu.setRtmpUrl(map.get("rtmpUrl"));
+ vtdu.setWebrtcUrl(map.get("webrtcUrl"));
vtdu.setUpdateTime(DateUtils.getNowDate());
return vtduMapper.updateVtdu(vtdu);
}
@@ -80,6 +102,10 @@
*/
@Override
public int deleteVtduByNames(String[] names) {
+ for (String name : names) {
+ log.debug("娴佸獟浣撱��" + name + "銆戦�氶亾鍒犻櫎");
+ }
+ mediaService.removePath(names);
return vtduMapper.deleteVtduByNames(names);
}
@@ -91,6 +117,27 @@
*/
@Override
public int deleteVtduByName(String name) {
+ log.debug("娴佸獟浣撱��" + name + "銆戦�氶亾鍒犻櫎");
+ mediaService.removePath(name);
return vtduMapper.deleteVtduByName(name);
}
+
+ /**
+ * 鍒犻櫎娴佸獟浣撶鐞嗕俊鎭�
+ *
+ * @param cameraId 鐩告満ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteVtduByCameraId(String cameraId) {
+ Vtdu vtdu = new Vtdu();
+ vtdu.setCameraId(cameraId);
+ List<Vtdu> vtdus = vtduMapper.selectVtduList(vtdu);
+ if (vtdus.size() > 0) {
+ for (Vtdu v : vtdus) {
+ mediaService.removePath(v.getName());
+ }
+ }
+ return vtduMapper.deleteVtduByCameraId(cameraId);
+ }
}
--
Gitblit v1.9.3