From 73bc82f63cecf23b74cbf59ebb8bdfb40fe6e5b0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 01 Dec 2025 11:25:28 +0800
Subject: [PATCH] 2025-12-01 zwy 多路直播,将外接相机直播地址插入设备列表中。数据库增加字段“cameraWebrtcUrl”,实体增加cameraWebrtcUrl字段。

---
 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 5a604a5..e057112 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -1,6 +1,6 @@
 package com.ard.sample.wayline.service.impl;
 
-import com.ard.oss.service.impl.OssServiceContext;
+import com.ard.ossdock.service.impl.OssDockServiceContext;
 import com.ard.route.domain.route.ArdRouteInfo;
 import com.ard.route.service.IArdRouteInfoService;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -77,7 +77,7 @@
     private IArdRouteInfoService _ardRouteInfoService;
 
     @Resource
-    private OssServiceContext _ossService;
+    private OssDockServiceContext _ossService;
 
     @Autowired
     private IDeviceService deviceService;
@@ -212,7 +212,7 @@
         // get file url
 //        URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
         URL url = null;
-        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
+        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath1());
         String md5 = "";
         try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
             md5 = DigestUtils.md5Hex(inputStream);
@@ -720,7 +720,7 @@
 
         // get file url
         URL url = null;
-        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
+        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath1());
         String md5 = "";
         try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
             md5 = DigestUtils.md5Hex(inputStream);

--
Gitblit v1.9.3