Browse Source

规范数据库,添加必要约束,优化通道批量导入功能

pull/352/head
648540858 3 years ago
parent
commit
a42dda2bd3
  1. 8
      pom.xml
  2. 38
      sql/mysql.sql
  3. 11
      src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java
  4. 6
      src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java
  5. 12
      src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
  6. 3
      src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
  7. 2
      src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
  8. 69
      src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
  9. 117
      src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
  10. 15
      src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
  11. 24
      src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
  12. 25
      src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  13. 2
      src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

8
pom.xml

@ -231,6 +231,14 @@
<!-- <version>1.0.8</version>--> <!-- <version>1.0.8</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>

38
sql/mysql.sql

@ -53,7 +53,6 @@ CREATE TABLE `device` (
LOCK TABLES `device` WRITE; LOCK TABLES `device` WRITE;
/*!40000 ALTER TABLE `device` DISABLE KEYS */; /*!40000 ALTER TABLE `device` DISABLE KEYS */;
INSERT INTO `device` VALUES (1,'34020000002000000005','DH-NVR5864-I','Dahua','DH-NVR5864-I','4.001.0000000.3,2020-10-22','UDP','UDP','1','2022-02-22 11:05:10','2022-02-22 11:42:10','192.168.1.19','2022-02-22 10:17:24','2022-02-22 11:42:10',5060,3600,0,'192.168.1.19:5060','gb2312');
/*!40000 ALTER TABLE `device` ENABLE KEYS */; /*!40000 ALTER TABLE `device` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -126,7 +125,8 @@ CREATE TABLE `device_channel` (
`createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`subCount` int DEFAULT '0', `subCount` int DEFAULT '0',
PRIMARY KEY (`channelId`,`deviceId`) USING BTREE PRIMARY KEY (`channelId`,`deviceId`) USING BTREE,
UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
@ -136,7 +136,6 @@ CREATE TABLE `device_channel` (
LOCK TABLES `device_channel` WRITE; LOCK TABLES `device_channel` WRITE;
/*!40000 ALTER TABLE `device_channel` DISABLE KEYS */; /*!40000 ALTER TABLE `device_channel` DISABLE KEYS */;
INSERT INTO `device_channel` VALUES ('34020000001310000001','通道1','Dahua','DH-NVR5864-I','0','340200','','axy','34020000002000000005',0,1,'',0,0,NULL,'0','192.168.1.17',37777,'',0,1,0,0,NULL,'34020000002000000005','0',NULL,'','',0),('34020000001310000065','GB_Chn_065','Dahua','DH-NVR5864-I','0','340200','','axy','34020000002000000005',0,1,'',0,0,NULL,'0','',0,'',0,1,0,0,NULL,'34020000002000000005','0',NULL,'','',0);
/*!40000 ALTER TABLE `device_channel` ENABLE KEYS */; /*!40000 ALTER TABLE `device_channel` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -183,7 +182,7 @@ DROP TABLE IF EXISTS `gb_stream`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!50503 SET character_set_client = utf8mb4 */; /*!50503 SET character_set_client = utf8mb4 */;
CREATE TABLE `gb_stream` ( CREATE TABLE `gb_stream` (
`id` int NOT NULL AUTO_INCREMENT, `gbStreamId` int NOT NULL AUTO_INCREMENT,
`app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@ -194,10 +193,10 @@ CREATE TABLE `gb_stream` (
`mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`status` int DEFAULT NULL, `status` int DEFAULT NULL,
`createStamp` bigint DEFAULT NULL, `createStamp` bigint DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`gbStreamId`) USING BTREE,
UNIQUE KEY `app` (`app`,`stream`) USING BTREE, UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
UNIQUE KEY `gbId` (`gbId`) USING BTREE UNIQUE KEY `gbId` (`gbId`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; ) ENGINE=InnoDB AUTO_INCREMENT=291 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -206,7 +205,6 @@ CREATE TABLE `gb_stream` (
LOCK TABLES `gb_stream` WRITE; LOCK TABLES `gb_stream` WRITE;
/*!40000 ALTER TABLE `gb_stream` DISABLE KEYS */; /*!40000 ALTER TABLE `gb_stream` DISABLE KEYS */;
INSERT INTO `gb_stream` VALUES (74,'1000','10000000_000','34020000002000000001','测试1',0,0,'push','FQ3TF8yT83wh5Wvz',0,1645500864142),(75,'1000','10000001_000','34020000012000000002','测试2',0,0,'push','FQ3TF8yT83wh5Wvz',0,1645500864142),(76,'1000','10000002_000','34020000022000000003','测试3',0,0,'push','FQ3TF8yT83wh5Wvz',0,1645500864142);
/*!40000 ALTER TABLE `gb_stream` ENABLE KEYS */; /*!40000 ALTER TABLE `gb_stream` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -228,7 +226,7 @@ CREATE TABLE `log` (
`username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=206 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; ) ENGINE=InnoDB AUTO_INCREMENT=245 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -237,7 +235,6 @@ CREATE TABLE `log` (
LOCK TABLES `log` WRITE; LOCK TABLES `log` WRITE;
/*!40000 ALTER TABLE `log` DISABLE KEYS */; /*!40000 ALTER TABLE `log` DISABLE KEYS */;
INSERT INTO `log` VALUES (163,'登录','GET','/api/user/login','127.0.0.1','200 OK',243,'admin','2022-02-22 10:18:15'),(164,'开始点播','GET','/api/play/start/34020000002000000005/34020000001310000001','127.0.0.1','200 OK',77,'admin','2022-02-22 10:18:35'),(165,'[设备查询] 同步设备通道','POST','/api/device/query/devices/34020000002000000005/sync','127.0.0.1','200 OK',10,'admin','2022-02-22 10:18:47'),(166,'开始点播','GET','/api/play/start/34020000002000000005/34020000001310000065','127.0.0.1','200 OK',19,'admin','2022-02-22 10:18:50'),(167,'停止点播','GET','/api/play/stop/34020000002000000005/34020000001310000065','127.0.0.1','200 OK',159,'admin','2022-02-22 10:19:08'),(168,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',305,'admin','2022-02-22 10:22:02'),(169,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',142,'admin','2022-02-22 10:22:28'),(170,'添加上级平台','POST','/api/platform/save','127.0.0.1','200 OK',11,'admin','2022-02-22 10:22:57'),(171,'登录','GET','/api/user/login','127.0.0.1','200 OK',255,'admin','2022-02-22 10:26:31'),(172,'移除代理','DELETE','/api/proxy/del','127.0.0.1','200 OK',40,'admin','2022-02-22 10:26:44'),(173,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',139,'admin','2022-02-22 10:26:51'),(174,'登录','GET','/api/user/login','127.0.0.1','200 OK',657,'admin','2022-02-22 10:28:21'),(175,'登录','GET','/api/user/login','127.0.0.1','200 OK',302,'admin','2022-02-22 11:04:24'),(176,'移除代理','DELETE','/api/proxy/del','127.0.0.1','200 OK',33,'admin','2022-02-22 11:04:34'),(177,'移除代理','DELETE','/api/proxy/del','127.0.0.1','200 OK',17,'admin','2022-02-22 11:04:35'),(178,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',186,'admin','2022-02-22 11:04:44'),(179,'登录','GET','/api/user/login','127.0.0.1','200 OK',258,'admin','2022-02-22 11:05:05'),(180,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',97,'admin','2022-02-22 11:05:51'),(181,'登录','GET','/api/user/login','127.0.0.1','200 OK',300,'admin','2022-02-22 11:11:30'),(182,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',145,'admin','2022-02-22 11:12:00'),(183,'登录','GET','/api/user/login','127.0.0.1','200 OK',264,'admin','2022-02-22 11:12:42'),(184,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',41793,'admin','2022-02-22 11:13:42'),(185,'登录','GET','/api/user/login','127.0.0.1','200 OK',245,'admin','2022-02-22 11:13:58'),(186,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',86,'admin','2022-02-22 11:14:11'),(187,'登录','GET','/api/user/login','127.0.0.1','200 OK',293,'admin','2022-02-22 11:31:52'),(188,'向上级平台添加国标通道','POST','/api/platform/update_channel_for_gb','127.0.0.1','200 OK',14,'admin','2022-02-22 11:34:55'),(189,'向上级平台添加国标通道','POST','/api/platform/update_channel_for_gb','127.0.0.1','200 OK',11,'admin','2022-02-22 11:35:02'),(190,'保存代理','POST','/api/proxy/save','127.0.0.1','200 OK',16,'admin','2022-02-22 11:37:00'),(191,'登录','GET','/api/user/login','127.0.0.1','200 OK',340,'admin','2022-02-22 11:38:15'),(192,'停用代理','GET','/api/proxy/stop','127.0.0.1','200 OK',16,'admin','2022-02-22 11:38:20'),(193,'停用代理','GET','/api/proxy/stop','127.0.0.1','200 OK',10,'admin','2022-02-22 11:38:28'),(194,'登录','GET','/api/user/login','127.0.0.1','200 OK',288,'admin','2022-02-22 11:39:34'),(195,'停用代理','GET','/api/proxy/stop','127.0.0.1','200 OK',29,'admin','2022-02-22 11:39:36'),(196,'启用代理','GET','/api/proxy/start','127.0.0.1','200 OK',594,'admin','2022-02-22 11:39:38'),(197,'停用代理','GET','/api/proxy/stop','127.0.0.1','200 OK',16,'admin','2022-02-22 11:39:43'),(198,'停用代理','GET','/api/proxy/stop','127.0.0.1','200 OK',27,'admin','2022-02-22 11:41:30'),(199,'停用代理','GET','/api/proxy/stop','127.0.0.1','200 OK',17,'admin','2022-02-22 11:41:42'),(200,'启用代理','GET','/api/proxy/start','127.0.0.1','200 OK',9,'admin','2022-02-22 11:41:44'),(201,'启用代理','GET','/api/proxy/start','127.0.0.1','200 OK',6,'admin','2022-02-22 11:41:47'),(202,'启用代理','GET','/api/proxy/start','127.0.0.1','200 OK',67,'admin','2022-02-22 11:41:48'),(203,'移除代理','DELETE','/api/proxy/del','127.0.0.1','200 OK',14,'admin','2022-02-22 11:41:51'),(204,'移除代理','DELETE','/api/proxy/del','127.0.0.1','200 OK',16,'admin','2022-02-22 11:41:52'),(205,'移除代理','DELETE','/api/proxy/del','127.0.0.1','200 OK',14,'admin','2022-02-22 11:41:53');
/*!40000 ALTER TABLE `log` ENABLE KEYS */; /*!40000 ALTER TABLE `log` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -283,7 +280,6 @@ CREATE TABLE `media_server` (
LOCK TABLES `media_server` WRITE; LOCK TABLES `media_server` WRITE;
/*!40000 ALTER TABLE `media_server` DISABLE KEYS */; /*!40000 ALTER TABLE `media_server` DISABLE KEYS */;
INSERT INTO `media_server` VALUES ('FQ3TF8yT83wh5Wvz','192.168.1.3','192.168.1.3','192.168.1.3','192.168.1.3',6080,0,10935,0,10000,10554,0,1,'035c73f7-bb6b-4889-a715-d9eb2d1925cc',18000,1,'30000,30500','30000,30500',18081,1,'2022-02-22 11:39:33','2022-02-22 11:39:33',30);
/*!40000 ALTER TABLE `media_server` ENABLE KEYS */; /*!40000 ALTER TABLE `media_server` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -316,8 +312,10 @@ CREATE TABLE `parent_platform` (
`rtcp` int DEFAULT NULL, `rtcp` int DEFAULT NULL,
`status` bit(1) DEFAULT NULL, `status` bit(1) DEFAULT NULL,
`shareAllLiveStream` int DEFAULT NULL, `shareAllLiveStream` int DEFAULT NULL,
PRIMARY KEY (`id`,`serverGBId`) USING BTREE PRIMARY KEY (`id`),
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; UNIQUE KEY `parent_platform_id_uindex` (`id`),
UNIQUE KEY `parent_platform_pk` (`serverGBId`)
) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -326,7 +324,6 @@ CREATE TABLE `parent_platform` (
LOCK TABLES `parent_platform` WRITE; LOCK TABLES `parent_platform` WRITE;
/*!40000 ALTER TABLE `parent_platform` DISABLE KEYS */; /*!40000 ALTER TABLE `parent_platform` DISABLE KEYS */;
INSERT INTO `parent_platform` VALUES (4,0,'11111','111111111111111','1111111111','11.111.11.11',2342,'34020000013000000001','192.168.1.3','15060','34020000013000000001','12345678','300','60','UDP','GB2312','111111111111111',1,0,_binary '\0',0),(5,0,'2222','222222222222222','2222222222','222.22.2.2',2222,'34020000013000000001','192.168.1.3','15060','34020000013000000001','12345678','300','60','UDP','GB2312','222222222222222',1,0,_binary '\0',0);
/*!40000 ALTER TABLE `parent_platform` ENABLE KEYS */; /*!40000 ALTER TABLE `parent_platform` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -379,7 +376,6 @@ CREATE TABLE `platform_gb_channel` (
LOCK TABLES `platform_gb_channel` WRITE; LOCK TABLES `platform_gb_channel` WRITE;
/*!40000 ALTER TABLE `platform_gb_channel` DISABLE KEYS */; /*!40000 ALTER TABLE `platform_gb_channel` DISABLE KEYS */;
INSERT INTO `platform_gb_channel` VALUES (1,'34020000001310000001','34020000002000000005','111111111111111','34020000002000000005_34020000001310000001','111111111111111'),(2,'34020000001310000065','34020000002000000005','222222222222222','34020000002000000005_34020000001310000065','222222222222222');
/*!40000 ALTER TABLE `platform_gb_channel` ENABLE KEYS */; /*!40000 ALTER TABLE `platform_gb_channel` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -395,8 +391,9 @@ CREATE TABLE `platform_gb_stream` (
`catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`gbStreamId` int NOT NULL, `gbStreamId` int NOT NULL,
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`id`) PRIMARY KEY (`id`),
) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
) ENGINE=InnoDB AUTO_INCREMENT=256 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -405,7 +402,6 @@ CREATE TABLE `platform_gb_stream` (
LOCK TABLES `platform_gb_stream` WRITE; LOCK TABLES `platform_gb_stream` WRITE;
/*!40000 ALTER TABLE `platform_gb_stream` DISABLE KEYS */; /*!40000 ALTER TABLE `platform_gb_stream` DISABLE KEYS */;
INSERT INTO `platform_gb_stream` VALUES ('111111111111111','111111111111111',70,35),('111111111111111','111111111111111',71,36),('111111111111111','111111111111111',72,37),('222222222222222','222222222222222',73,38),('111111111111111','111111111111111',74,39),('111111111111111','111111111111111',75,40),('111111111111111','111111111111111',76,41);
/*!40000 ALTER TABLE `platform_gb_stream` ENABLE KEYS */; /*!40000 ALTER TABLE `platform_gb_stream` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -434,7 +430,8 @@ CREATE TABLE `stream_proxy` (
`status` bit(1) NOT NULL, `status` bit(1) NOT NULL,
`enable_remove_none_reader` bit(1) NOT NULL, `enable_remove_none_reader` bit(1) NOT NULL,
`createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, `createTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`),
UNIQUE KEY `stream_proxy_pk` (`app`,`stream`)
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
@ -466,7 +463,7 @@ CREATE TABLE `stream_push` (
`mediaServerId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, `mediaServerId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `stream_push_pk` (`app`,`stream`) UNIQUE KEY `stream_push_pk` (`app`,`stream`)
) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; ) ENGINE=InnoDB AUTO_INCREMENT=310 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@ -475,7 +472,6 @@ CREATE TABLE `stream_push` (
LOCK TABLES `stream_push` WRITE; LOCK TABLES `stream_push` WRITE;
/*!40000 ALTER TABLE `stream_push` DISABLE KEYS */; /*!40000 ALTER TABLE `stream_push` DISABLE KEYS */;
INSERT INTO `stream_push` VALUES (13,'1000','10000000_000','0',2,'rtsp_push',1645500864142,NULL,'FQ3TF8yT83wh5Wvz'),(14,'1000','10000001_000','0',2,'rtsp_push',1645500864142,NULL,'FQ3TF8yT83wh5Wvz'),(15,'1000','10000002_000','0',2,'rtsp_push',1645500864142,NULL,'FQ3TF8yT83wh5Wvz');
/*!40000 ALTER TABLE `stream_push` ENABLE KEYS */; /*!40000 ALTER TABLE `stream_push` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -544,4 +540,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2022-02-22 11:43:00 -- Dump completed on 2022-02-24 16:52:12

11
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GbStream.java

@ -5,7 +5,7 @@ package com.genersoft.iot.vmp.gb28181.bean;
*/ */
public class GbStream extends PlatformGbStream{ public class GbStream extends PlatformGbStream{
private int id; private Integer gbStreamId;
private String app; private String app;
private String stream; private String stream;
private String gbId; private String gbId;
@ -20,12 +20,13 @@ public class GbStream extends PlatformGbStream{
*/ */
public Long createStamp; public Long createStamp;
public int getId() { @Override
return id; public Integer getGbStreamId() {
return gbStreamId;
} }
public void setId(int id) { public void setGbStreamId(Integer gbStreamId) {
this.id = id; this.gbStreamId = gbStreamId;
} }
public String getApp() { public String getApp() {

6
src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformGbStream.java

@ -1,15 +1,15 @@
package com.genersoft.iot.vmp.gb28181.bean; package com.genersoft.iot.vmp.gb28181.bean;
public class PlatformGbStream { public class PlatformGbStream {
private String gbStreamId; private Integer gbStreamId;
private String platformId; private String platformId;
private String catalogId; private String catalogId;
public String getGbStreamId() { public Integer getGbStreamId() {
return gbStreamId; return gbStreamId;
} }
public void setGbStreamId(String gbStreamId) { public void setGbStreamId(Integer gbStreamId) {
this.gbStreamId = gbStreamId; this.gbStreamId = gbStreamId;
} }

12
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java

@ -8,6 +8,11 @@ import java.util.List;
public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{ public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{
/**
* id
*/
private Integer id;
/** /**
* 应用名 * 应用名
*/ */
@ -111,6 +116,13 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
} }
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getApp() { public String getApp() {
return app; return app;

3
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java

@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import java.util.List; import java.util.List;
import java.util.Map;
public interface IStreamPushService { public interface IStreamPushService {
@ -69,5 +70,5 @@ public interface IStreamPushService {
boolean batchStop(List<GbStream> streamPushItems); boolean batchStop(List<GbStream> streamPushItems);
void batchAddForUpload(String platformId, String catalogId, List<StreamPushItem> streamPushItems); void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
} }

2
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java

@ -159,10 +159,12 @@ public class GbStreamServiceImpl implements IGbStreamService {
List<ParentPlatform> parentPlatforms = platformGbStreamMapper.selectByAppAndStream(gs.getApp(), gs.getStream()); List<ParentPlatform> parentPlatforms = platformGbStreamMapper.selectByAppAndStream(gs.getApp(), gs.getStream());
if (parentPlatforms.size() > 0) { if (parentPlatforms.size() > 0) {
for (ParentPlatform parentPlatform : parentPlatforms) { for (ParentPlatform parentPlatform : parentPlatforms) {
if (parentPlatform != null) {
eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), gs, type); eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), gs, type);
} }
} }
} }
} }
} }
}
} }

69
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java

@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Service @Service
public class StreamPushServiceImpl implements IStreamPushService { public class StreamPushServiceImpl implements IStreamPushService {
@ -359,23 +360,63 @@ public class StreamPushServiceImpl implements IStreamPushService {
} }
@Override @Override
public void batchAddForUpload(String platformId, String catalogId, List<StreamPushItem> streamPushItems) { public void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll ) {
// 存储数据到stream_push表
streamPushMapper.addAll(streamPushItems); streamPushMapper.addAll(streamPushItems);
gbStreamMapper.batchAdd(streamPushItems); List<StreamPushItem> streamPushItemForGbStream = streamPushItems.stream()
if (platformId != null) { .filter(streamPushItem-> streamPushItem.getId() != null)
ParentPlatform platform = parentPlatformMapper.getParentPlatByServerGBId(platformId); .collect(Collectors.toList());
if (platform != null) { // 存储数据到gb_stream表, id会返回到streamPushItemForGbStream里
if (catalogId == null) { if (streamPushItemForGbStream.size() > 0) {
catalogId = platform.getCatalogId(); gbStreamMapper.batchAdd(streamPushItemForGbStream);
}else { }
PlatformCatalog catalog = platformCatalogMapper.select(catalogId); // 去除没有ID也就是没有存储到数据库的数据
if (catalog == null) { List<StreamPushItem> streamPushItemsForPlatform = streamPushItemForGbStream.stream()
return; .filter(streamPushItem-> streamPushItem.getGbStreamId() != null)
.collect(Collectors.toList());
if (streamPushItemsForPlatform.size() > 0) {
List<StreamPushItem> streamPushItemListFroPlatform = new ArrayList<>();
Map<String, List<StreamPushItem>> platformForEvent = new HashMap<>();
// 遍历存储结果,查找app+Stream->platformId+catalogId的对应关系,然后执行批量写入
for (StreamPushItem streamPushItem : streamPushItemsForPlatform) {
List<String[]> platFormInfoList = streamPushItemsForAll.get(streamPushItem.getApp() + streamPushItem.getStream());
if (platFormInfoList != null) {
if (platFormInfoList.size() > 0) {
for (String[] platFormInfoArray : platFormInfoList) {
StreamPushItem streamPushItemForPlatform = new StreamPushItem();
streamPushItemForPlatform.setGbStreamId(streamPushItem.getGbStreamId());
if (platFormInfoArray.length > 0) {
// 数组 platFormInfoArray 0 为平台ID。 1为目录ID
streamPushItemForPlatform.setPlatformId(platFormInfoArray[0]);
List<StreamPushItem> streamPushItemsInPlatform = platformForEvent.get(streamPushItem.getPlatformId());
if (streamPushItemsInPlatform == null) {
streamPushItemsInPlatform = new ArrayList<>();
platformForEvent.put(platFormInfoArray[0], streamPushItemsInPlatform);
}
// 为发送通知整理数据
streamPushItemForPlatform.setApp(streamPushItem.getApp());
streamPushItemForPlatform.setStream(streamPushItem.getStream());
streamPushItemForPlatform.setGbId(streamPushItem.getGbId());
streamPushItemsInPlatform.add(streamPushItemForPlatform);
}
if (platFormInfoArray.length > 1) {
streamPushItemForPlatform.setCatalogId(platFormInfoArray[1]);
}
streamPushItemListFroPlatform.add(streamPushItemForPlatform);
}
}
} }
} }
List<GbStream> gbStreamList = gbStreamMapper.selectAllForAppAndStream(streamPushItems); platformGbStreamMapper.batchAdd(streamPushItemListFroPlatform);
platformGbStreamMapper.batchAdd(platformId, catalogId, gbStreamList); // 发送通知
eventPublisher.catalogEventPublishForStream(platformId, streamPushItems.toArray(new GbStream[0]), CatalogEvent.ADD); for (String platformId : platformForEvent.keySet()) {
eventPublisher.catalogEventPublishForStream(
platformId, platformForEvent.get(platformId).toArray(new GbStream[0]), CatalogEvent.ADD);
} }
} }
} }

117
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java

@ -5,21 +5,45 @@ import com.alibaba.excel.event.AnalysisEventListener;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IStreamPushService; import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto; import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.*; import java.util.*;
public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPushExcelDto> { public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPushExcelDto> {
// 错误数据的回调,用于将错误数据发送给页面
private ErrorDataHandler errorDataHandler; private ErrorDataHandler errorDataHandler;
// 推流的业务类用于存储数据
private IStreamPushService pushService; private IStreamPushService pushService;
// 默认流媒体节点ID
private String defaultMediaServerId; private String defaultMediaServerId;
// 用于存储不加过滤的所有数据
private List<StreamPushItem> streamPushItems = new ArrayList<>(); private List<StreamPushItem> streamPushItems = new ArrayList<>();
private Map<String, UploadData> streamPushItemsForPlatform = new HashMap<>();
// 用于存储更具APP+Stream过滤后的数据,可以直接存入stream_push表与gb_stream表
private Map<String,StreamPushItem> streamPushItemForSave = new HashMap<>();
// 用于存储按照APP+Stream为KEY, 平台ID+目录Id 为value的数据,用于存储到gb_stream表后获取app+Stream对应的平台与目录信息,然后存入关联表
private Map<String, List<String[]>> streamPushItemsForPlatform = new HashMap<>();
// 用于判断文件是否存在重复的app+Stream+平台ID
private Set<String> streamPushStreamSet = new HashSet<>(); private Set<String> streamPushStreamSet = new HashSet<>();
private Map<String,String> streamPushGBMap = new HashMap<>();
// 用于存储APP+Stream->国标ID 的数据结构, 数据一一对应,全局判断APP+Stream->国标ID是否存在不对应
private BiMap<String,String> gBMap = HashBiMap.create();
// 记录错误的APP+Stream
private List<String> errorStreamList = new ArrayList<>(); private List<String> errorStreamList = new ArrayList<>();
// 记录错误的国标ID
private List<String> errorGBList = new ArrayList<>(); private List<String> errorGBList = new ArrayList<>();
// 读取数量计数器 // 读取数量计数器
private int loadedSize = 0; private int loadedSize = 0;
@ -33,16 +57,6 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
void handle(List<String> streams, List<String> gbId); void handle(List<String> streams, List<String> gbId);
} }
private class UploadData{
public String platformId;
public Map<String, List<StreamPushItem>> catalogData = new HashMap<>();
public List<StreamPushItem> streamPushItems = new ArrayList<>();
public UploadData(String platformId) {
this.platformId = platformId;
}
}
@Override @Override
public void invoke(StreamPushExcelDto streamPushExcelDto, AnalysisContext analysisContext) { public void invoke(StreamPushExcelDto streamPushExcelDto, AnalysisContext analysisContext) {
if (StringUtils.isEmpty(streamPushExcelDto.getApp()) if (StringUtils.isEmpty(streamPushExcelDto.getApp())
@ -50,18 +64,28 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
|| StringUtils.isEmpty(streamPushExcelDto.getGbId())) { || StringUtils.isEmpty(streamPushExcelDto.getGbId())) {
return; return;
} }
if (streamPushGBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()) == null) {
streamPushGBMap.put(streamPushExcelDto.getApp() + streamPushExcelDto.getStream(), streamPushExcelDto.getGbId());
if (gBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()) == null) {
try {
gBMap.put(streamPushExcelDto.getApp() + streamPushExcelDto.getStream(), streamPushExcelDto.getGbId());
}catch (IllegalArgumentException e) {
e.printStackTrace();
errorGBList.add(streamPushExcelDto.getGbId() + "(不同的app+stream使用了相同的国标ID)");
return;
}
}else { }else {
if (!streamPushGBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()).equals(streamPushExcelDto.getGbId())) { if (!gBMap.get(streamPushExcelDto.getApp() + streamPushExcelDto.getStream()).equals(streamPushExcelDto.getGbId())) {
errorGBList.add(streamPushExcelDto.getGbId() + "(同一组app+stream使用了不同国标ID)"); errorGBList.add(streamPushExcelDto.getGbId() + "(同一组app+stream使用了不同国标ID)");
return; return;
} }
} }
if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) { if (streamPushStreamSet.contains(streamPushExcelDto.getApp() + streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId())) {
errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+ "/" + streamPushExcelDto.getPlatformId() + "(同一组app+stream添加在了同一个平台下)"); errorStreamList.add(streamPushExcelDto.getApp() + "/" + streamPushExcelDto.getStream()+ "/" +
streamPushExcelDto.getPlatformId() + "(同一组app+stream添加在了同一个平台下)");
return; return;
}else {
streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId());
} }
StreamPushItem streamPushItem = new StreamPushItem(); StreamPushItem streamPushItem = new StreamPushItem();
@ -78,32 +102,31 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
streamPushItem.setTotalReaderCount("0"); streamPushItem.setTotalReaderCount("0");
streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId()); streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId());
streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId()); streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId());
if (StringUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
// 存入所有的通道信息
streamPushItems.add(streamPushItem); streamPushItems.add(streamPushItem);
}else { streamPushItemForSave.put(streamPushItem.getApp() + streamPushItem.getStream(), streamPushItem);
UploadData uploadData = streamPushItemsForPlatform.get(streamPushExcelDto.getPlatformId());
if (uploadData == null) { if (!StringUtils.isEmpty(streamPushExcelDto.getPlatformId())) {
uploadData = new UploadData(streamPushExcelDto.getPlatformId()); List<String[]> platformList = streamPushItemsForPlatform.get(streamPushItem.getApp() + streamPushItem.getStream());
streamPushItemsForPlatform.put(streamPushExcelDto.getPlatformId(), uploadData); if (platformList == null) {
} platformList = new ArrayList<>();
if (!StringUtils.isEmpty(streamPushExcelDto.getCatalogId())) { streamPushItemsForPlatform.put(streamPushItem.getApp() + streamPushItem.getStream(), platformList);
List<StreamPushItem> streamPushItems = uploadData.catalogData.get(streamPushExcelDto.getCatalogId());
if (streamPushItems == null) {
streamPushItems = new ArrayList<>();
uploadData.catalogData.put(streamPushExcelDto.getCatalogId(), streamPushItems);
} }
streamPushItems.add(streamPushItem); String platformId = streamPushExcelDto.getPlatformId();
}else { String catalogId = streamPushExcelDto.getCatalogId();
uploadData.streamPushItems.add(streamPushItem); if (StringUtils.isEmpty(streamPushExcelDto.getCatalogId())) {
catalogId = null;
} }
String[] platFormInfoArray = new String[]{platformId, catalogId};
platformList.add(platFormInfoArray);
} }
streamPushStreamSet.add(streamPushExcelDto.getApp()+streamPushExcelDto.getStream() + streamPushExcelDto.getPlatformId());
loadedSize ++; loadedSize ++;
if (loadedSize > 1000) { if (loadedSize > 1000) {
saveData(); saveData();
streamPushItems.clear(); streamPushItems.clear();
streamPushItemForSave.clear();
streamPushItemsForPlatform.clear(); streamPushItemsForPlatform.clear();
loadedSize = 0; loadedSize = 0;
} }
@ -114,30 +137,18 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
public void doAfterAllAnalysed(AnalysisContext analysisContext) { public void doAfterAllAnalysed(AnalysisContext analysisContext) {
// 这里也要保存数据,确保最后遗留的数据也存储到数据库 // 这里也要保存数据,确保最后遗留的数据也存储到数据库
saveData(); saveData();
streamPushGBMap.clear(); streamPushItems.clear();
streamPushItemForSave.clear();
gBMap.clear();
streamPushStreamSet.clear(); streamPushStreamSet.clear();
streamPushItemsForPlatform.clear();
errorDataHandler.handle(errorStreamList, errorGBList); errorDataHandler.handle(errorStreamList, errorGBList);
} }
private void saveData(){ private void saveData(){
if (streamPushItems.size() > 0) { if (streamPushItemForSave.size() > 0) {
pushService.batchAddForUpload(null, null, streamPushItems); // 向数据库查询是否存在重复的app
} pushService.batchAddForUpload(new ArrayList<>(streamPushItemForSave.values()), streamPushItemsForPlatform);
// 处理已分配到平台的流
if (streamPushItemsForPlatform.size() > 0){
for (String platformId : streamPushItemsForPlatform.keySet()) {
UploadData uploadData = streamPushItemsForPlatform.get(platformId);
if (uploadData.streamPushItems.size() > 0) {
pushService.batchAddForUpload(platformId, null, uploadData.streamPushItems);
}
if (uploadData.catalogData.size() > 0) {
for (String catalogId : uploadData.catalogData.keySet()) {
if (uploadData.catalogData.get(catalogId).size() > 0) {
pushService.batchAddForUpload(platformId, catalogId, uploadData.catalogData.get(catalogId));
}
}
}
}
} }
} }
} }

