From e868fb8530823d384ee56ac48e74ad193dcf2d7f Mon Sep 17 00:00:00 2001
From: 16337 <1633794139@qq.com>
Date: Sun, 22 Mar 2026 00:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=20device=5Fid=20=E4=BC=98=E5=85=88=E7=94=A8?=
 =?UTF-8?q?=20ROI=20=E8=A1=A8=EF=BC=8C=E9=99=8D=E7=BA=A7=E7=94=A8=20stream?=
 =?UTF-8?q?=5Fproxy.edge=5Fdevice=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/aiot/service/impl/AiScreenshotServiceImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiScreenshotServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiScreenshotServiceImpl.java
index c7199011d..f8f7af61f 100644
--- a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiScreenshotServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiScreenshotServiceImpl.java
@@ -131,9 +131,10 @@ public class AiScreenshotServiceImpl implements IAiScreenshotService {
             if (rtspUrl != null && !rtspUrl.isEmpty()) {
                 fields.put("rtsp_url", rtspUrl);
             }
-            // 多 Edge 设备隔离：带上绑定的 edge_device_id
-            String edgeDeviceId = proxy.getEdgeDeviceId();
-            if (edgeDeviceId != null && !edgeDeviceId.isEmpty()) {
+            // 多 Edge 设备隔离：优先用 ROI 表的 device_id，没有则用 stream_proxy 的 edge_device_id
+            if (!fields.containsKey("device_id")) {
+                String edgeDeviceId = proxy.getEdgeDeviceId();
+                if (edgeDeviceId != null && !edgeDeviceId.isEmpty()) {
                 fields.put("device_id", edgeDeviceId);
             }
         }