From 5224f2b5c0865d6641c7b95715291b975b043016 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Mon, 19 May 2025 10:39:49 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/bean/Device.java          |  11 +-
 .../iot/vmp/gb28181/dao/DeviceMapper.java     |  11 +-
 .../service/impl/DeviceServiceImpl.java       |   4 +
 数据库/2.7.4/初始化-mysql-2.7.4.sql           | 467 +++++++++++++++++
 .../2.7.4/初始化-postgresql-kingbase-2.7.4.sql | 468 ++++++++++++++++++
 数据库/2.7.4/更新-mysql-2.7.4.sql             |  18 +
 .../2.7.4/更新-postgresql-kingbase-2.7.4.sql  |   5 +
 7 files changed, 979 insertions(+), 5 deletions(-)
 create mode 100644 数据库/2.7.4/初始化-mysql-2.7.4.sql
 create mode 100644 数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
 create mode 100644 数据库/2.7.4/更新-mysql-2.7.4.sql
 create mode 100644 数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index aa4bd0a69..23f754c77 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -26,19 +26,19 @@ public class Device {
 	 */
 	@Schema(description = "名称")
 	private String name;
-	
+
 	/**
 	 * 生产厂商
 	 */
 	@Schema(description = "生产厂商")
 	private String manufacturer;
-	
+
 	/**
 	 * 型号
 	 */
 	@Schema(description = "型号")
 	private String model;
-	
+
 	/**
 	 * 固件版本
 	 */
@@ -78,7 +78,7 @@ public class Device {
 	 */
 	@Schema(description = "wan地址")
 	private String  hostAddress;
-	
+
 	/**
 	 * 在线
 	 */
@@ -212,4 +212,7 @@ public class Device {
 
 	@Schema(description = "所属服务Id")
 	private String serverId;
+
+	@Schema(description = "所属服务Id")
+	private Integer deviceType;
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
index ffb8e683b..f33b70ee5 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
@@ -46,6 +46,7 @@ public interface DeviceMapper {
             "server_id,"+
             "media_server_id," +
             "broadcast_push_after_ack," +
+            "device_type," +
             "(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = 1 and dc.data_device_id= de.id) as channel_count "+
             " FROM wvp_device de WHERE de.device_id = #{deviceId}")
     Device getDeviceByDeviceId( @Param("deviceId") String deviceId);
@@ -80,6 +81,7 @@ public interface DeviceMapper {
                 "ssrc_check,"+
                 "as_message_channel,"+
                 "broadcast_push_after_ack,"+
+                "device_type,"+
                 "geo_coord_sys,"+
                 "server_id,"+
                 "on_line"+
@@ -113,6 +115,7 @@ public interface DeviceMapper {
                 "#{ssrcCheck}," +
                 "#{asMessageChannel}," +
                 "#{broadcastPushAfterAck}," +
+                "#{deviceType}," +
                 "#{geoCoordSys}," +
                 "#{serverId}," +
                 "#{onLine}" +
@@ -174,6 +177,7 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
+            "device_type,"+
             "geo_coord_sys,"+
             "on_line,"+
             "media_server_id,"+
@@ -216,6 +220,7 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
+            "device_type,"+
             "geo_coord_sys,"+
             "server_id,"+
             "on_line"+
@@ -249,6 +254,7 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
+            "device_type,"+
             "geo_coord_sys,"+
             "server_id,"+
             "on_line"+
@@ -283,6 +289,7 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
+            "device_type,"+
             "geo_coord_sys,"+
             "on_line"+
             " FROM wvp_device WHERE ip = #{host} AND port=#{port}")
@@ -293,7 +300,7 @@ public interface DeviceMapper {
             "SET update_time=#{updateTime}, custom_name=#{name} , password=#{password}, stream_mode=#{streamMode}" +
             ", ip=#{ip}, sdp_ip=#{sdpIp}, port=#{port}, charset=#{charset}" +
             ", ssrc_check=#{ssrcCheck}, as_message_channel=#{asMessageChannel}" +
-            ", broadcast_push_after_ack=#{broadcastPushAfterAck}, geo_coord_sys=#{geoCoordSys}, media_server_id=#{mediaServerId}" +
+            ", broadcast_push_after_ack=#{broadcastPushAfterAck}, device_type=#{deviceType}, geo_coord_sys=#{geoCoordSys}, media_server_id=#{mediaServerId}" +
             " WHERE id=#{id}"+
             " </script>"})
     void updateCustom(Device device);
@@ -309,6 +316,7 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
+            "device_type,"+
             "geo_coord_sys,"+
             "on_line,"+
             "stream_mode," +
@@ -325,6 +333,7 @@ public interface DeviceMapper {
             "#{ssrcCheck}," +
             "#{asMessageChannel}," +
             "#{broadcastPushAfterAck}," +
+            "#{deviceType}," +
             "#{geoCoordSys}," +
             "#{onLine}," +
             "#{streamMode}," +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
index 0ce89c198..d3af2af72 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
@@ -195,6 +195,7 @@ public class DeviceServiceImpl implements IDeviceService {
     }
 
     @Override
+    @Transactional
     public void offline(String deviceId, String reason) {
         Device device = getDeviceByDeviceIdFromDb(deviceId);
         if (device == null) {
@@ -223,6 +224,7 @@ public class DeviceServiceImpl implements IDeviceService {
         device.setOnLine(false);
         redisCatchStorage.updateDevice(device);
         deviceMapper.update(device);
+        if (device.getDeviceType() )
         //进行通道离线
 //        deviceChannelMapper.offlineByDeviceId(deviceId);
         // 离线释放所有ssrc
@@ -254,6 +256,8 @@ public class DeviceServiceImpl implements IDeviceService {
         }
     }
 
+    private boolean is
+
     @Override
     public boolean addCatalogSubscribe(Device device) {
         if (device == null || device.getSubscribeCycleForCatalog() < 0) {
diff --git a/数据库/2.7.4/初始化-mysql-2.7.4.sql b/数据库/2.7.4/初始化-mysql-2.7.4.sql
new file mode 100644
index 000000000..f94200245
--- /dev/null
+++ b/数据库/2.7.4/初始化-mysql-2.7.4.sql
@@ -0,0 +1,467 @@
+/*建表*/
+drop table IF EXISTS wvp_device;
+create table IF NOT EXISTS wvp_device
+(
+    id                                  serial primary key,
+    device_id                           character varying(50) not null,
+    name                                character varying(255),
+    manufacturer                        character varying(255),
+    model                               character varying(255),
+    firmware                            character varying(255),
+    transport                           character varying(50),
+    stream_mode                         character varying(50),
+    on_line                             bool    default false,
+    register_time                       character varying(50),
+    keepalive_time                      character varying(50),
+    ip                                  character varying(50),
+    create_time                         character varying(50),
+    update_time                         character varying(50),
+    port                                integer,
+    expires                             integer,
+    subscribe_cycle_for_catalog         integer DEFAULT 0,
+    subscribe_cycle_for_mobile_position integer DEFAULT 0,
+    mobile_position_submission_interval integer DEFAULT 5,
+    subscribe_cycle_for_alarm           integer DEFAULT 0,
+    host_address                        character varying(50),
+    charset                             character varying(50),
+    ssrc_check                          bool    default false,
+    geo_coord_sys                       character varying(50),
+    media_server_id                     character varying(50) default 'auto',
+    custom_name                         character varying(255),
+    sdp_ip                              character varying(50),
+    local_ip                            character varying(50),
+    password                            character varying(255),
+    as_message_channel                  bool    default false,
+    heart_beat_interval                 integer,
+    heart_beat_count                    integer,
+    position_capability                 integer,
+    broadcast_push_after_ack            bool    default false,
+    server_id                           character varying(50),
+    device_type                         integer default 200,
+    constraint uk_device_device unique (device_id)
+);
+
+drop table IF EXISTS wvp_device_alarm;
+create table IF NOT EXISTS wvp_device_alarm
+(
+    id                serial primary key,
+    device_id         character varying(50) not null,
+    channel_id        character varying(50) not null,
+    alarm_priority    character varying(50),
+    alarm_method      character varying(50),
+    alarm_time        character varying(50),
+    alarm_description character varying(255),
+    longitude         double precision,
+    latitude          double precision,
+    alarm_type        character varying(50),
+    create_time       character varying(50) not null
+);
+
+drop table IF EXISTS wvp_device_mobile_position;
+create table IF NOT EXISTS wvp_device_mobile_position
+(
+    id              serial primary key,
+    device_id       character varying(50) not null,
+    channel_id      character varying(50) not null,
+    device_name     character varying(255),
+    time            character varying(50),
+    longitude       double precision,
+    latitude        double precision,
+    altitude        double precision,
+    speed           double precision,
+    direction       double precision,
+    report_source   character varying(50),
+    create_time     character varying(50)
+);
+
+drop table IF EXISTS wvp_device_channel;
+create table IF NOT EXISTS wvp_device_channel
+(
+    id                           serial primary key,
+    device_id                    character varying(50),
+    name                         character varying(255),
+    manufacturer                 character varying(50),
+    model                        character varying(50),
+    owner                        character varying(50),
+    civil_code                   character varying(50),
+    block                        character varying(50),
+    address                      character varying(50),
+    parental                     integer,
+    parent_id                    character varying(50),
+    safety_way                   integer,
+    register_way                 integer,
+    cert_num                     character varying(50),
+    certifiable                  integer,
+    err_code                     integer,
+    end_time                     character varying(50),
+    secrecy                      integer,
+    ip_address                   character varying(50),
+    port                         integer,
+    password                     character varying(255),
+    status                       character varying(50),
+    longitude                    double precision,
+    latitude                     double precision,
+    ptz_type                     integer,
+    position_type                integer,
+    room_type                    integer,
+    use_type                     integer,
+    supply_light_type            integer,
+    direction_type               integer,
+    resolution                   character varying(255),
+    business_group_id            character varying(255),
+    download_speed               character varying(255),
+    svc_space_support_mod        integer,
+    svc_time_support_mode        integer,
+    create_time                  character varying(50) not null,
+    update_time                  character varying(50) not null,
+    sub_count                    integer,
+    stream_id                    character varying(255),
+    has_audio                    bool default false,
+    gps_time                     character varying(50),
+    stream_identification        character varying(50),
+    channel_type                 int  default 0        not null,
+    gb_device_id                 character varying(50),
+    gb_name                      character varying(255),
+    gb_manufacturer              character varying(255),
+    gb_model                     character varying(255),
+    gb_owner                     character varying(255),
+    gb_civil_code                character varying(255),
+    gb_block                     character varying(255),
+    gb_address                   character varying(255),
+    gb_parental                  integer,
+    gb_parent_id                 character varying(255),
+    gb_safety_way                integer,
+    gb_register_way              integer,
+    gb_cert_num                  character varying(50),
+    gb_certifiable               integer,
+    gb_err_code                  integer,
+    gb_end_time                  character varying(50),
+    gb_secrecy                   integer,
+    gb_ip_address                character varying(50),
+    gb_port                      integer,
+    gb_password                  character varying(50),
+    gb_status                    character varying(50),
+    gb_longitude                 double,
+    gb_latitude                  double,
+    gb_business_group_id         character varying(50),
+    gb_ptz_type                  integer,
+    gb_position_type             integer,
+    gb_room_type                 integer,
+    gb_use_type                  integer,
+    gb_supply_light_type         integer,
+    gb_direction_type            integer,
+    gb_resolution                character varying(255),
+    gb_download_speed            character varying(255),
+    gb_svc_space_support_mod     integer,
+    gb_svc_time_support_mode     integer,
+    record_plan_id               integer,
+    data_type                    integer not null,
+    data_device_id               integer not null,
+    gps_speed                    double precision,
+    gps_altitude                 double precision,
+    gps_direction                double precision,
+    index (data_type),
+    index (data_device_id),
+    constraint uk_wvp_unique_channel unique (gb_device_id)
+);
+
+drop table IF EXISTS wvp_media_server;
+create table IF NOT EXISTS wvp_media_server
+(
+    id                  character varying(255) primary key,
+    ip                  character varying(50),
+    hook_ip             character varying(50),
+    sdp_ip              character varying(50),
+    stream_ip           character varying(50),
+    http_port           integer,
+    http_ssl_port       integer,
+    rtmp_port           integer,
+    rtmp_ssl_port       integer,
+    rtp_proxy_port      integer,
+    rtsp_port           integer,
+    rtsp_ssl_port       integer,
+    flv_port            integer,
+    flv_ssl_port        integer,
+    ws_flv_port         integer,
+    ws_flv_ssl_port     integer,
+    auto_config         bool                  default false,
+    secret              character varying(50),
+    type                character varying(50) default 'zlm',
+    rtp_enable          bool                  default false,
+    rtp_port_range      character varying(50),
+    send_rtp_port_range character varying(50),
+    record_assist_port  integer,
+    default_server      bool                  default false,
+    create_time         character varying(50),
+    update_time         character varying(50),
+    hook_alive_interval integer,
+    record_path         character varying(255),
+    record_day          integer               default 7,
+    transcode_suffix    character varying(255),
+    server_id           character varying(50),
+    constraint uk_media_server_unique_ip_http_port unique (ip, http_port, server_id)
+);
+
+drop table IF EXISTS wvp_platform;
+create table IF NOT EXISTS wvp_platform
+(
+    id                    serial primary key,
+    enable                bool default false,
+    name                  character varying(255),
+    server_gb_id          character varying(50),
+    server_gb_domain      character varying(50),
+    server_ip             character varying(50),
+    server_port           integer,
+    device_gb_id          character varying(50),
+    device_ip             character varying(50),
+    device_port           character varying(50),
+    username              character varying(255),
+    password              character varying(50),
+    expires               character varying(50),
+    keep_timeout          character varying(50),
+    transport             character varying(50),
+    civil_code            character varying(50),
+    manufacturer          character varying(255),
+    model                 character varying(255),
+    address               character varying(255),
+    character_set         character varying(50),
+    ptz                   bool default false,
+    rtcp                  bool default false,
+    status                bool default false,
+    catalog_group         integer,
+    register_way          integer,
+    secrecy               integer,
+    create_time           character varying(50),
+    update_time           character varying(50),
+    as_message_channel    bool default false,
+    catalog_with_platform integer default 1,
+    catalog_with_group    integer default 1,
+    catalog_with_region   integer default 1,
+    auto_push_channel     bool default true,
+    send_stream_ip        character varying(50),
+    server_id             character varying(50),
+    constraint uk_platform_unique_server_gb_id unique (server_gb_id)
+);
+
+drop table IF EXISTS wvp_platform_channel;
+create table IF NOT EXISTS wvp_platform_channel
+(
+    id                           serial primary key,
+    platform_id                  integer,
+    device_channel_id            integer,
+    custom_device_id             character varying(50),
+    custom_name                  character varying(255),
+    custom_manufacturer          character varying(50),
+    custom_model                 character varying(50),
+    custom_owner                 character varying(50),
+    custom_civil_code            character varying(50),
+    custom_block                 character varying(50),
+    custom_address               character varying(50),
+    custom_parental              integer,
+    custom_parent_id             character varying(50),
+    custom_safety_way            integer,
+    custom_register_way          integer,
+    custom_cert_num              character varying(50),
+    custom_certifiable           integer,
+    custom_err_code              integer,
+    custom_end_time              character varying(50),
+    custom_secrecy               integer,
+    custom_ip_address            character varying(50),
+    custom_port                  integer,
+    custom_password              character varying(255),
+    custom_status                character varying(50),
+    custom_longitude             double precision,
+    custom_latitude              double precision,
+    custom_ptz_type              integer,
+    custom_position_type         integer,
+    custom_room_type             integer,
+    custom_use_type              integer,
+    custom_supply_light_type     integer,
+    custom_direction_type        integer,
+    custom_resolution            character varying(255),
+    custom_business_group_id     character varying(255),
+    custom_download_speed        character varying(255),
+    custom_svc_space_support_mod integer,
+    custom_svc_time_support_mode integer,
+    constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, device_channel_id),
+    constraint uk_platform_gb_channel_device_id unique (custom_device_id)
+);
+
+drop table IF EXISTS wvp_platform_group;
+create table IF NOT EXISTS wvp_platform_group
+(
+    id          serial primary key,
+    platform_id integer,
+    group_id    integer,
+    constraint uk_wvp_platform_group_platform_id_group_id unique (platform_id, group_id)
+);
+
+drop table IF EXISTS wvp_platform_region;
+create table IF NOT EXISTS wvp_platform_region
+(
+    id          serial primary key,
+    platform_id integer,
+    region_id   integer,
+    constraint uk_wvp_platform_region_platform_id_group_id unique (platform_id, region_id)
+);
+
+drop table IF EXISTS wvp_stream_proxy;
+create table IF NOT EXISTS wvp_stream_proxy
+(
+    id                         serial primary key,
+    type                       character varying(50),
+    app                        character varying(255),
+    stream                     character varying(255),
+    src_url                    character varying(255),
+    timeout                    integer,
+    ffmpeg_cmd_key             character varying(255),
+    rtsp_type                  character varying(50),
+    media_server_id            character varying(50),
+    enable_audio               bool default false,
+    enable_mp4                 bool default false,
+    pulling                    bool default false,
+    enable                     bool default false,
+    enable_remove_none_reader  bool default false,
+    create_time                character varying(50),
+    name                       character varying(255),
+    update_time                character varying(50),
+    stream_key                 character varying(255),
+    server_id                  character varying(50),
+    enable_disable_none_reader bool default false,
+    relates_media_server_id    character varying(50),
+    constraint uk_stream_proxy_app_stream unique (app, stream)
+);
+
+drop table IF EXISTS wvp_stream_push;
+create table IF NOT EXISTS wvp_stream_push
+(
+    id                 serial primary key,
+    app                character varying(255),
+    stream             character varying(255),
+    create_time        character varying(50),
+    media_server_id    character varying(50),
+    server_id          character varying(50),
+    push_time          character varying(50),
+    status             bool default false,
+    update_time        character varying(50),
+    pushing            bool default false,
+    self               bool default false,
+    start_offline_push bool default true,
+    constraint uk_stream_push_app_stream unique (app, stream)
+);
+
+drop table IF EXISTS wvp_cloud_record;
+create table IF NOT EXISTS wvp_cloud_record
+(
+    id              serial primary key,
+    app             character varying(255),
+    stream          character varying(255),
+    call_id         character varying(255),
+    start_time      bigint,
+    end_time        bigint,
+    media_server_id character varying(50),
+    server_id       character varying(50),
+    file_name       character varying(255),
+    folder          character varying(500),
+    file_path       character varying(500),
+    collect         bool default false,
+    file_size       bigint,
+    time_len        double precision
+);
+
+drop table IF EXISTS wvp_user;
+create table IF NOT EXISTS wvp_user
+(
+    id          serial primary key,
+    username    character varying(255),
+    password    character varying(255),
+    role_id     integer,
+    create_time character varying(50),
+    update_time character varying(50),
+    push_key    character varying(50),
+    constraint uk_user_username unique (username)
+);
+
+drop table IF EXISTS wvp_user_role;
+create table IF NOT EXISTS wvp_user_role
+(
+    id          serial primary key,
+    name        character varying(50),
+    authority   character varying(50),
+    create_time character varying(50),
+    update_time character varying(50)
+);
+
+
+drop table IF EXISTS wvp_user_api_key;
+create table IF NOT EXISTS wvp_user_api_key
+(
+    id          serial primary key,
+    user_id     bigint,
+    app         character varying(255),
+    api_key     text,
+    expired_at  bigint,
+    remark      character varying(255),
+    enable      bool default true,
+    create_time character varying(50),
+    update_time character varying(50)
+);
+
+
+/*初始数据*/
+INSERT INTO wvp_user
+VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 1, '2021-04-13 14:14:57', '2021-04-13 14:14:57',
+        '3e80d1762a324d5b0ff636e0bd16f1e3');
+INSERT INTO wvp_user_role
+VALUES (1, 'admin', '0', '2021-04-13 14:14:57', '2021-04-13 14:14:57');
+
+drop table IF EXISTS wvp_common_group;
+create table IF NOT EXISTS wvp_common_group
+(
+    id               serial primary key,
+    device_id        varchar(50)  NOT NULL,
+    name             varchar(255) NOT NULL,
+    parent_id        int,
+    parent_device_id varchar(50) DEFAULT NULL,
+    business_group   varchar(50)  NOT NULL,
+    create_time      varchar(50)  NOT NULL,
+    update_time      varchar(50)  NOT NULL,
+    civil_code       varchar(50) default null,
+    constraint uk_common_group_device_platform unique (device_id)
+);
+
+drop table IF EXISTS wvp_common_region;
+create table IF NOT EXISTS wvp_common_region
+(
+    id               serial primary key,
+    device_id        varchar(50)  NOT NULL,
+    name             varchar(255) NOT NULL,
+    parent_id        int,
+    parent_device_id varchar(50) DEFAULT NULL,
+    create_time      varchar(50)  NOT NULL,
+    update_time      varchar(50)  NOT NULL,
+    constraint uk_common_region_device_id unique (device_id)
+);
+
+drop table IF EXISTS wvp_record_plan;
+create table IF NOT EXISTS wvp_record_plan
+(
+    id              serial primary key,
+    snap            bool default false,
+    name            varchar(255) NOT NULL,
+    create_time     character varying(50),
+    update_time     character varying(50)
+);
+
+drop table IF EXISTS wvp_record_plan_item;
+create table IF NOT EXISTS wvp_record_plan_item
+(
+    id              serial primary key,
+    start           int,
+    stop            int,
+    week_day        int,
+    plan_id         int,
+    create_time     character varying(50),
+    update_time     character varying(50)
+);
+
diff --git a/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql b/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
new file mode 100644
index 000000000..8de1db4bf
--- /dev/null
+++ b/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
@@ -0,0 +1,468 @@
+/*建表*/
+drop table IF EXISTS wvp_device;
+create table IF NOT EXISTS wvp_device
+(
+    id                                  serial primary key,
+    device_id                           character varying(50) not null,
+    name                                character varying(255),
+    manufacturer                        character varying(255),
+    model                               character varying(255),
+    firmware                            character varying(255),
+    transport                           character varying(50),
+    stream_mode                         character varying(50),
+    on_line                             bool    default false,
+    register_time                       character varying(50),
+    keepalive_time                      character varying(50),
+    ip                                  character varying(50),
+    create_time                         character varying(50),
+    update_time                         character varying(50),
+    port                                integer,
+    expires                             integer,
+    subscribe_cycle_for_catalog         integer DEFAULT 0,
+    subscribe_cycle_for_mobile_position integer DEFAULT 0,
+    mobile_position_submission_interval integer DEFAULT 5,
+    subscribe_cycle_for_alarm           integer DEFAULT 0,
+    host_address                        character varying(50),
+    charset                             character varying(50),
+    ssrc_check                          bool    default false,
+    geo_coord_sys                       character varying(50),
+    media_server_id                     character varying(50) default 'auto',
+    custom_name                         character varying(255),
+    sdp_ip                              character varying(50),
+    local_ip                            character varying(50),
+    password                            character varying(255),
+    as_message_channel                  bool    default false,
+    heart_beat_interval                 integer,
+    heart_beat_count                    integer,
+    position_capability                 integer,
+    broadcast_push_after_ack            bool    default false,
+    server_id                           character varying(50),
+    device_type                         integer,
+    constraint uk_device_device unique (device_id)
+);
+
+drop table IF EXISTS wvp_device_alarm;
+create table IF NOT EXISTS wvp_device_alarm
+(
+    id                serial primary key,
+    device_id         character varying(50) not null,
+    channel_id        character varying(50) not null,
+    alarm_priority    character varying(50),
+    alarm_method      character varying(50),
+    alarm_time        character varying(50),
+    alarm_description character varying(255),
+    longitude         double precision,
+    latitude          double precision,
+    alarm_type        character varying(50),
+    create_time       character varying(50) not null
+);
+
+drop table IF EXISTS wvp_device_mobile_position;
+create table IF NOT EXISTS wvp_device_mobile_position
+(
+    id              serial primary key,
+    device_id       character varying(50) not null,
+    channel_id      character varying(50) not null,
+    device_name     character varying(255),
+    time            character varying(50),
+    longitude       double precision,
+    latitude        double precision,
+    altitude        double precision,
+    speed           double precision,
+    direction       double precision,
+    report_source   character varying(50),
+    create_time     character varying(50)
+);
+
+drop table IF EXISTS wvp_device_channel;
+create table IF NOT EXISTS wvp_device_channel
+(
+    id                           serial primary key,
+    device_id                    character varying(50),
+    name                         character varying(255),
+    manufacturer                 character varying(50),
+    model                        character varying(50),
+    owner                        character varying(50),
+    civil_code                   character varying(50),
+    block                        character varying(50),
+    address                      character varying(50),
+    parental                     integer,
+    parent_id                    character varying(50),
+    safety_way                   integer,
+    register_way                 integer,
+    cert_num                     character varying(50),
+    certifiable                  integer,
+    err_code                     integer,
+    end_time                     character varying(50),
+    secrecy                      integer,
+    ip_address                   character varying(50),
+    port                         integer,
+    password                     character varying(255),
+    status                       character varying(50),
+    longitude                    double precision,
+    latitude                     double precision,
+    ptz_type                     integer,
+    position_type                integer,
+    room_type                    integer,
+    use_type                     integer,
+    supply_light_type            integer,
+    direction_type               integer,
+    resolution                   character varying(255),
+    business_group_id            character varying(255),
+    download_speed               character varying(255),
+    svc_space_support_mod        integer,
+    svc_time_support_mode        integer,
+    create_time                  character varying(50) not null,
+    update_time                  character varying(50) not null,
+    sub_count                    integer,
+    stream_id                    character varying(255),
+    has_audio                    bool default false,
+    gps_time                     character varying(50),
+    stream_identification        character varying(50),
+    channel_type                 int  default 0        not null,
+    gb_device_id                 character varying(50),
+    gb_name                      character varying(255),
+    gb_manufacturer              character varying(255),
+    gb_model                     character varying(255),
+    gb_owner                     character varying(255),
+    gb_civil_code                character varying(255),
+    gb_block                     character varying(255),
+    gb_address                   character varying(255),
+    gb_parental                  integer,
+    gb_parent_id                 character varying(255),
+    gb_safety_way                integer,
+    gb_register_way              integer,
+    gb_cert_num                  character varying(50),
+    gb_certifiable               integer,
+    gb_err_code                  integer,
+    gb_end_time                  character varying(50),
+    gb_secrecy                   integer,
+    gb_ip_address                character varying(50),
+    gb_port                      integer,
+    gb_password                  character varying(50),
+    gb_status                    character varying(50),
+    gb_longitude                 double precision,
+    gb_latitude                  double precision,
+    gb_business_group_id         character varying(50),
+    gb_ptz_type                  integer,
+    gb_position_type             integer,
+    gb_room_type                 integer,
+    gb_use_type                  integer,
+    gb_supply_light_type         integer,
+    gb_direction_type            integer,
+    gb_resolution                character varying(255),
+    gb_download_speed            character varying(255),
+    gb_svc_space_support_mod     integer,
+    gb_svc_time_support_mode     integer,
+    record_plan_id               integer,
+    data_type                    integer not null,
+    data_device_id               integer not null,
+    gps_speed                    double precision,
+    gps_altitude                 double precision,
+    gps_direction                double precision,
+    constraint uk_wvp_unique_channel unique (gb_device_id)
+);
+
+CREATE INDEX idx_data_type ON wvp_device_channel (data_type);
+CREATE INDEX idx_data_device_id ON wvp_device_channel (data_device_id);
+
+drop table IF EXISTS wvp_media_server;
+create table IF NOT EXISTS wvp_media_server
+(
+    id                  character varying(255) primary key,
+    ip                  character varying(50),
+    hook_ip             character varying(50),
+    sdp_ip              character varying(50),
+    stream_ip           character varying(50),
+    http_port           integer,
+    http_ssl_port       integer,
+    rtmp_port           integer,
+    rtmp_ssl_port       integer,
+    rtp_proxy_port      integer,
+    rtsp_port           integer,
+    rtsp_ssl_port       integer,
+    flv_port            integer,
+    flv_ssl_port        integer,
+    ws_flv_port         integer,
+    ws_flv_ssl_port     integer,
+    auto_config         bool                  default false,
+    secret              character varying(50),
+    type                character varying(50) default 'zlm',
+    rtp_enable          bool                  default false,
+    rtp_port_range      character varying(50),
+    send_rtp_port_range character varying(50),
+    record_assist_port  integer,
+    default_server      bool                  default false,
+    create_time         character varying(50),
+    update_time         character varying(50),
+    hook_alive_interval integer,
+    record_path         character varying(255),
+    record_day          integer               default 7,
+    transcode_suffix    character varying(255),
+    server_id           character varying(50),
+    constraint uk_media_server_unique_ip_http_port unique (ip, http_port, server_id)
+);
+
+drop table IF EXISTS wvp_platform;
+create table IF NOT EXISTS wvp_platform
+(
+    id                    serial primary key,
+    enable                bool default false,
+    name                  character varying(255),
+    server_gb_id          character varying(50),
+    server_gb_domain      character varying(50),
+    server_ip             character varying(50),
+    server_port           integer,
+    device_gb_id          character varying(50),
+    device_ip             character varying(50),
+    device_port           character varying(50),
+    username              character varying(255),
+    password              character varying(50),
+    expires               character varying(50),
+    keep_timeout          character varying(50),
+    transport             character varying(50),
+    civil_code            character varying(50),
+    manufacturer          character varying(255),
+    model                 character varying(255),
+    address               character varying(255),
+    character_set         character varying(50),
+    ptz                   bool default false,
+    rtcp                  bool default false,
+    status                bool default false,
+    catalog_group         integer,
+    register_way          integer,
+    secrecy               integer,
+    create_time           character varying(50),
+    update_time           character varying(50),
+    as_message_channel    bool default false,
+    catalog_with_platform integer default 1,
+    catalog_with_group    integer default 1,
+    catalog_with_region   integer default 1,
+    auto_push_channel     bool default true,
+    send_stream_ip        character varying(50),
+    server_id             character varying(50),
+    constraint uk_platform_unique_server_gb_id unique (server_gb_id)
+);
+
+drop table IF EXISTS wvp_platform_channel;
+create table IF NOT EXISTS wvp_platform_channel
+(
+    id                           serial primary key,
+    platform_id                  integer,
+    device_channel_id            integer,
+    custom_device_id             character varying(50),
+    custom_name                  character varying(255),
+    custom_manufacturer          character varying(50),
+    custom_model                 character varying(50),
+    custom_owner                 character varying(50),
+    custom_civil_code            character varying(50),
+    custom_block                 character varying(50),
+    custom_address               character varying(50),
+    custom_parental              integer,
+    custom_parent_id             character varying(50),
+    custom_safety_way            integer,
+    custom_register_way          integer,
+    custom_cert_num              character varying(50),
+    custom_certifiable           integer,
+    custom_err_code              integer,
+    custom_end_time              character varying(50),
+    custom_secrecy               integer,
+    custom_ip_address            character varying(50),
+    custom_port                  integer,
+    custom_password              character varying(255),
+    custom_status                character varying(50),
+    custom_longitude             double precision,
+    custom_latitude              double precision,
+    custom_ptz_type              integer,
+    custom_position_type         integer,
+    custom_room_type             integer,
+    custom_use_type              integer,
+    custom_supply_light_type     integer,
+    custom_direction_type        integer,
+    custom_resolution            character varying(255),
+    custom_business_group_id     character varying(255),
+    custom_download_speed        character varying(255),
+    custom_svc_space_support_mod integer,
+    custom_svc_time_support_mode integer,
+    constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, device_channel_id),
+    constraint uk_platform_gb_channel_device_id unique (custom_device_id)
+);
+
+drop table IF EXISTS wvp_platform_group;
+create table IF NOT EXISTS wvp_platform_group
+(
+    id          serial primary key,
+    platform_id integer,
+    group_id    integer,
+    constraint uk_wvp_platform_group_platform_id_group_id unique (platform_id, group_id)
+);
+
+drop table IF EXISTS wvp_platform_region;
+create table IF NOT EXISTS wvp_platform_region
+(
+    id          serial primary key,
+    platform_id integer,
+    region_id   integer,
+    constraint uk_wvp_platform_region_platform_id_group_id unique (platform_id, region_id)
+);
+
+drop table IF EXISTS wvp_stream_proxy;
+create table IF NOT EXISTS wvp_stream_proxy
+(
+    id                         serial primary key,
+    type                       character varying(50),
+    app                        character varying(255),
+    stream                     character varying(255),
+    src_url                    character varying(255),
+    timeout                    integer,
+    ffmpeg_cmd_key             character varying(255),
+    rtsp_type                  character varying(50),
+    media_server_id            character varying(50),
+    enable_audio               bool default false,
+    enable_mp4                 bool default false,
+    pulling                    bool default false,
+    enable                     bool default false,
+    enable_remove_none_reader  bool default false,
+    create_time                character varying(50),
+    name                       character varying(255),
+    update_time                character varying(50),
+    stream_key                 character varying(255),
+    server_id                  character varying(50),
+    enable_disable_none_reader bool default false,
+    relates_media_server_id    character varying(50),
+    constraint uk_stream_proxy_app_stream unique (app, stream)
+);
+
+drop table IF EXISTS wvp_stream_push;
+create table IF NOT EXISTS wvp_stream_push
+(
+    id                 serial primary key,
+    app                character varying(255),
+    stream             character varying(255),
+    create_time        character varying(50),
+    media_server_id    character varying(50),
+    server_id          character varying(50),
+    push_time          character varying(50),
+    status             bool default false,
+    update_time        character varying(50),
+    pushing            bool default false,
+    self               bool default false,
+    start_offline_push bool default true,
+    constraint uk_stream_push_app_stream unique (app, stream)
+);
+
+drop table IF EXISTS wvp_cloud_record;
+create table IF NOT EXISTS wvp_cloud_record
+(
+    id              serial primary key,
+    app             character varying(255),
+    stream          character varying(255),
+    call_id         character varying(255),
+    start_time      int8,
+    end_time        int8,
+    media_server_id character varying(50),
+    server_id       character varying(50),
+    file_name       character varying(255),
+    folder          character varying(500),
+    file_path       character varying(500),
+    collect         bool default false,
+    file_size       int8,
+    time_len        double precision
+);
+
+drop table IF EXISTS wvp_user;
+create table IF NOT EXISTS wvp_user
+(
+    id          serial primary key,
+    username    character varying(255),
+    password    character varying(255),
+    role_id     integer,
+    create_time character varying(50),
+    update_time character varying(50),
+    push_key    character varying(50),
+    constraint uk_user_username unique (username)
+);
+
+drop table IF EXISTS wvp_user_role;
+create table IF NOT EXISTS wvp_user_role
+(
+    id          serial primary key,
+    name        character varying(50),
+    authority   character varying(50),
+    create_time character varying(50),
+    update_time character varying(50)
+);
+
+
+drop table IF EXISTS wvp_user_api_key;
+create table IF NOT EXISTS wvp_user_api_key
+(
+    id          serial primary key,
+    user_id     int8,
+    app         character varying(255),
+    api_key     text,
+    expired_at  int8,
+    remark      character varying(255),
+    enable      bool default true,
+    create_time character varying(50),
+    update_time character varying(50)
+);
+
+
+/*初始数据*/
+INSERT INTO wvp_user
+VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 1, '2021-04-13 14:14:57', '2021-04-13 14:14:57',
+        '3e80d1762a324d5b0ff636e0bd16f1e3');
+INSERT INTO wvp_user_role
+VALUES (1, 'admin', '0', '2021-04-13 14:14:57', '2021-04-13 14:14:57');
+
+drop table IF EXISTS wvp_common_group;
+create table IF NOT EXISTS wvp_common_group
+(
+    id               serial primary key,
+    device_id        varchar(50)  NOT NULL,
+    name             varchar(255) NOT NULL,
+    parent_id        int,
+    parent_device_id varchar(50) DEFAULT NULL,
+    business_group   varchar(50)  NOT NULL,
+    create_time      varchar(50)  NOT NULL,
+    update_time      varchar(50)  NOT NULL,
+    civil_code       varchar(50) default null,
+    constraint uk_common_group_device_platform unique (device_id)
+);
+
+drop table IF EXISTS wvp_common_region;
+create table IF NOT EXISTS wvp_common_region
+(
+    id               serial primary key,
+    device_id        varchar(50)  NOT NULL,
+    name             varchar(255) NOT NULL,
+    parent_id        int,
+    parent_device_id varchar(50) DEFAULT NULL,
+    create_time      varchar(50)  NOT NULL,
+    update_time      varchar(50)  NOT NULL,
+    constraint uk_common_region_device_id unique (device_id)
+);
+
+drop table IF EXISTS wvp_record_plan;
+create table IF NOT EXISTS wvp_record_plan
+(
+    id              serial primary key,
+    snap            bool default false,
+    name            varchar(255) NOT NULL,
+    create_time     character varying(50),
+    update_time     character varying(50)
+);
+
+drop table IF EXISTS wvp_record_plan_item;
+create table IF NOT EXISTS wvp_record_plan_item
+(
+    id              serial primary key,
+    "start"           int,
+    stop            int,
+    week_day        int,
+    plan_id        int,
+    create_time     character varying(50),
+    update_time     character varying(50)
+);
+
diff --git a/数据库/2.7.4/更新-mysql-2.7.4.sql b/数据库/2.7.4/更新-mysql-2.7.4.sql
new file mode 100644
index 000000000..526a40408
--- /dev/null
+++ b/数据库/2.7.4/更新-mysql-2.7.4.sql
@@ -0,0 +1,18 @@
+/*
+* 20250519
+*/
+DELIMITER //  -- 重定义分隔符避免分号冲突
+CREATE PROCEDURE `wvp_20250519`()
+BEGIN
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
+                   WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device' and column_name = 'device_type')
+    THEN
+        ALTER TABLE wvp_device ADD device_type  integer;
+    END IF;
+END; //
+call wvp_20250519();
+DROP PROCEDURE wvp_20250519;
+DELIMITER ;
+
+
+
diff --git a/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql b/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql
new file mode 100644
index 000000000..37ce08893
--- /dev/null
+++ b/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql
@@ -0,0 +1,5 @@
+/*
+* 20250519
+*/
+ ALTER TABLE wvp_device ADD COLUMN IF NOT EXISTS device_type  integer;
+

From d524905edb3afd6f754871ff364a5192c8fca232 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Mon, 19 May 2025 15:52:56 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=92=8C=E5=B9=B3=E5=8F=B0=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E5=90=8C=E6=AD=A5=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/bean/ChannelIdType.java   | 23 -------------------
 .../vmp/gb28181/dao/DeviceChannelMapper.java  |  4 ++++
 .../service/impl/DeviceServiceImpl.java       | 22 ++++++++++++++----
 .../cmd/CatalogResponseMessageHandler.java    |  1 +
 4 files changed, 22 insertions(+), 28 deletions(-)
 delete mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/bean/ChannelIdType.java

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ChannelIdType.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ChannelIdType.java
deleted file mode 100644
index 320bbdd03..000000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ChannelIdType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.bean;
-
-/**
- * 国标类型编码,国标编码中11-13位为类型编码
- * 详见 附 录 D  编码规则 A
- * @author lin
- */
-public class ChannelIdType {
-    /**
-     * 中心信令控制服务器编码
-     */
-    public final static String CENTRAL_SIGNALING_CONTROL_SERVER = "200";
-
-    /**
-     * 业务分组编码
-     */
-    public final static String BUSINESS_GROUP = "215";
-
-    /**
-     * 虚拟组织编码
-     */
-    public final static String VIRTUAL_ORGANIZATION = "216";
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java
index f700dad8f..8c02a1084 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java
@@ -666,4 +666,8 @@ public interface DeviceChannelMapper {
             " where data_type = 1 and data_device_id=#{dataDeviceId} and device_id = #{channelId}" +
             " </script>"})
     DeviceChannel getOneBySourceChannelId(@Param("dataDeviceId") int dataDeviceId, @Param("channelId") String channelId);
+
+    @Update(value = {"UPDATE wvp_device_channel SET status = 'OFF' WHERE data_type = 1 and data_device_id=#{deviceId}"})
+    void offlineByDeviceId(@Param("deviceId") int deviceId);
+
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
index d3af2af72..bb07687ba 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
@@ -161,7 +161,10 @@ public class DeviceServiceImpl implements IDeviceService {
                         log.error("[命令发送失败] 查询设备信息: {}", e.getMessage());
                     }
                     sync(device);
-                    // TODO 如果设备下的通道级联到了其他平台，那么需要发送事件或者notify给上级平台
+                }else {
+                    if (!isPlatform(device.getDeviceId())) {
+                        sync(device);
+                    }
                 }
                 // 上线添加订阅
                 if (device.getSubscribeCycleForCatalog() > 0) {
@@ -224,9 +227,11 @@ public class DeviceServiceImpl implements IDeviceService {
         device.setOnLine(false);
         redisCatchStorage.updateDevice(device);
         deviceMapper.update(device);
-        if (device.getDeviceType() )
-        //进行通道离线
-//        deviceChannelMapper.offlineByDeviceId(deviceId);
+        if (!isPlatform(deviceId)) {
+            // 进行通道离线
+            deviceChannelMapper.offlineByDeviceId(device.getId());
+        }
+
         // 离线释放所有ssrc
         List<SsrcTransaction> ssrcTransactions = sessionManager.getSsrcTransactionByDeviceId(deviceId);
         if (ssrcTransactions != null && !ssrcTransactions.isEmpty()) {
@@ -256,7 +261,14 @@ public class DeviceServiceImpl implements IDeviceService {
         }
     }
 
-    private boolean is
+    private boolean isPlatform(String deviceId) {
+        GbCode decode = GbCode.decode(deviceId);
+        if (decode == null) {
+            return true;
+        }
+        int code = Integer.parseInt(decode.getTypeCode());
+        return code <= 199;
+    }
 
     @Override
     public boolean addCatalogSubscribe(Device device) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
index 1f6961fb1..8c645a437 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
@@ -131,6 +131,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
                             Element itemDevice = deviceListIterator.next();
                             Element channelDeviceElement = itemDevice.element("DeviceID");
                             if (channelDeviceElement == null) {
+                                // 总数减一， 避免最后总数不对 无法确定问题
                                 continue;
                             }
                             // 从xml解析内容到 DeviceChannel 对象

From 3845c03250d07b12df08d69d4264a6afdd25bcfc Mon Sep 17 00:00:00 2001
From: xiaoQQya <46475319+xiaoQQya@users.noreply.github.com>
Date: Thu, 29 May 2025 14:37:22 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20sql=20?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
index b999fecd1..5962dbf0e 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
@@ -144,7 +144,7 @@ public interface DeviceMapper {
                 ", subscribe_cycle_for_alarm=#{subscribeCycleForAlarm}" +
                 ", expires=#{expires}" +
                 ", server_id=#{serverId}" +
-                "WHERE device_id=#{deviceId}"+
+                " WHERE device_id=#{deviceId}"+
             " </script>"})
     int update(Device device);
 

From 79be053db73397915ccf5eb88edac337a9adc56f Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Thu, 29 May 2025 17:52:40 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e2348b26..c23a1b1b7 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git
 - [X] 支持ONVIF协议，设备检索，支持点播，云台控制，国标级联点播，自动点播等。
 - [X] 支持部标1078+808协议，支持点播，云台控制，录像回放，位置上报，自动点播等。
 - [X] 支持国标28181-2022协议，支持巡航轨迹查询，PTZ精准控制，存储卡格式化，设备软件升级，OSD配置，h265+aac，支持辅码流，录像倒放等。
-- [X] 支持国网B接口协议。支持注册，获取资源，预览等
+- [X] 支持国网B接口协议。支持注册，获取资源，预览, 云台控制，预置位控制等，可免费定制支持语音对讲、录像回放和抓拍图像。
 
 
 # 授权协议

From dccd27e9c213b704c3690f13c718a7f1dbecde07 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 29 May 2025 21:36:02 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceServiceImpl.java        | 18 ++++++++++--------
 .../cmd/KeepaliveNotifyMessageHandler.java     |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
index b04ad9230..6e47e0b9f 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
@@ -382,12 +382,14 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
             return;
         }
 
-        // 主动查询设备状态
-        Boolean deviceStatus = getDeviceStatus(device);
-        if (deviceStatus != null && deviceStatus) {
-            log.info("[设备离线] 主动探测发现设备在线，暂不处理  device：{}", deviceId);
-            online(device, null);
-            return;
+        // 主动查询设备状态, 没有HostAddress无法发送请求，可能是手动添加的设备
+        if (device.getHostAddress() != null) {
+            Boolean deviceStatus = getDeviceStatus(device);
+            if (deviceStatus != null && deviceStatus) {
+                log.info("[设备离线] 主动探测发现设备在线，暂不处理  device：{}", deviceId);
+                online(device, null);
+                return;
+            }
         }
         log.info("[设备离线] {}, device：{}， 心跳间隔： {}，心跳超时次数： {}， 上次心跳时间：{}， 上次注册时间： {}", reason, deviceId,
                 device.getHeartBeatInterval(), device.getHeartBeatCount(), device.getKeepaliveTime(), device.getRegisterTime());
@@ -406,7 +408,7 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
             return;
         }
         for (Device device : deviceList) {
-            if (device == null || !device.isOnLine() || !device.getServerId().equals(userSetting.getServerId())) {
+            if (device == null || !device.isOnLine() || !userSetting.getServerId().equals(device.getServerId())) {
                 continue;
             }
             if (device.getSubscribeCycleForCatalog() > 0 && !subscribeTaskRunner.containsKey(SubscribeTaskForCatalog.getKey(device))) {
@@ -862,7 +864,7 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
 
     @Override
     public WVPResult<SyncStatus> devicesSync(Device device) {
-        if (!userSetting.getServerId().equals(device.getServerId())) {
+        if (device.getServerId() != null && !userSetting.getServerId().equals(device.getServerId())) {
             return redisRpcService.devicesSync(device.getServerId(), device.getDeviceId());
         }
         // 已存在则返回进度
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
index dee3b821f..7b273debd 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
@@ -102,7 +102,7 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp
             SIPRequest request = (SIPRequest) evt.getRequest();
 
             RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request, userSetting.getSipUseSourceIpAsRemoteAddress());
-            if (!device.getIp().equalsIgnoreCase(remoteAddressInfo.getIp()) || device.getPort() != remoteAddressInfo.getPort()) {
+            if (device.getIp() == null || !device.getIp().equalsIgnoreCase(remoteAddressInfo.getIp()) || device.getPort() != remoteAddressInfo.getPort()) {
                 log.info("[收到心跳] 地址变化, {}({}), {}:{}->{}", device.getName(), device.getDeviceId(), remoteAddressInfo.getIp(), remoteAddressInfo.getPort(), request.getLocalAddress().getHostAddress());
                 device.setPort(remoteAddressInfo.getPort());
                 device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));

From f9300d01ec37321abf11673a3fe70f04278927c5 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 30 May 2025 14:23:24 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A2=84=E7=BD=AE=E4=BD=8D=E7=9A=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/dialog/devicePlayer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/views/dialog/devicePlayer.vue b/web/src/views/dialog/devicePlayer.vue
index 95bef3077..3d38da44a 100755
--- a/web/src/views/dialog/devicePlayer.vue
+++ b/web/src/views/dialog/devicePlayer.vue
@@ -298,7 +298,7 @@
                   </div>
                 </div>
               </div>
-              <div style="text-align: left">
+              <div style="text-align: left" v-if="tabActiveName === 'control'">
                 <el-select
                   v-model="ptzMethod"
                   style="width: 100%"

From 111274c08a7888365ea90229293104b9571ea69d Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 3 Jun 2025 10:36:29 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4=EF=BC=8C?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=8F=91=E6=B5=81=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=8C=20=E9=81=BF=E5=85=8D=E9=80=92?=
 =?UTF-8?q?=E5=BD=92=E8=BF=87=E5=A4=9A=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/dao/PlatformChannelMapper.java    |  4 +--
 .../impl/SendRtpServerServiceImpl.java        | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
index c437eee0f..8d44f8df3 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
@@ -147,8 +147,8 @@ public interface PlatformChannelMapper {
             " <if test='query != null'> " +
             " AND (coalesce(wdc.gb_device_id, wdc.device_id) LIKE concat('%',#{query},'%') OR wpgc.custom_device_id LIKE concat('%',#{query},'%') " +
             "      OR coalesce(wdc.gb_name, wdc.name)  LIKE concat('%',#{query},'%') OR wpgc.custom_name LIKE concat('%',#{query},'%'))</if> " +
-            " <if test='online == true'> AND coalesce(wpgc.status, wdc.gb_status, wdc.status) = 'ON'</if> " +
-            " <if test='online == false'> AND coalesce(wpgc.status, wdc.gb_status, wdc.status) = 'OFF'</if> " +
+            " <if test='online == true'> AND coalesce(wpgc.custom_status, wdc.gb_status, wdc.status) = 'ON'</if> " +
+            " <if test='online == false'> AND coalesce(wpgc.custom_status, wdc.gb_status, wdc.status) = 'OFF'</if> " +
             " <if test='hasShare == true'> AND wpgc.platform_id = #{platformId}</if> " +
             " <if test='hasShare == false'> AND wpgc.platform_id is null</if> " +
             " <if test='dataType != null'> AND wdc.data_type = #{dataType}</if> " +
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/SendRtpServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/SendRtpServerServiceImpl.java
index 88f1df2e1..053ff9e69 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/SendRtpServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/SendRtpServerServiceImpl.java
@@ -28,7 +28,7 @@ public class SendRtpServerServiceImpl implements ISendRtpServerService {
 
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
-    
+
 
     @Override
     public SendRtpInfo createSendRtpInfo(MediaServer mediaServer, String ip, Integer port, String ssrc, String requesterId,
@@ -230,31 +230,27 @@ public class SendRtpServerServiceImpl implements ISendRtpServerService {
             log.warn("{}获取redis连接信息失败", mediaServer.getId());
             return -1;
         }
-        return getSendPort(startPort, endPort, sendIndexKey, sendRtpSet);
-    }
-
-    private synchronized int getSendPort(int startPort, int endPort, String sendIndexKey, Set<Integer> sendRtpPortSet){
-        // TODO 这里改为只取偶数端口
         RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
         if (redisAtomicInteger.get() < startPort) {
             redisAtomicInteger.set(startPort);
             return startPort;
         }else {
-            int port = redisAtomicInteger.getAndIncrement();
-            if (port > endPort) {
-                redisAtomicInteger.set(startPort);
-                if (sendRtpPortSet.contains(startPort)) {
-                    return getSendPort(startPort, endPort, sendIndexKey, sendRtpPortSet);
-                }else {
-                    return startPort;
+            for (int i = 0; i < endPort - startPort; i++) {
+                int port = redisAtomicInteger.getAndIncrement();
+                if (port > endPort) {
+                    redisAtomicInteger.set(startPort);
+                    if (sendRtpSet.contains(startPort)) {
+                        continue;
+                    }else {
+                        return startPort;
+                    }
+                }
+                if (!sendRtpSet.contains(port)) {
+                    return port;
                 }
             }
-            if (sendRtpPortSet.contains(port)) {
-                return getSendPort(startPort, endPort, sendIndexKey, sendRtpPortSet);
-            }else {
-                return port;
-            }
         }
+        log.warn("{}获取发送端口失败, 无可用端口", mediaServer.getId());
+        return -1;
     }
-
 }

From f4bbca78e5d42d09e76990eabf870eb0fa6706ae Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 3 Jun 2025 16:52:42 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/bean/Device.java          |  3 -
 .../vmp/gb28181/controller/DeviceQuery.java   |  7 +-
 .../gb28181/dao/CommonGBChannelMapper.java    |  4 ++
 .../iot/vmp/gb28181/dao/DeviceMapper.java     | 11 +--
 .../gb28181/dao/provider/ChannelProvider.java |  9 ++-
 .../iot/vmp/gb28181/event/EventPublisher.java |  5 +-
 .../subscribe/catalog/CatalogEventLister.java |  2 +-
 .../impl/DeviceChannelServiceImpl.java        |  7 +-
 .../service/impl/DeviceServiceImpl.java       | 72 ++++++++++++++-----
 .../task/deviceStatus/DeviceStatusTask.java   |  2 +-
 .../deviceStatus/DeviceStatusTaskRunner.java  |  2 +-
 .../cmd/SIPRequestHeaderProvider.java         |  2 +-
 .../impl/SubscribeRequestProcessor.java       |  3 +-
 .../control/RedisRpcDeviceController.java     |  5 ++
 .../control/RedisRpcPlatformController.java   |  2 +-
 src/main/resources/application.yml            |  2 +-
 数据库/2.7.4/初始化-mysql-2.7.4.sql           |  1 -
 .../2.7.4/初始化-postgresql-kingbase-2.7.4.sql |  1 -
 18 files changed, 93 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 23f754c77..5a5cc0c77 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -212,7 +212,4 @@ public class Device {
 
 	@Schema(description = "所属服务Id")
 	private String serverId;
-
-	@Schema(description = "所属服务Id")
-	private Integer deviceType;
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
index 5d5a02beb..9f4cebf3d 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
@@ -123,7 +123,12 @@ public class DeviceQuery {
 			log.debug("设备通道信息同步API调用，deviceId：" + deviceId);
 		}
 		Device device = deviceService.getDeviceByDeviceId(deviceId);
-
+		if (device.getRegisterTime() == null) {
+			WVPResult<SyncStatus> wvpResult = new WVPResult<>();
+			wvpResult.setCode(ErrorCode.ERROR100.getCode());
+			wvpResult.setMsg("设备尚未注册过");
+			return wvpResult;
+		}
 		return deviceService.devicesSync(device);
 
 	}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
index efa826c36..33d58ced7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
@@ -578,4 +578,8 @@ public interface CommonGBChannelMapper {
             " <foreach collection='channelIdsForClear'  item='item'  open='(' separator=',' close=')' > #{item}</foreach>" +
             " </script>"})
     void removeParentIdByChannelIds(List<Integer> channelIdsForClear);
+
+
+    @SelectProvider(type = ChannelProvider.class, method = "queryOnlineListsByGbDeviceId")
+    List<CommonGBChannel> queryOnlineListsByGbDeviceId(@Param("deviceId") int deviceId);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
index 6c97e9365..81ab26f3a 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
@@ -46,7 +46,6 @@ public interface DeviceMapper {
             "server_id,"+
             "media_server_id," +
             "broadcast_push_after_ack," +
-            "device_type," +
             "(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = 1 and dc.data_device_id= de.id) as channel_count "+
             " FROM wvp_device de WHERE de.device_id = #{deviceId}")
     Device getDeviceByDeviceId( @Param("deviceId") String deviceId);
@@ -81,7 +80,6 @@ public interface DeviceMapper {
                 "ssrc_check,"+
                 "as_message_channel,"+
                 "broadcast_push_after_ack,"+
-                "device_type,"+
                 "geo_coord_sys,"+
                 "server_id,"+
                 "on_line"+
@@ -115,7 +113,6 @@ public interface DeviceMapper {
                 "#{ssrcCheck}," +
                 "#{asMessageChannel}," +
                 "#{broadcastPushAfterAck}," +
-                "#{deviceType}," +
                 "#{geoCoordSys}," +
                 "#{serverId}," +
                 "#{onLine}" +
@@ -181,7 +178,6 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
-            "device_type,"+
             "geo_coord_sys,"+
             "on_line,"+
             "media_server_id,"+
@@ -224,7 +220,6 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
-            "device_type,"+
             "geo_coord_sys,"+
             "server_id,"+
             "on_line"+
@@ -259,7 +254,6 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
-            "device_type,"+
             "geo_coord_sys,"+
             "server_id,"+
             "on_line"+
@@ -294,7 +288,6 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
-            "device_type,"+
             "geo_coord_sys,"+
             "on_line"+
             " FROM wvp_device WHERE ip = #{host} AND port=#{port}")
@@ -305,7 +298,7 @@ public interface DeviceMapper {
             "SET update_time=#{updateTime}, custom_name=#{name} , password=#{password}, stream_mode=#{streamMode}" +
             ", ip=#{ip}, sdp_ip=#{sdpIp}, port=#{port}, charset=#{charset}" +
             ", ssrc_check=#{ssrcCheck}, as_message_channel=#{asMessageChannel}" +
-            ", broadcast_push_after_ack=#{broadcastPushAfterAck}, device_type=#{deviceType}, geo_coord_sys=#{geoCoordSys}, media_server_id=#{mediaServerId}" +
+            ", broadcast_push_after_ack=#{broadcastPushAfterAck}, geo_coord_sys=#{geoCoordSys}, media_server_id=#{mediaServerId}" +
             " WHERE id=#{id}"+
             " </script>"})
     void updateCustom(Device device);
@@ -321,7 +314,6 @@ public interface DeviceMapper {
             "ssrc_check,"+
             "as_message_channel,"+
             "broadcast_push_after_ack,"+
-            "device_type,"+
             "geo_coord_sys,"+
             "on_line,"+
             "stream_mode," +
@@ -338,7 +330,6 @@ public interface DeviceMapper {
             "#{ssrcCheck}," +
             "#{asMessageChannel}," +
             "#{broadcastPushAfterAck}," +
-            "#{deviceType}," +
             "#{geoCoordSys}," +
             "#{onLine}," +
             "#{streamMode}," +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
index 0941cf2dc..6259ee978 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
@@ -97,7 +97,7 @@ public class ChannelProvider {
             "    coalesce(wdc.gb_svc_time_support_mode,  wdc.svc_time_support_mode) as gb_svc_time_support_mode\n" +
             " from wvp_device_channel wdc\n"
             ;
-    
+
     private final static String BASE_SQL_FOR_PLATFORM =
             "select\n" +
             "    wdc.id as gb_id,\n" +
@@ -455,6 +455,13 @@ public class ChannelProvider {
         return sqlBuild.toString();
     }
 
+    public String queryOnlineListsByGbDeviceId(Map<String, Object> params ){
+        StringBuilder sqlBuild = new StringBuilder();
+        sqlBuild.append(BASE_SQL_TABLE_NAME);
+        sqlBuild.append(" where wdc.channel_type = 0 AND coalesce(wdc.gb_status, wdc.status) = 'ON' AND wdc.data_type = 1 AND data_device_id = #{deviceId}");
+        return sqlBuild.toString();
+    }
+
     public String queryAllForUnusualCivilCode(Map<String, Object> params ){
         StringBuilder sqlBuild = new StringBuilder();
         sqlBuild.append("select wdc.id from wvp_device_channel wdc ");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
index 018abc5c6..563b050d1 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
@@ -68,11 +68,7 @@ public class EventPublisher {
 		deviceChannelList.add(deviceChannel);
 		catalogEventPublish(platform, deviceChannelList, type);
 	}
-
 	public void catalogEventPublish(Platform platform, List<CommonGBChannel> deviceChannels, String type) {
-		catalogEventPublish(platform, deviceChannels, type, true);
-	}
-	public void catalogEventPublish(Platform platform, List<CommonGBChannel> deviceChannels, String type, boolean share) {
 		if (platform != null && !userSetting.getServerId().equals(platform.getServerId())) {
 			log.info("[国标级联] 目录状态推送， 此上级平台由其他服务处理，消息已经忽略");
 			return;
@@ -91,6 +87,7 @@ public class EventPublisher {
 		}else {
 			channels = deviceChannels;
 		}
+		System.out.println(5);
 		outEvent.setChannels(channels);
 		outEvent.setType(type);
 		if (platform != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
index 69b55445c..a777f07ac 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
@@ -47,7 +47,7 @@ public class CatalogEventLister implements ApplicationListener<CatalogEvent> {
     public void onApplicationEvent(CatalogEvent event) {
         SubscribeInfo subscribe = null;
         Platform parentPlatform = null;
-        log.info("[Catalog事件: {}] 通道数量： {}", event.getType(), event.getChannels().size());
+        log.info("[Catalog事件: {}]通道数量： {}", event.getType(), event.getChannels().size());
         Map<String, List<Platform>> platformMap = new HashMap<>();
         Map<String, CommonGBChannel> channelMap = new HashMap<>();
         if (event.getPlatform() != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
index 613e54901..ae98079a2 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
@@ -224,7 +224,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
 
     @Override
     public List<Device> getDeviceByChannelId(String channelId) {
-
         return channelMapper.getDeviceByChannelDeviceId(channelId);
     }
 
@@ -571,13 +570,17 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
         for (DeviceChannel deviceChannel : deviceChannelList) {
             DeviceChannel channelInDb = allChannelMap.get(deviceChannel.getDataDeviceId() + deviceChannel.getDeviceId());
             if (channelInDb != null) {
+                System.out.println(1);
                 deviceChannel.setStreamId(channelInDb.getStreamId());
                 deviceChannel.setHasAudio(channelInDb.isHasAudio());
                 deviceChannel.setId(channelInDb.getId());
-                if (channelInDb.getStatus() != null && channelInDb.getStatus().equalsIgnoreCase(deviceChannel.getStatus())){
+                if (channelInDb.getStatus() != null && !channelInDb.getStatus().equalsIgnoreCase(deviceChannel.getStatus())){
+                    System.out.println(2);
                     List<Platform> platformList = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getDeviceId());
                     if (!CollectionUtils.isEmpty(platformList)){
+                        System.out.println(3);
                         platformList.forEach(platform->{
+                            System.out.println(4);
                             eventPublisher.catalogEventPublish(platform, deviceChannel.buildCommonGBChannelForStatus(), deviceChannel.getStatus().equals("ON")? CatalogEvent.ON:CatalogEvent.OFF);
                         });
                     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
index 5c7753967..6d0082f93 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
@@ -3,13 +3,15 @@ package com.genersoft.iot.vmp.gb28181.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.common.CommonCallback;
 import com.genersoft.iot.vmp.common.enums.ChannelDataType;
-import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.gb28181.dao.CommonGBChannelMapper;
 import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper;
 import com.genersoft.iot.vmp.gb28181.dao.DeviceMapper;
 import com.genersoft.iot.vmp.gb28181.dao.PlatformChannelMapper;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
 import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
 import com.genersoft.iot.vmp.gb28181.service.IInviteStreamService;
 import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;
@@ -64,9 +66,6 @@ import java.util.concurrent.TimeUnit;
 @Order(value=16)
 public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
 
-    @Autowired
-    private DynamicTask dynamicTask;
-
     @Autowired
     private ISIPCommander sipCommander;
 
@@ -88,6 +87,12 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
     @Autowired
     private DeviceChannelMapper deviceChannelMapper;
 
+    @Autowired
+    private CommonGBChannelMapper commonGBChannelMapper;
+
+    @Autowired
+    private EventPublisher eventPublisher;
+
     @Autowired
     private ISendRtpServerService sendRtpServerService;
 
@@ -156,7 +161,7 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
                 }
                 // 恢复定时任务, TCP因为连接已经断开必须等待设备重新连接
                 DeviceStatusTask deviceStatusTask = DeviceStatusTask.getInstance(taskInfo.getDeviceId(),
-                        taskInfo.getTransactionInfo(), taskInfo.getExpireTime(), this::deviceStatusExpire);
+                        taskInfo.getTransactionInfo(), taskInfo.getExpireTime() + 1000 + System.currentTimeMillis(), this::deviceStatusExpire);
                 deviceStatusTaskRunner.addTask(deviceStatusTask);
                 onlineDeviceIds.add(taskInfo.getDeviceId());
             }
@@ -238,8 +243,6 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
         if (subscribeTaskRunner.containsKey(SubscribeTaskForMobilPosition.getKey(device))) {
             subscribeTaskRunner.removeSubscribe(SubscribeTaskForMobilPosition.getKey(device));
         }
-        //进行通道离线
-//        deviceChannelMapper.offlineByDeviceId(deviceId);
         // 离线释放所有ssrc
         List<SsrcTransaction> ssrcTransactions = sessionManager.getSsrcTransactionByDeviceId(device.getDeviceId());
         if (ssrcTransactions != null && !ssrcTransactions.isEmpty()) {
@@ -308,7 +311,9 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
             device.setCreateTime(now);
             device.setUpdateTime(now);
             log.info("[设备上线,首次注册]: {}，查询设备信息以及通道信息", device.getDeviceId());
-            addCustomDevice(device);
+            if(device.getStreamMode() == null) {
+                device.setStreamMode("TCP-PASSIVE");
+            }
             deviceMapper.add(device);
             redisCatchStorage.updateDevice(device);
             try {
@@ -334,7 +339,7 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
                     }
                     sync(device);
                 }else {
-                    if (!isPlatform(device.getDeviceId())) {
+                    if (isDevice(device.getDeviceId())) {
                         sync(device);
                     }
                 }
@@ -364,14 +369,14 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
         long expiresTime = Math.min(device.getExpires(), device.getHeartBeatInterval() * device.getHeartBeatCount()) * 1000L;
         if (deviceStatusTaskRunner.containsKey(device.getDeviceId())) {
             if (sipTransactionInfo == null) {
-                deviceStatusTaskRunner.updateDelay(device.getDeviceId(), System.currentTimeMillis() + expiresTime);
+                deviceStatusTaskRunner.updateDelay(device.getDeviceId(), expiresTime + System.currentTimeMillis());
             }else {
                 deviceStatusTaskRunner.removeTask(device.getDeviceId());
-                DeviceStatusTask task = DeviceStatusTask.getInstance(device.getDeviceId(), sipTransactionInfo, expiresTime, this::deviceStatusExpire);
+                DeviceStatusTask task = DeviceStatusTask.getInstance(device.getDeviceId(), sipTransactionInfo, expiresTime + System.currentTimeMillis(), this::deviceStatusExpire);
                 deviceStatusTaskRunner.addTask(task);
             }
         }else {
-            DeviceStatusTask task = DeviceStatusTask.getInstance(device.getDeviceId(), sipTransactionInfo, expiresTime, this::deviceStatusExpire);
+            DeviceStatusTask task = DeviceStatusTask.getInstance(device.getDeviceId(), sipTransactionInfo, expiresTime + System.currentTimeMillis(), this::deviceStatusExpire);
             deviceStatusTaskRunner.addTask(task);
         }
 
@@ -401,13 +406,27 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
         cleanOfflineDevice(device);
         redisCatchStorage.updateDevice(device);
         deviceMapper.update(device);
-        if (!isPlatform(deviceId)) {
-            // 进行通道离线
-            deviceChannelMapper.offlineByDeviceId(device.getId());
+        if (userSetting.getDeviceStatusNotify()) {
+            // 发送redis消息
+            redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
+        }
+        if (isDevice(deviceId)) {
+            channelOfflineByDevice(device);
         }
     }
 
-    private boolean isPlatform(String deviceId) {
+    private void channelOfflineByDevice(Device device) {
+        // 进行通道离线
+        List<CommonGBChannel> channelList = commonGBChannelMapper.queryOnlineListsByGbDeviceId(device.getId());
+        if (channelList.isEmpty()) {
+            return;
+        }
+        deviceChannelMapper.offlineByDeviceId(device.getId());
+        // 发送通道离线通知
+        eventPublisher.catalogEventPublish(null, channelList, CatalogEvent.OFF);
+    }
+
+    private boolean isDevice(String deviceId) {
         GbCode decode = GbCode.decode(deviceId);
         if (decode == null) {
             return true;
@@ -418,7 +437,7 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
 
     // 订阅丢失检查
     @Scheduled(fixedDelay = 10, timeUnit = TimeUnit.SECONDS)
-    public void lostCheck(){
+    public void lostCheckForSubscribe(){
         // 获取所有设备
         List<Device> deviceList = redisCatchStorage.getAllDevices();
         if (deviceList.isEmpty()) {
@@ -439,6 +458,25 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
         }
     }
 
+    // 设备状态丢失检查
+    @Scheduled(fixedDelay = 30, timeUnit = TimeUnit.SECONDS)
+    public void lostCheckForStatus(){
+        // 获取所有设备
+        List<Device> deviceList = redisCatchStorage.getAllDevices();
+        if (deviceList.isEmpty()) {
+            return;
+        }
+        for (Device device : deviceList) {
+            if (device == null || !device.isOnLine() || !userSetting.getServerId().equals(device.getServerId())) {
+                continue;
+            }
+            if (!deviceStatusTaskRunner.containsKey(device.getDeviceId())) {
+                log.debug("[状态丢失] 执行设备离线， 编号： {},", device.getDeviceId());
+                offline(device.getDeviceId(), "");
+            }
+        }
+    }
+
     private void catalogSubscribeExpire(String deviceId, SipTransactionInfo transactionInfo) {
         log.info("[目录订阅] 到期， 编号： {}", deviceId);
         Device device = getDeviceByDeviceId(deviceId);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTask.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTask.java
index 0844cbe5d..0e754358b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTask.java
@@ -28,7 +28,7 @@ public class DeviceStatusTask implements Delayed {
         DeviceStatusTask deviceStatusTask = new DeviceStatusTask();
         deviceStatusTask.setDeviceId(deviceId);
         deviceStatusTask.setTransactionInfo(transactionInfo);
-        deviceStatusTask.setDelayTime((delayTime * 1000L - 500L) + System.currentTimeMillis());
+        deviceStatusTask.setDelayTime(delayTime);
         deviceStatusTask.setCallback(callback);
         return deviceStatusTask;
     }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java
index a179879a2..6b90d1feb 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java
@@ -93,7 +93,7 @@ public class DeviceStatusTaskRunner {
         if (task == null) {
             return false;
         }
-        log.info("[更新状态任务时间] 编号： {}", key);
+        log.debug("[更新状态任务时间] 编号： {}", key);
         if (delayQueue.contains(task)) {
             boolean remove = delayQueue.remove(task);
             if (!remove) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
index 4320c212f..937d1554d 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
@@ -49,7 +49,7 @@ public class SIPRequestHeaderProvider {
 		// sipuri
 		SipURI requestURI = SipFactory.getInstance().createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
 		// via
-		ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
+		ArrayList<ViaHeader> viaHeaders = new ArrayList<>();
 		ViaHeader viaHeader = SipFactory.getInstance().createHeaderFactory().createViaHeader(sipLayer.getLocalIp(device.getLocalIp()), sipConfig.getPort(), device.getTransport(), viaTag);
 		viaHeader.setRPort();
 		viaHeaders.add(viaHeader);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index e2793d5f2..6504dd428 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -69,8 +69,9 @@ public class SubscribeRequestProcessor extends SIPRequestProcessorParent impleme
 				responseAck(request, Response.BAD_REQUEST);
 				return;
 			}
+			String platformId = SipUtils.getUserIdFromFromHeader(request);
 			String cmd = XmlUtil.getText(rootElement, "CmdType");
-			log.info("[收到订阅请求] 类型： {}", cmd);
+			log.info("[收到订阅请求] 类型： {}, 来自： {}", cmd, platformId);
 			if (CmdType.MOBILE_POSITION.equals(cmd)) {
 				processNotifyMobilePosition(request, rootElement);
 //			} else if (CmdType.ALARM.equals(cmd)) {
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcDeviceController.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcDeviceController.java
index a6d727e1f..ee6eec485 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcDeviceController.java
@@ -62,6 +62,11 @@ public class RedisRpcDeviceController extends RpcController {
             response.setBody("param error");
             return response;
         }
+        if (device.getRegisterTime() == null) {
+            response.setStatusCode(ErrorCode.ERROR400.getCode());
+            response.setBody("设备尚未注册过");
+            return response;
+        }
         WVPResult<SyncStatus> result = deviceService.devicesSync(device);
         response.setStatusCode(ErrorCode.SUCCESS.getCode());
         response.setBody(JSONObject.toJSONString(result));
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java
index cf037934d..a11561e82 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcPlatformController.java
@@ -74,7 +74,7 @@ public class RedisRpcPlatformController extends RpcController {
 
         List<CommonGBChannel> channels = jsonObject.getJSONArray("channels").toJavaList(CommonGBChannel.class);
         String type = jsonObject.getString("type");
-        eventPublisher.catalogEventPublish(platform, channels, type, false);
+        eventPublisher.catalogEventPublish(platform, channels, type);
         RedisRpcResponse response = request.getResponse();
         response.setStatusCode(ErrorCode.SUCCESS.getCode());
         return response;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 98f1ff2e0..67213e8a3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: 274
+    active: 274-dev
diff --git a/数据库/2.7.4/初始化-mysql-2.7.4.sql b/数据库/2.7.4/初始化-mysql-2.7.4.sql
index f94200245..3d25e5927 100644
--- a/数据库/2.7.4/初始化-mysql-2.7.4.sql
+++ b/数据库/2.7.4/初始化-mysql-2.7.4.sql
@@ -37,7 +37,6 @@ create table IF NOT EXISTS wvp_device
     position_capability                 integer,
     broadcast_push_after_ack            bool    default false,
     server_id                           character varying(50),
-    device_type                         integer default 200,
     constraint uk_device_device unique (device_id)
 );
 
diff --git a/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql b/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
index 8de1db4bf..524fdbeff 100644
--- a/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
+++ b/数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
@@ -37,7 +37,6 @@ create table IF NOT EXISTS wvp_device
     position_capability                 integer,
     broadcast_push_after_ack            bool    default false,
     server_id                           character varying(50),
-    device_type                         integer,
     constraint uk_device_device unique (device_id)
 );
 

From e3f880627e9737b90178b38c4e2d8acec9bb18dd Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 3 Jun 2025 16:53:36 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 数据库/2.7.4/更新-mysql-2.7.4.sql              | 18 ------------------
 .../2.7.4/更新-postgresql-kingbase-2.7.4.sql   |  5 -----
 2 files changed, 23 deletions(-)

diff --git a/数据库/2.7.4/更新-mysql-2.7.4.sql b/数据库/2.7.4/更新-mysql-2.7.4.sql
index 526a40408..e69de29bb 100644
--- a/数据库/2.7.4/更新-mysql-2.7.4.sql
+++ b/数据库/2.7.4/更新-mysql-2.7.4.sql
@@ -1,18 +0,0 @@
-/*
-* 20250519
-*/
-DELIMITER //  -- 重定义分隔符避免分号冲突
-CREATE PROCEDURE `wvp_20250519`()
-BEGIN
-    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
-                   WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device' and column_name = 'device_type')
-    THEN
-        ALTER TABLE wvp_device ADD device_type  integer;
-    END IF;
-END; //
-call wvp_20250519();
-DROP PROCEDURE wvp_20250519;
-DELIMITER ;
-
-
-
diff --git a/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql b/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql
index 37ce08893..e69de29bb 100644
--- a/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql
+++ b/数据库/2.7.4/更新-postgresql-kingbase-2.7.4.sql
@@ -1,5 +0,0 @@
-/*
-* 20250519
-*/
- ALTER TABLE wvp_device ADD COLUMN IF NOT EXISTS device_type  integer;
-

From 227239f7f77799443b03d875cbac09122466e64c Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 3 Jun 2025 17:17:04 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/gb28181/event/EventPublisher.java   | 1 -
 .../vmp/gb28181/service/impl/DeviceChannelServiceImpl.java    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
index 563b050d1..5574ecbc1 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
@@ -87,7 +87,6 @@ public class EventPublisher {
 		}else {
 			channels = deviceChannels;
 		}
-		System.out.println(5);
 		outEvent.setChannels(channels);
 		outEvent.setType(type);
 		if (platform != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
index ae98079a2..7cecf7826 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
@@ -570,17 +570,13 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
         for (DeviceChannel deviceChannel : deviceChannelList) {
             DeviceChannel channelInDb = allChannelMap.get(deviceChannel.getDataDeviceId() + deviceChannel.getDeviceId());
             if (channelInDb != null) {
-                System.out.println(1);
                 deviceChannel.setStreamId(channelInDb.getStreamId());
                 deviceChannel.setHasAudio(channelInDb.isHasAudio());
                 deviceChannel.setId(channelInDb.getId());
                 if (channelInDb.getStatus() != null && !channelInDb.getStatus().equalsIgnoreCase(deviceChannel.getStatus())){
-                    System.out.println(2);
                     List<Platform> platformList = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getDeviceId());
                     if (!CollectionUtils.isEmpty(platformList)){
-                        System.out.println(3);
                         platformList.forEach(platform->{
-                            System.out.println(4);
                             eventPublisher.catalogEventPublish(platform, deviceChannel.buildCommonGBChannelForStatus(), deviceChannel.getStatus().equals("ON")? CatalogEvent.ON:CatalogEvent.OFF);
                         });
                     }