15
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java

@ -41,15 +41,15 @@ public interface GbStreamMapper {
"SELECT gs.* FROM gb_stream gs " + "SELECT gs.* FROM gb_stream gs " +
"WHERE " + "WHERE " +
"1=1 " + "1=1 " +
" <if test='catalogId != null'> AND gs.id in" + " <if test='catalogId != null'> AND gs.gbStreamId in" +
"(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId} and pgs.catalogId=#{catalogId})</if> " + "(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId} and pgs.catalogId=#{catalogId})</if> " +
" <if test='catalogId == null'> AND gs.id not in" + " <if test='catalogId == null'> AND gs.gbStreamId not in" +
"(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId}) </if> " + "(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId}) </if> " +
" <if test='query != null'> AND (gs.app LIKE '%${query}%' OR gs.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " + " <if test='query != null'> AND (gs.app LIKE '%${query}%' OR gs.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " +
" <if test='pushing == true' > AND gs.status=1</if>" + " <if test='pushing == true' > AND gs.status=1</if>" +
" <if test='pushing == false' > AND gs.status=0</if>" + " <if test='pushing == false' > AND gs.status=0</if>" +
" <if test='mediaServerId != null' > AND gs.mediaServerId=#{mediaServerId} </if>" + " <if test='mediaServerId != null' > AND gs.mediaServerId=#{mediaServerId} </if>" +
" order by gs.id asc " + " order by gs.gbStreamId asc " +
"</script>") "</script>")
List<GbStream> selectAll(String platformId, String catalogId, String query, Boolean pushing, String mediaServerId); List<GbStream> selectAll(String platformId, String catalogId, String query, Boolean pushing, String mediaServerId);
@ -60,18 +60,18 @@ public interface GbStreamMapper {
List<GbStream> selectByGBId(String gbId); List<GbStream> selectByGBId(String gbId);
@Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " + @Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.id = pgs.catalogId " + "LEFT JOIN platform_gb_stream pgs ON gs.gbStreamId = pgs.catalogId " +
"WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'") "WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
GbStream queryStreamInPlatform(String platformId, String gbId); GbStream queryStreamInPlatform(String platformId, String gbId);
@Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " + @Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.id = pgs.gbStreamId " + "LEFT JOIN platform_gb_stream pgs ON gs.gbStreamId = pgs.gbStreamId " +
"WHERE pgs.platformId = #{platformId}") "WHERE pgs.platformId = #{platformId}")
List<GbStream> queryGbStreamListInPlatform(String platformId); List<GbStream> queryGbStreamListInPlatform(String platformId);
@Select("SELECT gs.* FROM gb_stream gs LEFT JOIN platform_gb_stream pgs " + @Select("SELECT gs.* FROM gb_stream gs LEFT JOIN platform_gb_stream pgs " +
"ON gs.id = pgs.gbStreamId WHERE pgs.gbStreamId is NULL") "ON gs.gbStreamId = pgs.gbStreamId WHERE pgs.gbStreamId is NULL")
List<GbStream> queryStreamNotInPlatform(); List<GbStream> queryStreamNotInPlatform();
@Update("UPDATE gb_stream " + @Update("UPDATE gb_stream " +
@ -104,7 +104,7 @@ public interface GbStreamMapper {
void batchDelForGbStream(List<GbStream> gbStreams); void batchDelForGbStream(List<GbStream> gbStreams);
@Insert("<script> " + @Insert("<script> " +
"REPLACE into gb_stream " + "INSERT IGNORE into gb_stream " +
"(app, stream, gbId, name, " + "(app, stream, gbId, name, " +
"longitude, latitude, streamType, mediaServerId, status, createStamp)" + "longitude, latitude, streamType, mediaServerId, status, createStamp)" +
"values " + "values " +
@ -114,6 +114,7 @@ public interface GbStreamMapper {
"'${item.mediaServerId}', ${item.status}, ${item.createStamp}) "+ "'${item.mediaServerId}', ${item.status}, ${item.createStamp}) "+
"</foreach> " + "</foreach> " +
"</script>") "</script>")
@Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gbStreamId")
void batchAdd(List<StreamPushItem> subList); void batchAdd(List<StreamPushItem> subList);
@Update({"<script>" + @Update({"<script>" +

24
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java

@ -17,21 +17,21 @@ import java.util.List;
public interface PlatformGbStreamMapper { public interface PlatformGbStreamMapper {
@Insert("REPLACE INTO platform_gb_stream (gbStreamId, platformId, catalogId) VALUES" + @Insert("REPLACE INTO platform_gb_stream (gbStreamId, platformId, catalogId) VALUES" +
"( #{id}, #{platformId}, #{catalogId})") "( #{gbStreamId}, #{platformId}, #{catalogId})")
int add(PlatformGbStream platformGbStream); int add(PlatformGbStream platformGbStream);
@Insert("<script> " + @Insert("<script> " +
"REPLACE into platform_gb_stream " + "INSERT into platform_gb_stream " +
"(gbStreamId, platformId, catalogId) " + "(gbStreamId, platformId, catalogId) " +
"values " + "values " +
"<foreach collection='streamPushItems' index='index' item='item' separator=','> " + "<foreach collection='streamPushItems' index='index' item='item' separator=','> " +
"(#{item.id}, #{platformId}, #{catalogId})" + "(${item.gbStreamId}, '${item.platformId}', '${item.catalogId}')" +
"</foreach> " + "</foreach> " +
"</script>") "</script>")
int batchAdd(String platformId, String catalogId, List<GbStream> streamPushItems); int batchAdd(List<StreamPushItem> streamPushItems);
@Delete("DELETE FROM platform_gb_stream WHERE gbStreamId = (select id from gb_stream where app=#{app} AND stream=#{stream})") @Delete("DELETE FROM platform_gb_stream WHERE gbStreamId = (select gbStreamId from gb_stream where app=#{app} AND stream=#{stream})")
int delByAppAndStream(String app, String stream); int delByAppAndStream(String app, String stream);
@Delete("DELETE FROM platform_gb_stream WHERE platformId=#{platformId}") @Delete("DELETE FROM platform_gb_stream WHERE platformId=#{platformId}")
@ -42,28 +42,28 @@ public interface PlatformGbStreamMapper {
"FROM " + "FROM " +
"platform_gb_stream pgs " + "platform_gb_stream pgs " +
"LEFT JOIN parent_platform pp ON pp.serverGBId = pgs.platformId " + "LEFT JOIN parent_platform pp ON pp.serverGBId = pgs.platformId " +
"LEFT JOIN gb_stream gs ON gs.id = pgs.gbStreamId " + "LEFT JOIN gb_stream gs ON gs.gbStreamId = pgs.gbStreamId " +
"WHERE " + "WHERE " +
"gs.app =#{app} " + "gs.app =#{app} " +
"AND gs.stream =#{stream} ") "AND gs.stream =#{stream} ")
List<ParentPlatform> selectByAppAndStream(String app, String stream); List<ParentPlatform> selectByAppAndStream(String app, String stream);
@Select("SELECT pgs.*, gs.gbId FROM platform_gb_stream pgs " + @Select("SELECT pgs.*, gs.gbId FROM platform_gb_stream pgs " +
"LEFT JOIN gb_stream gs ON pgs.gbStreamId = gs.id " + "LEFT JOIN gb_stream gs ON pgs.gbStreamId = gs.gbStreamId " +
"WHERE gs.app=#{app} AND gs.stream=#{stream} AND pgs.platformId=#{serverGBId}") "WHERE gs.app=#{app} AND gs.stream=#{stream} AND pgs.platformId=#{serverGBId}")
StreamProxyItem selectOne(String app, String stream, String serverGBId); StreamProxyItem selectOne(String app, String stream, String serverGBId);
@Select("select gs.* \n" + @Select("select gs.* \n" +
"from gb_stream gs\n" + "from gb_stream gs\n" +
" left join platform_gb_stream pgs\n" + " left join platform_gb_stream pgs\n" +
" on gs.id = pgs.gbStreamId\n" + " on gs.gbStreamId = pgs.gbStreamId\n" +
"where pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}") "where pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}")
List<GbStream> queryChannelInParentPlatformAndCatalog(String platformId, String catalogId); List<GbStream> queryChannelInParentPlatformAndCatalog(String platformId, String catalogId);
@Select("select gs.gbId as id, gs.name as name, pgs.platformId as platformId, pgs.catalogId as catalogId , 0 as childrenCount, 2 as type\n" + @Select("select gs.gbId as id, gs.name as name, pgs.platformId as platformId, pgs.catalogId as catalogId , 0 as childrenCount, 2 as type\n" +
"from gb_stream gs\n" + "from gb_stream gs\n" +
" left join platform_gb_stream pgs\n" + " left join platform_gb_stream pgs\n" +
" on gs.id = pgs.gbStreamId\n" + " on gs.gbStreamId = pgs.gbStreamId\n" +
"where pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}") "where pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}")
List<PlatformCatalog> queryChannelInParentPlatformAndCatalogForCatalog(String platformId, String catalogId); List<PlatformCatalog> queryChannelInParentPlatformAndCatalogForCatalog(String platformId, String catalogId);
@ -78,7 +78,7 @@ public interface PlatformGbStreamMapper {
"left join platform_gb_stream pgs on " + "left join platform_gb_stream pgs on " +
"pp.serverGBId = pgs.platformId " + "pp.serverGBId = pgs.platformId " +
"left join gb_stream gs " + "left join gb_stream gs " +
"gs.id = pgs.gbStreamId " + "gs.gbStreamId = pgs.gbStreamId " +
"WHERE " + "WHERE " +
"gs.app = #{app} " + "gs.app = #{app} " +
"AND gs.stream = #{stream}" + "AND gs.stream = #{stream}" +
@ -93,7 +93,7 @@ public interface PlatformGbStreamMapper {
@Delete("<script> "+ @Delete("<script> "+
"DELETE FROM platform_gb_stream where gbStreamId in " + "DELETE FROM platform_gb_stream where gbStreamId in " +
"<foreach collection='gbStreams' item='item' open='(' separator=',' close=')' >" + "<foreach collection='gbStreams' item='item' open='(' separator=',' close=')' >" +
"#{item.id}" + "#{item.gbStreamId}" +
"</foreach>" + "</foreach>" +
"</script>") "</script>")
void delByGbStreams(List<GbStream> gbStreams); void delByGbStreams(List<GbStream> gbStreams);
@ -101,7 +101,7 @@ public interface PlatformGbStreamMapper {
@Delete("<script> "+ @Delete("<script> "+
"DELETE FROM platform_gb_stream where platformId=#{platformId} and gbStreamId in " + "DELETE FROM platform_gb_stream where platformId=#{platformId} and gbStreamId in " +
"<foreach collection='gbStreams' item='item' open='(' separator=',' close=')'>" + "<foreach collection='gbStreams' item='item' open='(' separator=',' close=')'>" +
"#{item.id} " + "#{item.gbStreamId} " +
"</foreach>" + "</foreach>" +
"</script>") "</script>")
void delByAppAndStreamsByPlatformId(List<GbStream> gbStreams, String platformId); void delByAppAndStreamsByPlatformId(List<GbStream> gbStreams, String platformId);

25
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java

@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.GbStream; import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import org.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.Collection; import java.util.Collection;
@ -61,39 +62,37 @@ public interface StreamPushMapper {
@Select(value = {" <script>" + @Select(value = {" <script>" +
"SELECT " + "SELECT " +
"st.*, " + "st.*, " +
"pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude , pgs.id " + "gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude, gs.gbStreamId " +
"from " + "from " +
"stream_push st " + "stream_push st " +
"LEFT JOIN gb_stream pgs " + "LEFT JOIN gb_stream gs " +
"on st.app = pgs.app AND st.stream = pgs.stream " + "on st.app = gs.app AND st.stream = gs.stream " +
"WHERE " + "WHERE " +
"1=1 " + "1=1 " +
" <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR pgs.gbId LIKE '%${query}%' OR pgs.name LIKE '%${query}%')</if> " + " <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " +
" <if test='pushing == true' > AND (pgs.gbId is null OR pgs.status=1)</if>" + " <if test='pushing == true' > AND (gs.gbId is null OR gs.status=1)</if>" +
" <if test='pushing == false' > AND pgs.status=0</if>" + " <if test='pushing == false' > AND gs.status=0</if>" +
" <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" + " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" +
"order by st.createStamp desc" + "order by st.createStamp desc" +
" </script>"}) " </script>"})
List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId); List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId);
@Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.createStamp desc") @Select("SELECT st.*, gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream order by st.createStamp desc")
List<StreamPushItem> selectAll(); List<StreamPushItem> selectAll();
@Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}") @Select("SELECT st.*, gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
List<StreamPushItem> selectForEnable(boolean enable);
@Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
StreamPushItem selectOne(String app, String stream); StreamPushItem selectOne(String app, String stream);
@Insert("<script>" + @Insert("<script>" +
"REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " + "Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"createStamp, aliveSecond, mediaServerId) " + "createStamp, aliveSecond, mediaServerId) " +
"VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" + "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
"( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " + "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
"'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" + "'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
" </foreach>" + " </foreach>" +
"</script>") "</script>")
void addAll(List<StreamPushItem> streamPushItems); @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
int addAll(List<StreamPushItem> streamPushItems);
@Delete("DELETE FROM stream_push") @Delete("DELETE FROM stream_push")
void clear(); void clear();

2
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@ -748,7 +748,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
return false; return false;
} }
} }
}else { } else {
//事务回滚 //事务回滚
dataSourceTransactionManager.rollback(transactionStatus); dataSourceTransactionManager.rollback(transactionStatus);
return false; return false;

Loading…
Cancel
Save