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/controller/VtduController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 e6847aa..afbbf20 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
@@ -1,7 +1,14 @@
package com.ruoyi.media.controller;
import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.service.ICameraSdkService;
+import com.ruoyi.media.service.IMediaService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +40,8 @@
{
@Autowired
private IVtduService vtduService;
-
+ @Resource
+ private ICameraSdkService cameraSdkService;
/**
* 鏌ヨ娴佸獟浣撶鐞嗗垪琛�
*/
@@ -66,6 +74,27 @@
@GetMapping(value = "/{name}")
public AjaxResult getInfo(@PathVariable("name") String name)
{
+ //region 鑷姩杞爜
+ String[] nameArray = name.split("_");
+ String cameraId=nameArray[0];
+ Integer chanNo=Integer.valueOf(nameArray[1]);
+ CameraCmd cmd=new CameraCmd();
+ cmd.setCameraId(cameraId);
+ cmd.setChanNo(chanNo);
+ Map<String, Object> videoCompressionCfg = cameraSdkService.getVideoCompressionCfg(cmd);
+ String videoEncType = (String)videoCompressionCfg.get("videoEncType");
+ Vtdu vtdu = vtduService.selectVtduByName(name);
+ if(!videoEncType.equals("鏍囧噯h264"))
+ {
+ vtdu.setIsCode("1");
+ }
+ else
+ {
+ vtdu.setIsCode("0");
+ }
+ vtduService.deleteVtduByName(name);
+ vtduService.insertVtdu(vtdu);
+ //endregion
return success(vtduService.selectVtduByName(name));
}
@@ -77,6 +106,12 @@
@PostMapping
public AjaxResult add(@RequestBody Vtdu vtdu)
{
+ if (StringUtils.isEmpty(vtdu.getName())) {
+ return AjaxResult.error("閫氶亾鍚嶇О涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isEmpty(vtdu.getRtspSource())) {
+ return AjaxResult.error("rtsp鍦板潃涓嶈兘涓虹┖");
+ }
return toAjax(vtduService.insertVtdu(vtdu));
}
--
Gitblit v1.9.3