Pre Merge pull request !36 from 阿斌/N/A

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -628,8 +628,13 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                     request.getCallIdHeader().getCallId(), sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getSsrc(), sendRtpItem.getMediaServerId(), sipResponse, InviteSessionType.BROADCAST);
             sessionManager.put(ssrcTransaction);
             // 开启发流，大华在收到200OK后就会开始建立连接
-            if (!device.isBroadcastPushAfterAck()) {
-                log.info("[语音喊话] 回复200OK后发现 BroadcastPushAfterAck为False，现在开始推流");
+            if (sendRtpItem.isTcpActive() || !device.isBroadcastPushAfterAck()) {
+                if (sendRtpItem.isTcpActive()) {
+                    log.info("[语音喊话] 监听端口等待设备连接后推流");
+                }else {
+                    log.info("[语音喊话] 回复200OK后发现 BroadcastPushAfterAck为False，现在开始推流");
+                }
+
                 playService.startPushStream(sendRtpItem, channel, sipResponse, parentPlatform, request.getCallIdHeader());
             }
 

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

web_src/src/components/DeviceList.vue

@@ -167,7 +167,7 @@ export default {
   },
   mounted() {
     this.initData();
-    this.updateLooper = setInterval(this.initData, 10000);
+    this.updateLooper = setInterval(this.getDeviceList, 10000);
   },
   destroyed() {
     this.$destroy('videojs');

数据库/2.7.3/初始化-mysql-2.7.3.sql

@@ -159,6 +159,8 @@ create table IF NOT EXISTS wvp_device_channel
     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)
 );
 

数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql

@@ -159,6 +159,8 @@ create table IF NOT EXISTS wvp_device_channel
     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)
 );
 

数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql

@@ -171,6 +171,8 @@ create table IF NOT EXISTS wvp_device_channel
     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)
 );
 

数据库/2.7.3/更新-mysql-2.7.3.sql

@@ -267,5 +267,27 @@ call wvp_20250319();
 DROP PROCEDURE wvp_20250319;
 DELIMITER ;
 
+/*
+* 20250402
+*/
+DELIMITER //  -- 重定义分隔符避免分号冲突
+CREATE PROCEDURE `wvp_20250402`()
+BEGIN
+    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
+                   WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and INDEX_NAME = 'data_type')
+    THEN
+        create index data_type on wvp_device_channel (data_type);
+    END IF;
+    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
+                   WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and INDEX_NAME = 'data_device_id')
+    THEN
+        create index data_device_id on wvp_device_channel (data_device_id);
+    END IF;
+
+END; //
+call wvp_20250402();
+DROP PROCEDURE wvp_20250402;
+DELIMITER ;
+
 
 

数据库/2.7.3/更新-postgresql-kingbase-2.7.1升级到2.7.3.sql

@@ -137,6 +137,8 @@ create table IF NOT EXISTS wvp_device_channel
     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)
 );
 

数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql

@@ -102,4 +102,10 @@ alter table wvp_device_channel add column if not exists gps_speed double precisi
 alter table wvp_device_channel add column if not exists gps_altitude double precision;
 alter table wvp_device_channel add column if not exists gps_direction double precision;
 
+/*
+* 20250402
+*/
+create index if not exists data_type on wvp_device_channel (data_type);
+create index if not exists data_device_id on wvp_device_channel (data_device_id);
+