From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/media/controller/VtduController.java |   52 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 17 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 5ea0a2d..34c87bd 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
@@ -6,6 +6,8 @@
 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;
@@ -28,24 +30,26 @@
 
 /**
  * 娴佸獟浣撶鐞咰ontroller
- * 
+ *
  * @author ard
  * @date 2023-08-29
  */
 @RestController
 @RequestMapping("/vtdu/media")
-public class VtduController extends BaseController
-{
+public class VtduController extends BaseController {
     @Autowired
     private IVtduService vtduService;
+    @Resource
+    private IMediaService mediaService;
+    @Resource
+    private ICameraSdkService cameraSdkService;
 
     /**
      * 鏌ヨ娴佸獟浣撶鐞嗗垪琛�
      */
     @PreAuthorize("@ss.hasPermi('vtdu:media:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Vtdu vtdu)
-    {
+    public TableDataInfo list(Vtdu vtdu) {
         startPage();
         List<Vtdu> list = vtduService.selectVtduList(vtdu);
         return getDataTable(list);
@@ -57,8 +61,7 @@
     @PreAuthorize("@ss.hasPermi('vtdu:media:export')")
     @Log(title = "娴佸獟浣撶鐞�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, Vtdu vtdu)
-    {
+    public void export(HttpServletResponse response, Vtdu vtdu) {
         List<Vtdu> list = vtduService.selectVtduList(vtdu);
         ExcelUtil<Vtdu> util = new ExcelUtil<Vtdu>(Vtdu.class);
         util.exportExcel(response, list, "娴佸獟浣撶鐞嗘暟鎹�");
@@ -69,9 +72,27 @@
      */
     @PreAuthorize("@ss.hasPermi('vtdu:media:query')")
     @GetMapping(value = "/{name}")
-    public AjaxResult getInfo(@PathVariable("name") String name)
-    {
-        return success(vtduService.selectVtduByName(name));
+    public AjaxResult getInfo(@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.equals("鏍囧噯h264")) {
+                vtdu.setIsCode("1");
+            } else {
+                vtdu.setIsCode("0");
+            }
+            //娴佸獟浣撲笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
+            if (!mediaService.checkNameExist(name)) {
+                mediaService.addPath(name, vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
+            } else {
+                vtduService.updateVtdu(vtdu);
+            }
+        }
+        return success(vtdu);
     }
 
     /**
@@ -80,8 +101,7 @@
     @PreAuthorize("@ss.hasPermi('vtdu:media:add')")
     @Log(title = "娴佸獟浣撶鐞�", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody Vtdu vtdu)
-    {
+    public AjaxResult add(@RequestBody Vtdu vtdu) {
         if (StringUtils.isEmpty(vtdu.getName())) {
             return AjaxResult.error("閫氶亾鍚嶇О涓嶈兘涓虹┖");
         }
@@ -97,8 +117,7 @@
     @PreAuthorize("@ss.hasPermi('vtdu:media:edit')")
     @Log(title = "娴佸獟浣撶鐞�", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody Vtdu vtdu)
-    {
+    public AjaxResult edit(@RequestBody Vtdu vtdu) {
         return toAjax(vtduService.updateVtdu(vtdu));
     }
 
@@ -107,9 +126,8 @@
      */
     @PreAuthorize("@ss.hasPermi('vtdu:media:remove')")
     @Log(title = "娴佸獟浣撶鐞�", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{names}")
-    public AjaxResult remove(@PathVariable String[] names)
-    {
+    @DeleteMapping("/{names}")
+    public AjaxResult remove(@PathVariable String[] names) {
         return toAjax(vtduService.deleteVtduByNames(names));
     }
 }

--
Gitblit v1.9.3