From f041323a2bce037843fcb163b017427baa556da3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 24 七月 2024 16:41:16 +0800
Subject: [PATCH] 优化:修改未读消息入库前判断不存在则插入 取消：程序自动拉起redis/mediamtx/minio,中间件全部服务化 增加：流媒体vtdu详情接口
---
ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java b/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
index c052f2a..9b66175 100644
--- a/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
+++ b/ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java
@@ -10,6 +10,8 @@
import com.ruoyi.device.camera.service.ICameraSdkService;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.media.service.impl.MediaServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +37,7 @@
* @author ard
* @date 2023-08-29
*/
+@Api(tags = "娴佸獟浣撶鐞�")
@RestController
@RequestMapping("/vtdu/media")
public class VtduController extends BaseController {
@@ -55,7 +58,15 @@
List<Vtdu> list = vtduService.selectVtduList(vtdu);
return getDataTable(list);
}
-
+ /**
+ * 鏌ヨ娴佸獟浣撶鐞嗗垪琛紙涓嶆牎楠屾潈闄愶級
+ */
+ @GetMapping("/list/noPerm")
+ public TableDataInfo listNoPerm(Vtdu vtdu) {
+ startPage();
+ List<Vtdu> list = vtduService.selectVtduList(vtdu);
+ return getDataTable(list);
+ }
/**
* 瀵煎嚭娴佸獟浣撶鐞嗗垪琛�
*/
@@ -71,6 +82,7 @@
/**
* 鑾峰彇娴佸獟浣撶鐞嗚缁嗕俊鎭�
*/
+ @ApiOperation(value = "鑾峰彇娴佸獟浣撶鐞嗚缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('vtdu:media:query')")
@GetMapping(value = "/{name}")
public AjaxResult getInfo(@PathVariable("name") String name) {
@@ -106,32 +118,7 @@
*/
@GetMapping(value = "/{name}/noPerm")
public AjaxResult getInfoNoPerm(@PathVariable("name") String name) {
- Vtdu vtdu = vtduService.selectVtduByName(name);
- if (vtdu != null) {
- String cameraId = name.split("_")[0];
- Integer chanNo = Integer.valueOf(name.split("_")[1]);
- CameraCmd cmd = new CameraCmd(cameraId, chanNo);
- Map<String, Object> videoCompressionCfg = cameraSdkService.getVideoCompressionCfg(cmd);
- String videoEncType = (String) videoCompressionCfg.get("videoEncType");
- if (videoEncType != null) {
- if (!videoEncType.equals("鏍囧噯h264")) {
- vtdu.setIsCode("1");
- } else {
- vtdu.setIsCode("0");
- }
- }
- else
- {
- vtdu.setIsCode("0");
- }
- //娴佸獟浣撲笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
- if (!mediaService.checkNameExist(name)) {
- mediaService.addPath(name, vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
- } else {
- vtduService.updateVtdu(vtdu);
- }
- }
- return success(vtdu);
+ return success(vtduService.selectVtduByName(name));
}
/**
* 鏂板娴佸獟浣撶鐞�
--
Gitblit v1.9.3