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-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index c89d015..4d0faaa 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -153,8 +153,8 @@
                 return 0;
             }
             ardRouteInfo.setPath(kmzResult.getPath());
+            ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
         }
-        ardRouteInfo.setPointCount(getPointCount(ardRouteInfo));
         return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
     }
 
@@ -176,8 +176,12 @@
         // 删除航线(kmz)文件
         for (String id : ids) {
             ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
-            ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
-            ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+            if (information.getPath() != null){
+                ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
+            }
+            if (information.getPath1() != null){
+                ossDockService.deleteObject("kmz", subStringMinioUrlName(information.getPath1()));
+            }
         }
         return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
     }

--
Gitblit v1.9.3