Merge branch 'master' into 重构/1078

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()) {
+            if (sendRtpItem.isTcpActive() || !device.isBroadcastPushAfterAck()) {
-                log.info("[语音喊话] 回复200OK后发现 BroadcastPushAfterAck为False，现在开始推流");
+                if (sendRtpItem.isTcpActive()) {
+                    log.info("[语音喊话] 监听端口等待设备连接后推流");
+                }else {
+                    log.info("[语音喊话] 回复200OK后发现 BroadcastPushAfterAck为False，现在开始推流");
+                }
+
                 playService.startPushStream(sendRtpItem, channel, sipResponse, parentPlatform, request.getCallIdHeader());
             }
 

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -103,7 +103,9 @@ public class ZLMHttpHookListener {
         String mediaServerId = json.getString("mediaServerId");
         MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
         if (mediaServer == null) {
-            return new HookResultForOnPublish(0, "success");
+            HookResultForOnPublish fail = HookResultForOnPublish.Fail();
+            log.warn("[ZLM HOOK]推流鉴权 响应：{}->找不到对应的mediaServer", param.getMediaServerId());
+            return fail;
         }
 
         ResultForOnPublish resultForOnPublish = mediaService.authenticatePublish(mediaServer, param.getApp(), param.getStream(), param.getParams());

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

web_src/src/components/channelList.vue

@@ -355,9 +355,11 @@ export default {
     startRecord: function (itemData) {
       this.$axios({
         method: 'get',
-        url: `/api/device/control/record/${this.deviceId}/Record`,
+        url: `/api/device/control/record`,
         params: {
-          channelId: itemData.deviceId
+          deviceId: this.deviceId,
+          channelId: itemData.deviceId,
+          recordCmdStr: "Record"
         }
       }).then( (res)=> {
         if (res.data.code === 0) {
@@ -381,9 +383,11 @@ export default {
     stopRecord: function (itemData) {
       this.$axios({
         method: 'get',
-        url: `/api/device/control/record/${this.deviceId}/StopRecord`,
+        url: `/api/device/control/record`,
         params: {
-          channelId: itemData.deviceId
+          deviceId: this.deviceId,
+          channelId: itemData.deviceId,
+          recordCmdStr: "StopRecord"
         }
       }).then( (res)=> {
         if (res.data.code === 0) {

数据库/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);
+