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);