From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Sat, 13 Jan 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 5bb831b..d61b746 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
@@ -55,7 +55,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);
+ }
/**
* 导出流媒体管理列表
*/
@@ -101,7 +109,38 @@
}
return success(vtdu);
}
-
+ /**
+ * 获取流媒体管理详细信息（不校验权限）
+ */
+ @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);
+ }
/**
* 新增流媒体管理
*/
--
Gitblit v1.9.3