From 7db9a3f95d4fc953651a2a09e48bfd0c4bb6e306 Mon Sep 17 00:00:00 2001
From: 16337 <1633794139@qq.com>
Date: Wed, 18 Mar 2026 16:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E5=8C=BA=E5=9F=9F=E7=BB=91=E5=AE=9A=20area=5Fid?=
 =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE=E6=8E=A8=E9=80=81=E6=90=BA=E5=B8=A6?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StreamProxy Bean 添加 areaId 字段
- StreamProxyMapper INSERT/UPDATE 支持 area_id
- AiRedisConfigServiceImpl buildFlatConfig 输出 camera.area_id

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../vmp/aiot/service/impl/AiRedisConfigServiceImpl.java    | 3 +++
 .../genersoft/iot/vmp/streamProxy/bean/StreamProxy.java    | 3 +++
 .../iot/vmp/streamProxy/dao/StreamProxyMapper.java         | 7 ++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRedisConfigServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRedisConfigServiceImpl.java
index f6e82a602..f4c3bc1db 100644
--- a/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRedisConfigServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/aiot/service/impl/AiRedisConfigServiceImpl.java
@@ -560,6 +560,9 @@ public class AiRedisConfigServiceImpl implements IAiRedisConfigService {
             cameraMap.put("location", "");
             cameraMap.put("rtsp_url", rtspUrl);
             cameraMap.put("rtsp_url_valid", true);
+            if (proxy.getAreaId() != null) {
+                cameraMap.put("area_id", proxy.getAreaId());
+            }
             cameras.add(cameraMap);
 
             // 该摄像头下的 ROI 和绑定
diff --git a/src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java b/src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
index 0b6873464..d269dcbfe 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
@@ -72,6 +72,9 @@ public class StreamProxy extends CommonGBChannel {
     @Schema(description = "拉流状态")
     private Boolean pulling;
 
+    @Schema(description = "所属区域ID")
+    private Long areaId;
+
     public CommonGBChannel buildCommonGBChannel() {
         if (ObjectUtils.isEmpty(this.getGbDeviceId())) {
             return null;
diff --git a/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java b/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java
index 98167b754..12b7a03f6 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java
@@ -13,10 +13,10 @@ public interface StreamProxyMapper {
 
     @Insert("INSERT INTO wvp_stream_proxy (type, app, stream,relates_media_server_id, src_url, " +
             "timeout, ffmpeg_cmd_key, rtsp_type, enable_audio, enable_mp4, enable, pulling, " +
-            "enable_disable_none_reader, server_id, create_time, camera_code) VALUES" +
+            "enable_disable_none_reader, server_id, create_time, camera_code, area_id) VALUES" +
             "(#{type}, #{app}, #{stream}, #{relatesMediaServerId}, #{srcUrl}, " +
             "#{timeout}, #{ffmpegCmdKey}, #{rtspType}, #{enableAudio}, #{enableMp4}, #{enable}, #{pulling}, " +
-            "#{enableDisableNoneReader}, #{serverId}, #{createTime}, #{cameraCode} )")
+            "#{enableDisableNoneReader}, #{serverId}, #{createTime}, #{cameraCode}, #{areaId} )")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int add(StreamProxy streamProxyDto);
 
@@ -33,7 +33,8 @@ public interface StreamProxyMapper {
             "enable=#{enable}, " +
             "pulling=#{pulling}, " +
             "enable_disable_none_reader=#{enableDisableNoneReader}, " +
-            "enable_mp4=#{enableMp4} " +
+            "enable_mp4=#{enableMp4}, " +
+            "area_id=#{areaId} " +
             "WHERE id=#{id}")
     int update(StreamProxy streamProxyDto);