Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

# Conflicts:
#	sql/mysql.sql
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

sql/mysql.sql

@@ -1,13 +1,13 @@
--- MariaDB dump 10.19  Distrib 10.7.3-MariaDB, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.29, for Linux (x86_64)
 --
 -- Host: 127.0.0.1    Database: wvp3
 -- ------------------------------------------------------
--- Server version	8.0.0-dmr
+-- Server version	8.0.29-0ubuntu0.22.04.2
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
+/*!50503 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -21,36 +21,36 @@
 
 DROP TABLE IF EXISTS `device`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `device` (
-                          `id` int(11) NOT NULL AUTO_INCREMENT,
-                          `deviceId` varchar(50) NOT NULL,
-                          `name` varchar(255) DEFAULT NULL,
-                          `manufacturer` varchar(255) DEFAULT NULL,
-                          `model` varchar(255) DEFAULT NULL,
-                          `firmware` varchar(255) DEFAULT NULL,
-                          `transport` varchar(50) DEFAULT NULL,
-                          `streamMode` varchar(50) DEFAULT NULL,
-                          `online` varchar(50) DEFAULT NULL,
-                          `registerTime` varchar(50) DEFAULT NULL,
-                          `keepaliveTime` varchar(50) DEFAULT NULL,
-                          `ip` varchar(50) NOT NULL,
-                          `createTime` varchar(50) NOT NULL,
-                          `updateTime` varchar(50) NOT NULL,
-                          `port` int(11) NOT NULL,
-                          `expires` int(11) NOT NULL,
-                          `subscribeCycleForCatalog` int(11) NOT NULL,
-                          `subscribeCycleForMobilePosition` int(11) NOT NULL,
-                          `mobilePositionSubmissionInterval` int(11) NOT NULL DEFAULT '5',
-                          `subscribeCycleForAlarm` int(11) NOT NULL,
-                          `hostAddress` varchar(50) NOT NULL,
-                          `audioChannelForReceive` varchar(50) NOT NULL,
-                          `audioChannelForSend` varchar(50) NOT NULL,
-                          `charset` varchar(50) NOT NULL,
-                          `ssrcCheck` int(11) DEFAULT '0',
-                          PRIMARY KEY (`id`),
-                          UNIQUE KEY `device_deviceId_uindex` (`deviceId`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `model` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `firmware` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `streamMode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `online` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `registerTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `keepaliveTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ip` 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,
+  `port` int NOT NULL,
+  `expires` int NOT NULL,
+  `subscribeCycleForCatalog` int NOT NULL,
+  `hostAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `charset` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `subscribeCycleForMobilePosition` int DEFAULT NULL,
+  `mobilePositionSubmissionInterval` int DEFAULT '5',
+  `subscribeCycleForAlarm` int DEFAULT NULL,
+  `ssrcCheck` int DEFAULT '0',
+  `geoCoordSys` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `device_deviceId_uindex` (`deviceId`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -68,20 +68,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `device_alarm`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `device_alarm` (
-                                `id` int(11) NOT NULL AUTO_INCREMENT,
-                                `deviceId` varchar(50) NOT NULL,
-                                `channelId` varchar(50) NOT NULL,
-                                `alarmPriority` varchar(50) NOT NULL,
-                                `alarmMethod` varchar(50) DEFAULT NULL,
-                                `alarmTime` varchar(50) NOT NULL,
-                                `alarmDescription` varchar(255) DEFAULT NULL,
-                                `longitude` double DEFAULT NULL,
-                                `latitude` double DEFAULT NULL,
-                                `alarmType` varchar(50) DEFAULT NULL,
-                                PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `longitude` double DEFAULT NULL,
+  `latitude` double DEFAULT NULL,
+  `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -99,43 +99,48 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `device_channel`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `device_channel` (
-                                  `id` int(11) NOT NULL AUTO_INCREMENT,
-                                  `channelId` varchar(50) NOT NULL,
-                                  `name` varchar(255) DEFAULT NULL,
-                                  `manufacture` varchar(50) DEFAULT NULL,
-                                  `model` varchar(50) DEFAULT NULL,
-                                  `owner` varchar(50) DEFAULT NULL,
-                                  `civilCode` varchar(50) DEFAULT NULL,
-                                  `block` varchar(50) DEFAULT NULL,
-                                  `address` varchar(50) DEFAULT NULL,
-                                  `parentId` varchar(50) DEFAULT NULL,
-                                  `safetyWay` int(11) DEFAULT NULL,
-                                  `registerWay` int(11) DEFAULT NULL,
-                                  `certNum` varchar(50) DEFAULT NULL,
-                                  `certifiable` int(11) DEFAULT NULL,
-                                  `errCode` int(11) DEFAULT NULL,
-                                  `endTime` varchar(50) DEFAULT NULL,
-                                  `secrecy` varchar(50) DEFAULT NULL,
-                                  `ipAddress` varchar(50) DEFAULT NULL,
-                                  `port` int(11) DEFAULT NULL,
-                                  `password` varchar(255) DEFAULT NULL,
-                                  `PTZType` int(11) DEFAULT NULL,
-                                  `status` int(11) DEFAULT NULL,
-                                  `longitude` double DEFAULT NULL,
-                                  `latitude` double DEFAULT NULL,
-                                  `streamId` varchar(50) DEFAULT NULL,
-                                  `deviceId` varchar(50) NOT NULL,
-                                  `parental` varchar(50) DEFAULT NULL,
-                                  `hasAudio` bit(1) DEFAULT NULL,
-                                  `createTime` varchar(50) NOT NULL,
-                                  `updateTime` varchar(50) NOT NULL,
-                                  `subCount` int(11) DEFAULT '0',
-                                  PRIMARY KEY (`id`),
-                                  UNIQUE KEY `device_channel_id_uindex` (`id`),
-                                  UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`)
-) ENGINE=InnoDB AUTO_INCREMENT=81657 DEFAULT CHARSET=utf8mb4;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `manufacture` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `model` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `owner` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `block` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `safetyWay` int DEFAULT NULL,
+  `registerWay` int DEFAULT NULL,
+  `certNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `certifiable` int DEFAULT NULL,
+  `errCode` int DEFAULT NULL,
+  `endTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `secrecy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ipAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `port` int DEFAULT NULL,
+  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `PTZType` int DEFAULT NULL,
+  `status` int DEFAULT NULL,
+  `longitude` double DEFAULT NULL,
+  `latitude` double DEFAULT NULL,
+  `streamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `parental` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `hasAudio` bit(1) DEFAULT 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,
+  `subCount` int DEFAULT '0',
+  `longitudeGcj02` double DEFAULT NULL,
+  `latitudeGcj02` double DEFAULT NULL,
+  `longitudeWgs84` double DEFAULT NULL,
+  `latitudeWgs84` double DEFAULT NULL,
+  `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `device_channel_id_uindex` (`id`) USING BTREE,
+  UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=19314 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -153,24 +158,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `device_mobile_position`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `device_mobile_position` (
-                                          `id` int(11) NOT NULL AUTO_INCREMENT,
-                                          `deviceId` varchar(50) NOT NULL,
-                                          `channelId` varchar(50) NOT NULL,
-                                          `deviceName` varchar(255) DEFAULT NULL,
-                                          `time` varchar(50) NOT NULL,
-                                          `longitude` double NOT NULL,
-                                          `latitude` double NOT NULL,
-                                          `altitude` double DEFAULT NULL,
-                                          `speed` double DEFAULT NULL,
-                                          `direction` double DEFAULT NULL,
-                                          `reportSource` varchar(50) DEFAULT NULL,
-                                          `geodeticSystem` varchar(50) DEFAULT NULL,
-                                          `cnLng` varchar(50) DEFAULT NULL,
-                                          `cnLat` varchar(50) DEFAULT NULL,
-                                          PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6108 DEFAULT CHARSET=utf8mb4;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `longitude` double NOT NULL,
+  `latitude` double NOT NULL,
+  `altitude` double DEFAULT NULL,
+  `speed` double DEFAULT NULL,
+  `direction` double DEFAULT NULL,
+  `reportSource` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `geodeticSystem` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `cnLng` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `cnLat` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -188,23 +193,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `gb_stream`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `gb_stream` (
-                             `gbStreamId` int(11) NOT NULL AUTO_INCREMENT,
-                             `app` varchar(255) NOT NULL,
-                             `stream` varchar(255) NOT NULL,
-                             `gbId` varchar(50) NOT NULL,
-                             `name` varchar(255) DEFAULT NULL,
-                             `longitude` double DEFAULT NULL,
-                             `latitude` double DEFAULT NULL,
-                             `streamType` varchar(50) DEFAULT NULL,
-                             `mediaServerId` varchar(50) DEFAULT NULL,
-                             `status` int(11) DEFAULT NULL,
-                             `createStamp` bigint(20) DEFAULT NULL,
-                             PRIMARY KEY (`gbStreamId`) USING BTREE,
-                             UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
-                             UNIQUE KEY `gbId` (`gbId`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=300769 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `gbStreamId` int NOT NULL AUTO_INCREMENT,
+  `app` 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,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `longitude` double DEFAULT NULL,
+  `latitude` double DEFAULT NULL,
+  `streamType` 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,
+  `createStamp` bigint DEFAULT NULL,
+  PRIMARY KEY (`gbStreamId`) USING BTREE,
+  UNIQUE KEY `app` (`app`,`stream`) USING BTREE,
+  UNIQUE KEY `gbId` (`gbId`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=301679 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -222,19 +227,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `log`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `log` (
-                       `id` int(11) NOT NULL AUTO_INCREMENT,
-                       `name` varchar(50) NOT NULL,
-                       `type` varchar(50) NOT NULL,
-                       `uri` varchar(200) NOT NULL,
-                       `address` varchar(50) NOT NULL,
-                       `result` varchar(50) NOT NULL,
-                       `timing` bigint(20) NOT NULL,
-                       `username` varchar(50) NOT NULL,
-                       `createTime` varchar(50) NOT NULL,
-                       PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1552 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `timing` bigint 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,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=21611 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -252,34 +257,34 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `media_server`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `media_server` (
-                                `id` varchar(255) NOT NULL,
-                                `ip` varchar(50) NOT NULL,
-                                `hookIp` varchar(50) NOT NULL,
-                                `sdpIp` varchar(50) NOT NULL,
-                                `streamIp` varchar(50) NOT NULL,
-                                `httpPort` int(11) NOT NULL,
-                                `httpSSlPort` int(11) NOT NULL,
-                                `rtmpPort` int(11) NOT NULL,
-                                `rtmpSSlPort` int(11) NOT NULL,
-                                `rtpProxyPort` int(11) NOT NULL,
-                                `rtspPort` int(11) NOT NULL,
-                                `rtspSSLPort` int(11) NOT NULL,
-                                `autoConfig` int(11) NOT NULL,
-                                `secret` varchar(50) NOT NULL,
-                                `streamNoneReaderDelayMS` int(11) NOT NULL,
-                                `rtpEnable` int(11) NOT NULL,
-                                `rtpPortRange` varchar(50) NOT NULL,
-                                `sendRtpPortRange` varchar(50) NOT NULL,
-                                `recordAssistPort` int(11) NOT NULL,
-                                `defaultServer` int(11) NOT NULL,
-                                `createTime` varchar(50) NOT NULL,
-                                `updateTime` varchar(50) NOT NULL,
-                                `hookAliveInterval` int(11) NOT NULL,
-                                PRIMARY KEY (`id`) USING BTREE,
-                                UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `httpPort` int NOT NULL,
+  `httpSSlPort` int NOT NULL,
+  `rtmpPort` int NOT NULL,
+  `rtmpSSlPort` int NOT NULL,
+  `rtpProxyPort` int NOT NULL,
+  `rtspPort` int NOT NULL,
+  `rtspSSLPort` int NOT NULL,
+  `autoConfig` int NOT NULL,
+  `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `streamNoneReaderDelayMS` int NOT NULL,
+  `rtpEnable` int NOT NULL,
+  `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `recordAssistPort` int NOT NULL,
+  `defaultServer` int 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,
+  `hookAliveInterval` int NOT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -297,36 +302,36 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `parent_platform`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `parent_platform` (
-                                   `id` int(11) NOT NULL AUTO_INCREMENT,
-                                   `enable` int(11) DEFAULT NULL,
-                                   `name` varchar(255) DEFAULT NULL,
-                                   `serverGBId` varchar(50) NOT NULL,
-                                   `serverGBDomain` varchar(50) DEFAULT NULL,
-                                   `serverIP` varchar(50) DEFAULT NULL,
-                                   `serverPort` int(11) DEFAULT NULL,
-                                   `deviceGBId` varchar(50) NOT NULL,
-                                   `deviceIp` varchar(50) DEFAULT NULL,
-                                   `devicePort` varchar(50) DEFAULT NULL,
-                                   `username` varchar(255) DEFAULT NULL,
-                                   `password` varchar(50) DEFAULT NULL,
-                                   `expires` varchar(50) DEFAULT NULL,
-                                   `keepTimeout` varchar(50) DEFAULT NULL,
-                                   `transport` varchar(50) DEFAULT NULL,
-                                   `characterSet` varchar(50) DEFAULT NULL,
-                                   `catalogId` varchar(50) NOT NULL,
-                                   `ptz` int(11) DEFAULT NULL,
-                                   `rtcp` int(11) DEFAULT NULL,
-                                   `status` bit(1) DEFAULT NULL,
-                                   `shareAllLiveStream` int(11) DEFAULT NULL,
-                                   `startOfflinePush` int(11) DEFAULT '0',
-                                   `administrativeDivision` varchar(50) NOT NULL,
-                                   `catalogGroup` int(11) DEFAULT '1',
-                                   PRIMARY KEY (`id`),
-                                   UNIQUE KEY `parent_platform_id_uindex` (`id`),
-                                   UNIQUE KEY `parent_platform_pk` (`serverGBId`)
-) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `enable` int DEFAULT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `serverPort` int DEFAULT NULL,
+  `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `ptz` int DEFAULT NULL,
+  `rtcp` int DEFAULT NULL,
+  `status` bit(1) DEFAULT NULL,
+  `shareAllLiveStream` int DEFAULT NULL,
+  `startOfflinePush` int DEFAULT '0',
+  `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `catalogGroup` int DEFAULT '1',
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `parent_platform_id_uindex` (`id`) USING BTREE,
+  UNIQUE KEY `parent_platform_pk` (`serverGBId`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -344,14 +349,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `platform_catalog`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `platform_catalog` (
-                                    `id` varchar(50) NOT NULL,
-                                    `platformId` varchar(50) NOT NULL,
-                                    `name` varchar(255) NOT NULL,
-                                    `parentId` varchar(50) DEFAULT NULL,
-                                    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -369,14 +374,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `platform_gb_channel`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `platform_gb_channel` (
-                                       `id` int(11) NOT NULL AUTO_INCREMENT,
-                                       `platformId` varchar(50) NOT NULL,
-                                       `catalogId` varchar(50) NOT NULL,
-                                       `deviceChannelId` int(11) NOT NULL,
-                                       PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=250 DEFAULT CHARSET=utf8mb4;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `deviceChannelId` int NOT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=4889 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -394,15 +399,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `platform_gb_stream`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `platform_gb_stream` (
-                                      `platformId` varchar(50) NOT NULL,
-                                      `catalogId` varchar(50) NOT NULL,
-                                      `gbStreamId` int(11) NOT NULL,
-                                      `id` int(11) NOT NULL AUTO_INCREMENT,
-                                      PRIMARY KEY (`id`),
-                                      UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`)
-) ENGINE=InnoDB AUTO_INCREMENT=301210 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `platformId` 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,
+  `id` int NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=302077 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -420,29 +425,29 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stream_proxy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `stream_proxy` (
-                                `id` int(11) NOT NULL AUTO_INCREMENT,
-                                `type` varchar(50) NOT NULL,
-                                `app` varchar(255) NOT NULL,
-                                `stream` varchar(255) NOT NULL,
-                                `url` varchar(255) DEFAULT NULL,
-                                `src_url` varchar(255) DEFAULT NULL,
-                                `dst_url` varchar(255) DEFAULT NULL,
-                                `timeout_ms` int(11) DEFAULT NULL,
-                                `ffmpeg_cmd_key` varchar(255) DEFAULT NULL,
-                                `rtp_type` varchar(50) DEFAULT NULL,
-                                `mediaServerId` varchar(50) DEFAULT NULL,
-                                `enable_hls` bit(1) DEFAULT NULL,
-                                `enable_mp4` bit(1) DEFAULT NULL,
-                                `enable` bit(1) NOT NULL,
-                                `status` bit(1) NOT NULL,
-                                `enable_remove_none_reader` bit(1) NOT NULL,
-                                `createTime` varchar(50) NOT NULL,
-                                `name` varchar(255) DEFAULT NULL,
-                                PRIMARY KEY (`id`),
-                                UNIQUE KEY `stream_proxy_pk` (`app`,`stream`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `type` varchar(50) 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,
+  `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `src_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `dst_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `timeout_ms` int DEFAULT NULL,
+  `ffmpeg_cmd_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `rtp_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `enable_hls` bit(1) DEFAULT NULL,
+  `enable_mp4` bit(1) DEFAULT NULL,
+  `enable` bit(1) NOT NULL,
+  `status` bit(1) NOT NULL,
+  `enable_remove_none_reader` bit(1) NOT NULL,
+  `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `stream_proxy_pk` (`app`,`stream`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -460,21 +465,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stream_push`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `stream_push` (
-                               `id` int(11) NOT NULL AUTO_INCREMENT,
-                               `app` varchar(255) NOT NULL,
-                               `stream` varchar(255) NOT NULL,
-                               `totalReaderCount` varchar(50) DEFAULT NULL,
-                               `originType` int(11) DEFAULT NULL,
-                               `originTypeStr` varchar(50) DEFAULT NULL,
-                               `createStamp` bigint(20) DEFAULT NULL,
-                               `aliveSecond` int(11) DEFAULT NULL,
-                               `mediaServerId` varchar(50) DEFAULT NULL,
-                               `serverId` varchar(50) not NULL,
-                               PRIMARY KEY (`id`),
-                               UNIQUE KEY `stream_push_pk` (`app`,`stream`)
-) ENGINE=InnoDB AUTO_INCREMENT=300838 DEFAULT CHARSET=utf8mb4;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `originType` int DEFAULT NULL,
+  `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `createStamp` bigint DEFAULT NULL,
+  `aliveSecond` int DEFAULT NULL,
+  `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `serverId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `stream_push_pk` (`app`,`stream`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=305291 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -492,17 +497,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `user`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `user` (
-                        `id` int(11) NOT NULL AUTO_INCREMENT,
-                        `username` varchar(255) NOT NULL,
-                        `password` varchar(255) NOT NULL,
-                        `roleId` int(11) NOT NULL,
-                        `createTime` varchar(50) NOT NULL,
-                        `updateTime` varchar(50) NOT NULL,
-                        PRIMARY KEY (`id`) USING BTREE,
-                        UNIQUE KEY `user_username_uindex` (`username`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `roleId` int 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,
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `user_username_uindex` (`username`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -511,8 +516,7 @@ CREATE TABLE `user` (
 
 LOCK TABLES `user` WRITE;
 /*!40000 ALTER TABLE `user` DISABLE KEYS */;
-INSERT INTO `user` VALUES
-    (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57');
+INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57');
 /*!40000 ALTER TABLE `user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -522,15 +526,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `user_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `user_role` (
-                             `id` int(11) NOT NULL AUTO_INCREMENT,
-                             `name` varchar(50) NOT NULL,
-                             `authority` varchar(50) NOT NULL,
-                             `createTime` varchar(50) NOT NULL,
-                             `updateTime` varchar(50) NOT NULL,
-                             PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  `id` int NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `authority` 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,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -539,8 +543,7 @@ CREATE TABLE `user_role` (
 
 LOCK TABLES `user_role` WRITE;
 /*!40000 ALTER TABLE `user_role` DISABLE KEYS */;
-INSERT INTO `user_role` VALUES
-    (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
+INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
 /*!40000 ALTER TABLE `user_role` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -553,4 +556,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2022-04-18 10:50:27
+-- Dump completed on 2022-06-26 17:33:30

sql/update.sql

@@ -17,7 +17,10 @@ alter table stream_push
     add serverId varchar(50) not null;
 alter table device
     add geoCoordSys varchar(50) not null;
+alter table device
+    add treeType varchar(50) not null;
 update device set device.geoCoordSys='WGS84';
+update device set device.treeType='CivilCode';
 alter table device_channel
     add longitudeGcj02 double default null;
 alter table device_channel
@@ -26,4 +29,6 @@ alter table device_channel
     add longitudeWgs84 double default null;
 alter table device_channel
     add latitudeWgs84 double default null;
+alter table device_channel
+    add businessGroupId varchar(50) default null;
 

src/main/java/com/genersoft/iot/vmp/gb28181/bean/ChannelIdType.java

@@ -0,0 +1,23 @@
+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";
+}

src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java

@@ -138,6 +138,11 @@ public class Device {
 	 */
 	private String geoCoordSys;
 
+	/**
+	 * 树类型 国标规定了两种树的展现方式 行政区划：CivilCode 和业务分组:BusinessGroup
+	 */
+	private String treeType;
+
 
 	public String getDeviceId() {
 		return deviceId;
@@ -339,4 +344,12 @@ public class Device {
 		this.geoCoordSys = geoCoordSys;
 	}
 
+
+	public String getTreeType() {
+		return treeType;
+	}
+
+	public void setTreeType(String treeType) {
+		this.treeType = treeType;
+	}
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java

@@ -194,6 +194,11 @@ public class DeviceChannel {
 	 */
 	private int channelType;
 
+	/**
+	 * 业务分组
+	 */
+	private String businessGroupId;
+
 	public int getId() {
 		return id;
 	}
@@ -506,4 +511,12 @@ public class DeviceChannel {
 	public void setChannelType(int channelType) {
 		this.channelType = channelType;
 	}
+
+	public String getBusinessGroupId() {
+		return businessGroupId;
+	}
+
+	public void setBusinessGroupId(String businessGroupId) {
+		this.businessGroupId = businessGroupId;
+	}
 }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@@ -406,7 +406,10 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
         if (parentPlatform == null) {
             return false;
         }
-        logger.info("[发送 移动位置订阅] {}/{}->{},{}", parentPlatform.getServerGBId(), gpsMsgInfo.getId(), gpsMsgInfo.getLng(), gpsMsgInfo.getLat());
+        if (logger.isDebugEnabled()) {
+            logger.debug("[发送 移动位置订阅] {}/{}->{},{}", parentPlatform.getServerGBId(), gpsMsgInfo.getId(), gpsMsgInfo.getLng(), gpsMsgInfo.getLat());
+        }
+
         try {
             String characterSet = parentPlatform.getCharacterSet();
             StringBuffer deviceStatusXml = new StringBuffer(600);

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

@@ -141,6 +141,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
                 device.setStreamMode("UDP");
                 device.setCharset("GB2312");
                 device.setGeoCoordSys("WGS84");
+                device.setTreeType("CivilCode");
                 device.setDeviceId(deviceId);
             }
             device.setIp(received);

src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java

@@ -249,23 +249,26 @@ public class XmlUtil {
             }else {
                 deviceChannel.setParentId(parentId);
             }
-        }else {
-            if (deviceChannel.getChannelId().length() <= 10) { // 此时为行政区划, 上下级行政区划使用DeviceId关联
-                deviceChannel.setParentId(deviceChannel.getChannelId().substring(0, deviceChannel.getChannelId().length() - 2));
-            }else if (deviceChannel.getChannelId().length() == 20) {
-                if (Integer.parseInt(deviceChannel.getChannelId().substring(10, 13)) == 216) { // 虚拟组织
-                    deviceChannel.setParentId(businessGroupID);
-                }else if (Integer.parseInt(device.getDeviceId().substring(10, 13) )== 118) {//NVR 如果上级设备编号是NVR则直接将NVR的编号设置给通道的上级编号
-                    deviceChannel.setParentId(device.getDeviceId());
-                }else if (deviceChannel.getCivilCode() != null) {
-                    // 设备， 无parentId的20位是使用CivilCode表示上级的设备，
-                    // 注：215 业务分组是需要有parentId的
-                    deviceChannel.setParentId(deviceChannel.getCivilCode());
-                }
-            }else {
-                deviceChannel.setParentId(deviceChannel.getDeviceId());
-            }
         }
+        deviceChannel.setBusinessGroupId(businessGroupID);
+
+//        else {
+//            if (deviceChannel.getChannelId().length() <= 10) { // 此时为行政区划, 上下级行政区划使用DeviceId关联
+//                deviceChannel.setParentId(deviceChannel.getChannelId().substring(0, deviceChannel.getChannelId().length() - 2));
+//            }else if (deviceChannel.getChannelId().length() == 20) {
+//                if (Integer.parseInt(deviceChannel.getChannelId().substring(10, 13)) == 216) { // 虚拟组织
+//                    deviceChannel.setBusinessGroupId(businessGroupID);
+//                }else if (Integer.parseInt(device.getDeviceId().substring(10, 13) )== 118) {//NVR 如果上级设备编号是NVR则直接将NVR的编号设置给通道的上级编号
+//                    deviceChannel.setParentId(device.getDeviceId());
+//                }else if (deviceChannel.getCivilCode() != null) {
+//                    // 设备， 无parentId的20位是使用CivilCode表示上级的设备，
+//                    // 注：215 业务分组是需要有parentId的
+//                    deviceChannel.setParentId(deviceChannel.getCivilCode());
+//                }
+//            }else {
+//                deviceChannel.setParentId(deviceChannel.getDeviceId());
+//            }
+//        }
 
         if (XmlUtil.getText(itemDevice, "SafetyWay") == null
                 || XmlUtil.getText(itemDevice, "SafetyWay") == "") {

src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java

@@ -1,7 +1,9 @@
 package com.genersoft.iot.vmp.service;
 
 import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
 
 import java.util.List;
 
@@ -110,4 +112,21 @@ public interface IDeviceService {
      * @param device 设备信息
      */
     void updateDevice(Device device);
+
+    /**
+     * 树形查询接口
+     * @param deviceId 设备ID
+     * @param parentId 父ID
+     * @param onlyCatalog 只获取目录
+     * @return
+     */
+    List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog);
+
+    /**
+     * 查询树节点下的通道
+     * @param deviceId 设备ID
+     * @param parentId 父ID
+     * @return
+     */
+    List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId);
 }

src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java

@@ -1,9 +1,7 @@
 package com.genersoft.iot.vmp.service.impl;
 
 import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
 import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
@@ -12,20 +10,23 @@ import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
 import com.genersoft.iot.vmp.service.IDeviceService;
 import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
 import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
-import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
 import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
 import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.support.incrementer.AbstractIdentityColumnMaxValueIncrementer;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -341,4 +342,180 @@ public class DeviceServiceImpl implements IDeviceService {
        }
         storage.updateChannels(device.getDeviceId(), deviceChannels);
     }
+
+
+    @Override
+    public List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog) {
+        Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+        if (device == null) {
+            return null;
+        }
+        if (parentId == null || parentId.equals(deviceId)) {
+            // 字根节点开始查询
+            List<DeviceChannel> rootNodes = getRootNodes(deviceId, "CivilCode".equals(device.getTreeType()), true, !onlyCatalog);
+            return transportChannelsToTree(rootNodes, "");
+        }
+
+        if ("CivilCode".equals(device.getTreeType())) {
+            if (parentId.length()%2 != 0) {
+                return null;
+            }
+            // 使用行政区划展示树
+            if (parentId.length() > 10) {
+                // TODO 可能是行政区划与业务分组混杂的情形
+                return null;
+            }
+
+            if (parentId.length() == 10 ) {
+                if (onlyCatalog) {
+                    return null;
+                }
+                // parentId为行业编码， 其下不会再有行政区划
+                List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+                List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(channels, parentId);
+                return trees;
+            }
+            // 查询其下的行政区划和摄像机
+            List<DeviceChannel> channelsForCivilCode = deviceChannelMapper.getChannelsWithCivilCodeAndLength(deviceId, parentId, parentId.length() + 2);
+            if (!onlyCatalog) {
+                List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+                channelsForCivilCode.addAll(channels);
+            }
+            List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(channelsForCivilCode, parentId);
+            return trees;
+
+        }
+        // 使用业务分组展示树
+        if ("BusinessGroup".equals(device.getTreeType())) {
+            if (parentId.length() < 14 ) {
+                return null;
+            }
+            List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, parentId, null, null, null);
+            List<BaseTree<DeviceChannel>> trees = transportChannelsToTree(deviceChannels, parentId);
+            return trees;
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId) {
+        Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+        if (device == null) {
+            return null;
+        }
+        if (parentId == null || parentId.equals(deviceId)) {
+            // 字根节点开始查询
+            List<DeviceChannel> rootNodes = getRootNodes(deviceId, "CivilCode".equals(device.getTreeType()), false, true);
+            return rootNodes;
+        }
+
+        if ("CivilCode".equals(device.getTreeType())) {
+            if (parentId.length()%2 != 0) {
+                return null;
+            }
+            // 使用行政区划展示树
+            if (parentId.length() > 10) {
+                // TODO 可能是行政区划与业务分组混杂的情形
+                return null;
+            }
+
+            if (parentId.length() == 10 ) {
+                // parentId为行业编码， 其下不会再有行政区划
+                List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+                return channels;
+            }
+            // 查询其下的行政区划和摄像机
+            List<DeviceChannel> channels = deviceChannelMapper.getChannelsByCivilCode(deviceId, parentId);
+            return channels;
+
+        }
+        // 使用业务分组展示树
+        if ("BusinessGroup".equals(device.getTreeType())) {
+            if (parentId.length() < 14 ) {
+                return null;
+            }
+            List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, parentId, null, null, null);
+            return deviceChannels;
+        }
+
+        return null;
+    }
+
+    private List<BaseTree<DeviceChannel>> transportChannelsToTree(List<DeviceChannel> channels, String parentId) {
+        if (channels == null) {
+            return null;
+        }
+        List<BaseTree<DeviceChannel>> treeNotes = new ArrayList<>();
+        if (channels.size() == 0) {
+            return treeNotes;
+        }
+        for (DeviceChannel channel : channels) {
+
+            BaseTree<DeviceChannel> node = new BaseTree<>();
+            node.setId(channel.getChannelId());
+            node.setDeviceId(channel.getDeviceId());
+            node.setName(channel.getName());
+            node.setPid(parentId);
+            node.setBasicData(channel);
+            node.setParent(false);
+            if (channel.getChannelId().length() > 8) {
+                String gbCodeType = channel.getChannelId().substring(10, 13);
+                node.setParent(gbCodeType.equals(ChannelIdType.BUSINESS_GROUP) || gbCodeType.equals(ChannelIdType.VIRTUAL_ORGANIZATION) );
+            }else {
+                node.setParent(true);
+            }
+            treeNotes.add(node);
+        }
+        Collections.sort(treeNotes);
+        return treeNotes;
+    }
+
+    private List<DeviceChannel> getRootNodes(String deviceId, boolean isCivilCode, boolean haveCatalog, boolean haveChannel) {
+        if (!haveCatalog && !haveChannel) {
+            return null;
+        }
+        List<DeviceChannel> result = new ArrayList<>();
+        if (isCivilCode) {
+            // 使用行政区划
+            Integer length= deviceChannelMapper.getChannelMinLength(deviceId);
+            if (length == null) {
+                return null;
+            }
+            if (length <= 10) {
+                if (haveCatalog) {
+                    List<DeviceChannel> provinceNode = deviceChannelMapper.getChannelsWithCivilCodeAndLength(deviceId, null, length);
+                    if (provinceNode != null && provinceNode.size() > 0) {
+                        result.addAll(provinceNode);
+                    }
+                }
+
+                if (haveChannel) {
+                    // 查询那些civilCode不在通道中的不规范通道，放置在根目录
+                    List<DeviceChannel> nonstandardNode = deviceChannelMapper.getChannelWithoutCiviCode(deviceId);
+                    if (nonstandardNode != null && nonstandardNode.size() > 0) {
+                        result.addAll(nonstandardNode);
+                    }
+                }
+            }else {
+                if (haveChannel) {
+                    List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, null, null, null, null);
+                    if (deviceChannels != null && deviceChannels.size() > 0) {
+                        result.addAll(deviceChannels);
+                    }
+                }
+            }
+
+        }else {
+            // 使用业务分组+虚拟组织
+
+            // 只获取业务分组
+            List<DeviceChannel> deviceChannels = deviceChannelMapper.getBusinessGroups(deviceId, ChannelIdType.BUSINESS_GROUP);
+            if (deviceChannels != null && deviceChannels.size() > 0) {
+                result.addAll(deviceChannels);
+            }
+        }
+        return result;
+    }
+
 }

src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -142,7 +142,7 @@ public class PlayServiceImpl implements IPlayService {
         result.onCompletion(()->{
             // 点播结束时调用截图接口
             // TODO 应该在上流时调用更好，结束也可能是错误结束
-            String path =  "static/static/snap/";
+            String path =  "snap";
             String fileName =  deviceId + "_" + channelId + ".jpg";
             ResponseEntity responseEntity =  (ResponseEntity)result.getResult();
             if (responseEntity != null && responseEntity.getStatusCode() == HttpStatus.OK) {

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.storager.dao;
 
+import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannelInPlatform;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
@@ -17,10 +18,12 @@ public interface DeviceChannelMapper {
 
     @Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
             "address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
-            "ipAddress, port, password, PTZType, status, streamId, longitude, latitude, longitudeGcj02, latitudeGcj02, longitudeWgs84, latitudeWgs84, createTime, updateTime) " +
+            "ipAddress, port, password, PTZType, status, streamId, longitude, latitude, longitudeGcj02, latitudeGcj02, " +
+            "longitudeWgs84, latitudeWgs84, createTime, updateTime, businessGroupId) " +
             "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
             "'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
-            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}', ${longitude}, ${latitude}, ${longitudeGcj02}, ${latitudeGcj02}, ${longitudeWgs84}, ${latitudeWgs84},'${createTime}', '${updateTime}')")
+            "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}', ${longitude}, ${latitude}, ${longitudeGcj02}, " +
+            "${latitudeGcj02}, ${longitudeWgs84}, ${latitudeWgs84},'${createTime}', '${updateTime}', '${businessGroupId}')")
     int add(DeviceChannel channel);
 
     @Update(value = {" <script>" +
@@ -54,6 +57,7 @@ public interface DeviceChannelMapper {
             "<if test='latitudeGcj02 != null'>, latitudeGcj02=${latitudeGcj02}</if>" +
             "<if test='longitudeWgs84 != null'>, longitudeWgs84=${longitudeWgs84}</if>" +
             "<if test='latitudeWgs84 != null'>, latitudeWgs84=${latitudeWgs84}</if>" +
+            "<if test='businessGroupId != null'>, businessGroupId=#{businessGroupId}</if>" +
             "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
             " </script>"})
     int update(DeviceChannel channel);
@@ -143,7 +147,7 @@ public interface DeviceChannelMapper {
             "(channelId, deviceId, name, manufacture, model, owner, civilCode, block, subCount, " +
             "  address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
             "  ipAddress, port, password, PTZType, status, streamId, longitude, latitude, longitudeGcj02, latitudeGcj02, " +
-            "  longitudeWgs84, latitudeWgs84, createTime, updateTime) " +
+            "  longitudeWgs84, latitudeWgs84, createTime, updateTime, businessGroupId) " +
             "values " +
             "<foreach collection='addChannels' index='index' item='item' separator=','> " +
             "('${item.channelId}', '${item.deviceId}', '${item.name}', '${item.manufacture}', '${item.model}', " +
@@ -152,7 +156,8 @@ public interface DeviceChannelMapper {
             "'${item.certNum}', ${item.certifiable}, ${item.errCode}, '${item.secrecy}', " +
             "'${item.ipAddress}', ${item.port}, '${item.password}', ${item.PTZType}, ${item.status}, " +
             "'${item.streamId}', ${item.longitude}, ${item.latitude},${item.longitudeGcj02}, " +
-            "${item.latitudeGcj02},${item.longitudeWgs84}, ${item.latitudeWgs84},'${item.createTime}', '${item.updateTime}')" +
+            "${item.latitudeGcj02},${item.longitudeWgs84}, ${item.latitudeWgs84},'${item.createTime}', '${item.updateTime}', " +
+            "'${item.businessGroupId}') " +
             "</foreach> " +
             "ON DUPLICATE KEY UPDATE " +
             "updateTime=VALUES(updateTime), " +
@@ -183,7 +188,8 @@ public interface DeviceChannelMapper {
             "longitudeGcj02=VALUES(longitudeGcj02), " +
             "latitudeGcj02=VALUES(latitudeGcj02), " +
             "longitudeWgs84=VALUES(longitudeWgs84), " +
-            "latitudeWgs84=VALUES(latitudeWgs84) " +
+            "latitudeWgs84=VALUES(latitudeWgs84), " +
+            "businessGroupId=VALUES(businessGroupId) " +
             "</script>")
     int batchAdd(List<DeviceChannel> addChannels);
 
@@ -221,6 +227,7 @@ public interface DeviceChannelMapper {
             "<if test='item.latitudeGcj02 != null'>, latitudeGcj02=${item.latitudeGcj02}</if>" +
             "<if test='item.longitudeWgs84 != null'>, longitudeWgs84=${item.longitudeWgs84}</if>" +
             "<if test='item.latitudeWgs84 != null'>, latitudeWgs84=${item.latitudeWgs84}</if>" +
+            "<if test='item.businessGroupId != null'>, businessGroupId=#{item.businessGroupId}</if>" +
             "WHERE deviceId='${item.deviceId}' AND channelId='${item.channelId}'"+
             "</foreach>" +
             "</script>"})
@@ -277,4 +284,33 @@ public interface DeviceChannelMapper {
 
     @Select("select * from device_channel where longitude*latitude > 0 and deviceId = #{deviceId}")
     List<DeviceChannel> getAllChannelWithCoordinate(String deviceId);
+
+
+    @Select(value = {" <script>" +
+            "select * " +
+            "from device_channel " +
+            "where deviceId=#{deviceId}" +
+            " <if test='parentId != null' > and left(channelId, ${parentId.length()}) = #{parentId}</if>" +
+            " <if test='length != null' > and length(channelId)=${length}</if>" +
+            " </script>"})
+    List<DeviceChannel> getChannelsWithCivilCodeAndLength(String deviceId, String parentId, Integer length);
+
+    @Select(value = {" <script>" +
+            "select * " +
+            "from device_channel " +
+            "where deviceId=#{deviceId} and length(channelId)>14 and civilCode=#{parentId}" +
+            " </script>"})
+    List<DeviceChannel> getChannelsByCivilCode(String deviceId, String parentId);
+
+    @Select("select min(length(channelId)) as minLength " +
+            "from device_channel " +
+            "where deviceId=#{deviceId}")
+    Integer getChannelMinLength(String deviceId);
+
+    @Select("select * from device_channel where deviceId=#{deviceId} and civilCode not in " +
+            "(select civilCode from device_channel where deviceId=#{deviceId} group by civilCode)")
+    List<DeviceChannel> getChannelWithoutCiviCode(String deviceId);
+
+    @Select("select * from device_channel where deviceId=#{deviceId} and SUBSTRING(channelId, 11, 3)=#{typeCode}")
+    List<DeviceChannel> getBusinessGroups(String deviceId, String typeCode);
 }

src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -39,6 +39,7 @@ public interface DeviceMapper {
                 "subscribeCycleForAlarm," +
                 "ssrcCheck," +
                 "geoCoordSys," +
+                "treeType," +
                 "online" +
             ") VALUES (" +
                 "#{deviceId}," +
@@ -63,6 +64,7 @@ public interface DeviceMapper {
                 "#{subscribeCycleForAlarm}," +
                 "#{ssrcCheck}," +
                 "#{geoCoordSys}," +
+                "#{treeType}," +
                 "#{online}" +
             ")")
     int add(Device device);
@@ -90,6 +92,7 @@ public interface DeviceMapper {
                 "<if test=\"subscribeCycleForAlarm != null\">, subscribeCycleForAlarm=${subscribeCycleForAlarm}</if>" +
                 "<if test=\"ssrcCheck != null\">, ssrcCheck=${ssrcCheck}</if>" +
                 "<if test=\"geoCoordSys != null\">, geoCoordSys=#{geoCoordSys}</if>" +
+                "<if test=\"treeType != null\">, treeType=#{treeType}</if>" +
                 "WHERE deviceId='${deviceId}'"+
             " </script>"})
     int update(Device device);

src/main/java/com/genersoft/iot/vmp/vmanager/bean/BaseTree.java

@@ -0,0 +1,87 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.text.Collator;
+import java.util.Comparator;
+
+/**
+ * @author lin
+ */
+public class BaseTree<T> implements Comparable<BaseTree>{
+    private String id;
+
+    private String deviceId;
+    private String pid;
+    private String name;
+    private boolean parent;
+
+    private T basicData;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public T getBasicData() {
+        return basicData;
+    }
+
+    public void setBasicData(T basicData) {
+        this.basicData = basicData;
+    }
+
+    public boolean isParent() {
+        return parent;
+    }
+
+    public void setParent(boolean parent) {
+        this.parent = parent;
+    }
+
+    @Override
+    public int compareTo(@NotNull BaseTree treeNode) {
+        if (this.parent || treeNode.isParent()) {
+            if (!this.parent && !treeNode.isParent()) {
+                Comparator cmp = Collator.getInstance(java.util.Locale.CHINA);
+                return cmp.compare(treeNode.getName(), this.getName());
+            }else {
+                if (this.isParent()) {
+                    return 1;
+                }else {
+                    return -1;
+                }
+            }
+        }else{
+            Comparator cmp = Collator.getInstance(java.util.Locale.CHINA);
+            return cmp.compare(treeNode.getName(), this.getName());
+        }
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

@@ -15,6 +15,7 @@ import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.service.IDeviceService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -479,4 +480,99 @@ public class DeviceQuery {
 			resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
 		}
 	}
+
+	/**
+	 * 查询国标树
+	 * @param deviceId 设备ID
+	 * @param parentId 父ID
+	 * @param page 当前页
+	 * @param count 每页条数
+	 * @return 国标设备
+	 */
+	@ApiOperation("查询国标树")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "parentId", value = "父ID", required = false, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "onlyCatalog", value = "只获取目录", required = false, dataTypeClass = Boolean.class),
+			@ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
+			@ApiImplicitParam(name="count", value = "每页条数", required = true, dataTypeClass = Integer.class),
+	})
+	@GetMapping("/tree/{deviceId}")
+	public ResponseEntity<PageInfo> getTree(@PathVariable String deviceId, @RequestParam(required = false) String parentId, @RequestParam(required = false) Boolean onlyCatalog, int page, int count){
+
+
+		if (page <= 0) {
+			page = 1;
+		}
+		if (onlyCatalog == null) {
+			onlyCatalog = false;
+		}
+
+		List<BaseTree<DeviceChannel>> treeData = deviceService.queryVideoDeviceTree(deviceId, parentId, onlyCatalog);
+		if (treeData == null || (page - 1) * count > treeData.size()) {
+			PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
+			pageInfo.setPageNum(page);
+			pageInfo.setTotal(treeData == null? 0 : treeData.size());
+			pageInfo.setSize(0);
+			pageInfo.setList(new ArrayList<>());
+			return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+		}
+
+		int toIndex = Math.min(page * count, treeData.size());
+		// 处理分页
+		List<BaseTree<DeviceChannel>> trees = treeData.subList((page - 1) * count, toIndex);
+		PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
+		pageInfo.setPageNum(page);
+		pageInfo.setTotal(treeData.size());
+		pageInfo.setSize(trees.size());
+		pageInfo.setList(trees);
+
+		return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+	}
+
+
+	/**
+	 * 查询国标树下的通道
+	 * @param deviceId 设备ID
+	 * @param parentId 父ID
+	 * @param page 当前页
+	 * @param count 每页条数
+	 * @return 国标设备
+	 */
+	@ApiOperation("查询国标树下的通道")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "parentId", value = "父ID", required = false, dataTypeClass = String.class),
+			@ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
+			@ApiImplicitParam(name="count", value = "每页条数", required = true, dataTypeClass = Integer.class),
+	})
+	@GetMapping("/tree/channel/{deviceId}")
+	public ResponseEntity<PageInfo> getChannelInTreeNode(@PathVariable String deviceId, @RequestParam(required = false) String parentId, int page, int count){
+
+
+		if (page <= 0) {
+			page = 1;
+		}
+
+		List<DeviceChannel> treeData = deviceService.queryVideoDeviceInTreeNode(deviceId, parentId);
+		if (treeData == null || (page - 1) * count > treeData.size()) {
+			PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
+			pageInfo.setPageNum(page);
+			pageInfo.setTotal(treeData == null? 0 : treeData.size());
+			pageInfo.setSize(0);
+			pageInfo.setList(new ArrayList<>());
+			return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+		}
+
+		int toIndex = Math.min(page * count, treeData.size());
+		// 处理分页
+		List<DeviceChannel> trees = treeData.subList((page - 1) * count, toIndex);
+		PageInfo<DeviceChannel> pageInfo = new PageInfo<>();
+		pageInfo.setPageNum(page);
+		pageInfo.setTotal(treeData.size());
+		pageInfo.setSize(trees.size());
+		pageInfo.setList(trees);
+
+		return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+	}
 }

src/main/resources/logback-spring-local.xml

@@ -11,6 +11,11 @@
 			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
 		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<!--与ThresholdFilter的区别,允许onmatch-->
+			<!--设置日志级别 接收info级别的日志-->
+			<level>DEBUG</level>
+		</filter>
 	</appender>
 
 	<!-- 按照每天生成日志文件 DEBUG以上级别的日志,仅用于测试环境,正式环境为info级别以上的日志-->

web_src/package-lock.json

@@ -22,7 +22,9 @@
         "vue-clipboards": "^1.3.0",
         "vue-contextmenujs": "^1.3.13",
         "vue-cookies": "^1.7.4",
-        "vue-router": "^3.1.6"
+        "vue-giant-tree": "^0.1.5",
+        "vue-router": "^3.1.6",
+        "vue-ztree-2.0": "^1.0.4"
       },
       "devDependencies": {
         "autoprefixer": "^7.1.2",
@@ -116,6 +118,17 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
+    "node_modules/@ztree/ztree_v3": {
+      "version": "3.5.48",
+      "resolved": "https://registry.npmmirror.com/@ztree/ztree_v3/-/ztree_v3-3.5.48.tgz",
+      "integrity": "sha512-4dSA1g26T3j/O3I89+r/Palg+a+xwMGRS1etZoggnCGBPoOrwW8VGA3zitJCK/Yd7eEMX+LfKTRJjEGiWpoN3w==",
+      "dependencies": {
+        "jquery": ">=1.4.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz",
@@ -6034,6 +6047,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
     "node_modules/js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1599897619557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
@@ -13067,6 +13085,15 @@
       "resolved": "https://registry.npm.taobao.org/vue-cookies/download/vue-cookies-1.7.4.tgz?cache=0&sync_timestamp=1598941352058&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-cookies%2Fdownload%2Fvue-cookies-1.7.4.tgz",
       "integrity": "sha1-0kHQoEMdoHlYN2UdELTXPnyNPo0="
     },
+    "node_modules/vue-giant-tree": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmmirror.com/vue-giant-tree/-/vue-giant-tree-0.1.5.tgz",
+      "integrity": "sha512-P3KEHSZU2NkpWl6frss+sJLO0DLrtarMNLeTV/IGU2/w50rgrlKbKNr/ckK6BBVdWXAJYlYf6HUTNkKvGq5hlg==",
+      "dependencies": {
+        "@ztree/ztree_v3": "^3.5.44",
+        "jquery": "^3.5.1"
+      }
+    },
     "node_modules/vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
@@ -13174,6 +13201,11 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "node_modules/vue-ztree-2.0": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/vue-ztree-2.0/-/vue-ztree-2.0-1.0.4.tgz",
+      "integrity": "sha512-d7KZsquEYpM0jD/k1uwOMFCd08L6++7zwRESaL2sF43OtRFCump8BxcLpjusBIHpFadPvOSMMnK5P41y+ZiTlA=="
+    },
     "node_modules/watchpack": {
       "version": "1.7.4",
       "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.4.tgz?cache=0&sync_timestamp=1600385388649&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.4.tgz",
@@ -14418,6 +14450,14 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
+    "@ztree/ztree_v3": {
+      "version": "3.5.48",
+      "resolved": "https://registry.npmmirror.com/@ztree/ztree_v3/-/ztree_v3-3.5.48.tgz",
+      "integrity": "sha512-4dSA1g26T3j/O3I89+r/Palg+a+xwMGRS1etZoggnCGBPoOrwW8VGA3zitJCK/Yd7eEMX+LfKTRJjEGiWpoN3w==",
+      "requires": {
+        "jquery": ">=1.4.4"
+      }
+    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz",
@@ -19487,6 +19527,11 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
+    "jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
     "js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1599897619557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
@@ -25351,6 +25396,15 @@
       "resolved": "https://registry.npm.taobao.org/vue-cookies/download/vue-cookies-1.7.4.tgz?cache=0&sync_timestamp=1598941352058&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-cookies%2Fdownload%2Fvue-cookies-1.7.4.tgz",
       "integrity": "sha1-0kHQoEMdoHlYN2UdELTXPnyNPo0="
     },
+    "vue-giant-tree": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmmirror.com/vue-giant-tree/-/vue-giant-tree-0.1.5.tgz",
+      "integrity": "sha512-P3KEHSZU2NkpWl6frss+sJLO0DLrtarMNLeTV/IGU2/w50rgrlKbKNr/ckK6BBVdWXAJYlYf6HUTNkKvGq5hlg==",
+      "requires": {
+        "@ztree/ztree_v3": "^3.5.44",
+        "jquery": "^3.5.1"
+      }
+    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz",
@@ -25447,6 +25501,11 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "vue-ztree-2.0": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/vue-ztree-2.0/-/vue-ztree-2.0-1.0.4.tgz",
+      "integrity": "sha512-d7KZsquEYpM0jD/k1uwOMFCd08L6++7zwRESaL2sF43OtRFCump8BxcLpjusBIHpFadPvOSMMnK5P41y+ZiTlA=="
+    },
     "watchpack": {
       "version": "1.7.4",
       "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.4.tgz?cache=0&sync_timestamp=1600385388649&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.4.tgz",

web_src/package.json

@@ -24,7 +24,9 @@
     "vue-clipboards": "^1.3.0",
     "vue-contextmenujs": "^1.3.13",
     "vue-cookies": "^1.7.4",
-    "vue-router": "^3.1.6"
+    "vue-giant-tree": "^0.1.5",
+    "vue-router": "^3.1.6",
+    "vue-ztree-2.0": "^1.0.4"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

web_src/src/components/DeviceList.vue

@@ -56,11 +56,11 @@
                      @mouseover="getTooltipContent(scope.row.deviceId)">刷新
           </el-button>
           <el-divider direction="vertical"></el-divider>
-          <el-button type="text" size="medium" icon="el-icon-video-camera" v-bind:disabled="scope.row.online==0"
+          <el-button type="text" size="medium" icon="el-icon-video-camera"
                      @click="showChannelList(scope.row)">通道
           </el-button>
           <el-divider direction="vertical"></el-divider>
-          <el-button size="medium" icon="el-icon-location" v-bind:disabled="scope.row.online==0" type="text"
+          <el-button size="medium" icon="el-icon-location" type="text"
                      @click="showDevicePosition(scope.row)">定位
           </el-button>
           <el-divider direction="vertical"></el-divider>
@@ -192,7 +192,7 @@ export default {
 
     },
     showChannelList: function (row) {
-      this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
+      this.$router.push(`/channelList/${row.deviceId}/0`);
     },
     showDevicePosition: function (row) {
       this.$router.push(`/map?deviceId=${row.deviceId}`);

web_src/src/components/channelList.vue

@@ -7,104 +7,116 @@
         通道列表
       </div>
       <div class="page-header-btn">
-      搜索:
-      <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="关键字"
-                prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>
+        <div v-if="!showTree" style="display: inline;">
+          搜索:
+          <el-input @input="search" style="margin-right: 1rem; width: auto;" size="mini" placeholder="关键字"
+                    prefix-icon="el-icon-search" v-model="searchSrt" clearable></el-input>
 
-      通道类型:
-      <el-select size="mini" @change="search" style="margin-right: 1rem;" v-model="channelType" placeholder="请选择"
-                 default-first-option>
-        <el-option label="全部" value=""></el-option>
-        <el-option label="设备" value="false"></el-option>
-        <el-option label="子目录" value="true"></el-option>
-      </el-select>
-      在线状态:
-      <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="请选择"
-                 default-first-option>
-        <el-option label="全部" value=""></el-option>
-        <el-option label="在线" value="true"></el-option>
-        <el-option label="离线" value="false"></el-option>
-      </el-select>
+          通道类型:
+          <el-select size="mini" @change="search" style="margin-right: 1rem;" v-model="channelType" placeholder="请选择"
+                     default-first-option>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="设备" value="false"></el-option>
+            <el-option label="子目录" value="true"></el-option>
+          </el-select>
+          在线状态:
+          <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="请选择"
+                     default-first-option>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="在线" value="true"></el-option>
+            <el-option label="离线" value="false"></el-option>
+          </el-select>
+        </div>
       <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
+      <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
+      <el-button v-if="!showTree"  icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
     </div>
   </div>
   <devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
-  <!--设备列表-->
-  <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header">
-    <el-table-column prop="channelId" label="通道编号" min-width="200">
-    </el-table-column>
-    <el-table-column prop="deviceId" label="设备编号" min-width="200">
-    </el-table-column>
-    <el-table-column prop="name" label="通道名称" min-width="200">
-    </el-table-column>
-    <el-table-column label="快照" min-width="120">
-      <template v-slot:default="scope">
-        <el-image
-          :src="getSnap(scope.row)"
-          :preview-src-list="getBigSnap(scope.row)"
-          @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
-          :fit="'contain'"
-          style="width: 60px">
-          <div slot="error" class="image-slot">
-            <i class="el-icon-picture-outline"></i>
-          </div>
-        </el-image>
-      </template>
-    </el-table-column>
-    <el-table-column prop="subCount" label="子节点数" min-width="120">
-    </el-table-column>
-    <el-table-column prop="manufacture" label="厂家" min-width="120">
-    </el-table-column>
-    <el-table-column label="位置信息"  min-width="200">
-      <template slot-scope="scope">
-        <span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span>
-        <span v-if="scope.row.longitude*scope.row.latitude === 0">无</span>
-      </template>
-    </el-table-column>
-    <el-table-column prop="ptztypeText" label="云台类型" min-width="120"/>
-    <el-table-column label="开启音频" min-width="120">
-      <template slot-scope="scope">
-        <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
-        </el-switch>
-      </template>
-    </el-table-column>
-    <el-table-column label="状态" min-width="120">
-      <template slot-scope="scope">
-        <div slot="reference" class="name-wrapper">
-          <el-tag size="medium" v-if="scope.row.status === 1">在线</el-tag>
-          <el-tag size="medium" type="info" v-if="scope.row.status === 0">离线</el-tag>
-        </div>
-      </template>
-    </el-table-column>
+  <el-container v-loading="isLoging" style="height: 82vh;">
+    <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree" >
+      <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent" ></DeviceTree>
+    </el-aside>
+    <el-main style="padding: 5px;">
+      <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header">
+        <el-table-column prop="channelId" label="通道编号" min-width="200">
+        </el-table-column>
+        <el-table-column prop="deviceId" label="设备编号" min-width="200">
+        </el-table-column>
+        <el-table-column prop="name" label="通道名称" min-width="200">
+        </el-table-column>
+        <el-table-column label="快照" min-width="120">
+          <template v-slot:default="scope">
+            <el-image
+              :src="getSnap(scope.row)"
+              :preview-src-list="getBigSnap(scope.row)"
+              @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
+              :fit="'contain'"
+              style="width: 60px">
+              <div slot="error" class="image-slot">
+                <i class="el-icon-picture-outline"></i>
+              </div>
+            </el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="subCount" label="子节点数" min-width="120">
+        </el-table-column>
+        <el-table-column prop="manufacture" label="厂家" min-width="120">
+        </el-table-column>
+        <el-table-column label="位置信息"  min-width="200">
+          <template slot-scope="scope">
+            <span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span>
+            <span v-if="scope.row.longitude*scope.row.latitude === 0">无</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="ptztypeText" label="云台类型" min-width="120"/>
+        <el-table-column label="开启音频" min-width="120">
+          <template slot-scope="scope">
+            <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="120">
+          <template slot-scope="scope">
+            <div slot="reference" class="name-wrapper">
+              <el-tag size="medium" v-if="scope.row.status === 1">在线</el-tag>
+              <el-tag size="medium" type="info" v-if="scope.row.status === 0">离线</el-tag>
+            </div>
+          </template>
+        </el-table-column>
 
 
-    <el-table-column label="操作" min-width="280" fixed="right">
-      <template slot-scope="scope">
-        <!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">播放</el-button> -->
-        <el-button size="medium" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">播放</el-button>
-        <el-button size="medium" icon="el-icon-switch-button" type="text"  style="color: #f56c6c" v-if="!!scope.row.streamId"
-                   @click="stopDevicePush(scope.row)">停止
-        </el-button>
-        <el-divider direction="vertical"></el-divider>
-        <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
-                   @click="changeSubchannel(scope.row)">查看
-        </el-button>
-        <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
-        <el-button size="medium" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">设备录像
-        </el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-  <el-pagination
-    style="float: right"
-    @size-change="handleSizeChange"
-    @current-change="currentChange"
-    :current-page="currentPage"
-    :page-size="count"
-    :page-sizes="[15, 25, 35, 50]"
-    layout="total, sizes, prev, pager, next"
-    :total="total">
-  </el-pagination>
+        <el-table-column label="操作" min-width="280" fixed="right">
+          <template slot-scope="scope">
+            <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">播放</el-button>
+            <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-switch-button" type="text"  style="color: #f56c6c" v-if="!!scope.row.streamId"
+                       @click="stopDevicePush(scope.row)">停止
+            </el-button>
+            <el-divider direction="vertical"></el-divider>
+            <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
+                       @click="changeSubchannel(scope.row)">查看
+            </el-button>
+            <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
+            <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">设备录像
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        style="float: right"
+        @size-change="handleSizeChange"
+        @current-change="currentChange"
+        :current-page="currentPage"
+        :page-size="count"
+        :page-sizes="[15, 25, 35, 50]"
+        layout="total, sizes, prev, pager, next"
+        :total="total">
+      </el-pagination>
+    </el-main>
+  </el-container>
+
+  <!--设备列表-->
+
   </div>
 </template>
 
@@ -114,12 +126,14 @@ import uiHeader from '../layout/UiHeader.vue'
 import moment from "moment";
 import DviceService from "./service/DeviceService";
 import DeviceService from "./service/DeviceService";
+import DeviceTree from "./common/DeviceTree";
 
 export default {
   name: 'channelList',
   components: {
     devicePlayer,
-    uiHeader
+    uiHeader,
+    DeviceTree
   },
   data() {
     return {
@@ -134,12 +148,13 @@ export default {
       searchSrt: "",
       channelType: "",
       online: "",
-      winHeight: window.innerHeight - 250,
-      currentPage: parseInt(this.$route.params.page),
-      count: parseInt(this.$route.params.count),
+      winHeight: window.innerHeight - 200,
+      currentPage: 1,
+      count: 15,
       total: 0,
       beforeUrl: "/deviceList",
       isLoging: false,
+      showTree: false,
       loadSnap: {}
     };
   },
@@ -172,19 +187,16 @@ export default {
     initParam: function () {
       this.deviceId = this.$route.params.deviceId;
       this.parentChannelId = this.$route.params.parentChannelId;
-      this.currentPage = parseInt(this.$route.params.page);
-      this.count = parseInt(this.$route.params.count);
+      this.currentPage = 1;
+      this.count = 15;
       if (this.parentChannelId == "" || this.parentChannelId == 0) {
         this.beforeUrl = "/deviceList"
       }
 
     },
     currentChange: function (val) {
-      var url = `/${this.$router.currentRoute.name}/${this.deviceId}/${this.parentChannelId}/${this.count}/${val}`
-      this.$router.push(url).then(() => {
-        this.initParam();
-        this.initData();
-      })
+      this.currentPage = val;
+      this.initData();
     },
     handleSizeChange: function (val) {
       this.count = val;
@@ -316,28 +328,48 @@ export default {
       })
     },
     showSubchannels: function (channelId) {
-      let that = this;
+      if (!this.showTree) {
+        this.$axios({
+          method: 'get',
+          url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
+          params: {
+            page: this.currentPage,
+            count: this.count,
+            query: this.searchSrt,
+            online: this.online,
+            channelType: this.channelType
+          }
+        }).then( (res) =>{
+          this.total = res.data.total;
+          this.deviceChannelList = res.data.list;
+          // 防止出现表格错位
+          this.$nextTick(() => {
+            this.$refs.channelListTable.doLayout();
+          })
+        }).catch(function (error) {
+          console.log(error);
+        });
+      }else {
+        this.$axios({
+          method: 'get',
+          url: `/api/device/query/tree/channel/${this.deviceId}`,
+          params: {
+            parentId: this.parentChannelId,
+            page: this.currentPage,
+            count: this.count,
+          }
+        }).then((res)=> {
+          this.total = res.data.total;
+          this.deviceChannelList = res.data.list;
+          // 防止出现表格错位
+          this.$nextTick(() => {
+            this.$refs.channelListTable.doLayout();
+          })
+        }).catch(function (error) {
+          console.log(error);
+        });
+      }
 
-      this.$axios({
-        method: 'get',
-        url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
-        params: {
-          page: that.currentPage,
-          count: that.count,
-          query: that.searchSrt,
-          online: that.online,
-          channelType: that.channelType
-        }
-      }).then(function (res) {
-        that.total = res.data.total;
-        that.deviceChannelList = res.data.list;
-        // 防止出现表格错位
-        that.$nextTick(() => {
-          that.$refs.channelListTable.doLayout();
-        })
-      }).catch(function (error) {
-        console.log(error);
-      });
     },
     search: function () {
       this.currentPage = 1;
@@ -355,6 +387,29 @@ export default {
     },
     refresh: function () {
       this.initData();
+    },
+    switchTree: function (){
+      this.showTree = true;
+      this.deviceChannelList = [];
+      this.parentChannelId = 0;
+      this.currentPage = 1;
+
+    },
+    switchList: function (){
+      this.showTree = false;
+      this.deviceChannelList = [];
+      this.parentChannelId = 0;
+      this.currentPage = 1;
+      this.initData();
+    },
+    treeNodeClickEvent: function (device, data, isCatalog) {
+      console.log(device)
+      if (!!!data.channelId) {
+        this.parentChannelId = device.deviceId;
+      }else {
+        this.parentChannelId = data.channelId;
+      }
+      this.initData();
     }
 
   }

web_src/src/components/common/DeviceTree.vue

@@ -4,7 +4,7 @@
       <el-header>设备列表</el-header>
       <el-main style="background-color: #ffffff;">
         <div class="device-tree-main-box">
-          <el-tree :props="defaultProps" :load="loadNode" lazy @node-click="handleNodeClick"@node-contextmenu="handleContextMenu" style="min-width: 100%; display:inline-block !important;">
+          <el-tree ref="gdTree" :props="defaultProps" :load="loadNode" lazy @node-click="handleNodeClick"@node-contextmenu="handleContextMenu" node-key="id" style="min-width: 100%; display:inline-block !important;">
             <span class="custom-tree-node" slot-scope="{ node, data }" style="width: 100%">
               <span v-if="node.data.type === 0 && node.data.online" title="在线设备" class="device-online iconfont icon-jiedianleizhukongzhongxin2"></span>
               <span v-if="node.data.type === 0 && !node.data.online " title="离线设备" class="device-offline iconfont icon-jiedianleizhukongzhongxin2"></span>
@@ -47,98 +47,112 @@ export default {
           }
         };
     },
-    props: ['clickEvent', 'contextMenuEvent'],
+    props: ['device', 'onlyCatalog', 'clickEvent', 'contextMenuEvent'],
     methods: {
       handleNodeClick(data,node,element) {
-        console.log("点击事件")
-        console.log(data)
+        let deviceNode = this.$refs.gdTree.getNode(data.userData.deviceId)
         if(typeof (this.clickEvent) == "function") {
-          this.clickEvent(data.userData)
+          this.clickEvent(deviceNode.data.userData, data.userData, data.type === 2)
         }
       },
       handleContextMenu(event,data,node,element) {
         console.log("右键点击事件")
+        let deviceNode = this.$refs.gdTree.getNode(data.userData.deviceId)
         if(typeof (this.contextMenuEvent) == "function") {
-          this.contextMenuEvent(event, data.userData)
+          this.contextMenuEvent(deviceNode.data.userData, event, data.userData, data.type === 2)
         }
       },
       loadNode: function(node, resolve){
+        console.log(this.device)
         if (node.level === 0) {
-          this.deviceService.getAllDeviceList((data)=>{
-            console.log(data)
-            if (data.length > 0) {
-              let nodeList = []
-              for (let i = 0; i < data.length; i++) {
-                console.log(data[i].name)
-                let node = {
-                  name: data[i].name || data[i].deviceId,
-                  isLeaf: false,
-                  id: data[i].deviceId,
-                  type: data[i].online,
-                  online: data[i].online === 1,
-                  userData: data[i]
+          if (this.device) {
+            let node = {
+              name: this.device.name || this.device.deviceId,
+              isLeaf: false,
+              id: this.device.deviceId,
+              type: this.device.online,
+              online: this.device.online === 1,
+              userData: this.device
+            }
+            resolve([node])
+          }else {
+            this.deviceService.getAllDeviceList((data)=>{
+              console.log(data)
+              if (data.length > 0) {
+                let nodeList = []
+                for (let i = 0; i < data.length; i++) {
+                  console.log(data[i].name)
+                  let node = {
+                    name: data[i].name || data[i].deviceId,
+                    isLeaf: false,
+                    id: data[i].deviceId,
+                    type: data[i].online,
+                    online: data[i].online === 1,
+                    userData: data[i]
+                  }
+                  nodeList.push(node);
                 }
-                nodeList.push(node);
+                resolve(nodeList)
+              }else {
+                resolve([])
               }
-              resolve(nodeList)
-            }else {
-              resolve([])
-            }
-          }, (list)=>{
+            }, (list)=>{
               console.log("设备加载完成")
-          }, (error)=>{
+            }, (error)=>{
 
-          })
-        }
-        if (node.level === 1) {
+            })
+          }
+        }else {
           let channelArray = []
-          this.deviceService.getAllChannel(true, true, node.data.id, catalogData =>{
+
+          this.deviceService.getTree(node.data.userData.deviceId, node.data.id, this.onlyCatalog, catalogData =>{
+            console.log(catalogData)
             channelArray = channelArray.concat(catalogData)
             this.channelDataHandler(channelArray, resolve)
           },(endCatalogData) => {
-            this.deviceService.getAllChannel(false, true, node.data.id, channelData => {
-              channelArray = channelArray.concat(channelData)
-              this.channelDataHandler(channelArray, resolve)
-            }, endChannelList => {
 
-            })
-          })
-        }else if (node.level > 1){
-          let channelArray = []
-          this.deviceService.getAllSubChannel(true, node.data.deviceId, node.data.id, (catalogData)=>{
-            channelArray = channelArray.concat(catalogData)
-            this.channelDataHandler(channelArray, resolve)
-          }, (endCatalogData)=>{
-            this.deviceService.getAllSubChannel(false, node.data.deviceId, node.data.id, (channelData)=>{
-              channelArray = channelArray.concat(channelData)
-              this.channelDataHandler(channelArray, resolve)
-            })
           })
         }
+
       },
       channelDataHandler: function (data, resolve) {
         if (data.length > 0) {
           let nodeList = []
-          for (let i = 0; i < data.length; i++) {
+          for (let i = 0; i <data.length; i++) {
+            let item = data[i];
             let type = 3;
-            if (data[i].subCount > 0 || data[i].parental === 1) {
+            if (item.id.length <= 10) {
               type = 2;
-            }else if (data[i].ptztype === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机
-              type = 4;
-            }else if (data[i].ptztype === 2) {
-              type = 5;
-            }else if (data[i].ptztype === 3 || data[i].ptztype === 4) {
-              type = 6;
+            }else {
+              if (item.id.length > 14) {
+                let channelType = item.id.substring(10, 13)
+                console.log("channelType: " + channelType)
+                if (channelType === '215' || channelType === '216') {
+                  type = 2;
+                }
+                console.log(type)
+                if (item.basicData.ptztype === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机
+                  type = 4;
+                }else if (item.basicData.ptztype === 2) {
+                  type = 5;
+                }else if (item.basicData.ptztype === 3 || item.basicData.ptztype === 4) {
+                  type = 6;
+                }
+              }else {
+                if (item.basicData.subCount > 0 || item.basicData.parental === 1) {
+                  type = 2;
+                }
+              }
             }
             let node = {
-              name: data[i].name || data[i].channelId,
-              isLeaf: data[i].subCount === 0,
-              id: data[i].channelId,
-              deviceId: data[i].deviceId,
+              name: item.name || item.basicData.channelId,
+              isLeaf: type !== 2,
+              id: item.id,
+              deviceId: item.deviceId,
               type: type,
-              online: data[i].status === 1,
-              hasGPS: data[i].longitude*data[i].latitude !== 0,
-              userData: data[i]
+              online: item.basicData.status === 1,
+              hasGPS: item.basicData.longitude*item.basicData.latitude !== 0,
+              userData: item.basicData
             }
             nodeList.push(node);
           }
@@ -146,6 +160,9 @@ export default {
         }else {
           resolve([])
         }
+      },
+      reset: function (){
+        this.$forceUpdate();
       }
     },
     destroyed() {

web_src/src/components/common/DeviceTreeForZtree.vue

@@ -0,0 +1,112 @@
+<template>
+  <div id="DeviceTree" style="width: 100%;height: 100%; background-color: #FFFFFF; overflow: auto">
+    <el-container>
+      <el-header>设备列表</el-header>
+      <el-main style="background-color: #ffffff;">
+        <div class="device-tree-main-box">
+          <tree
+            :nodes="nodes"
+            @onClick="onClick"
+            @onCheck="onCheck"
+            @onExpand="onExpand"
+            @onCreated="handleCreated"
+          />
+        </div>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<script>
+import DeviceService from "../service/DeviceService.js";
+import tree from "vue-giant-tree";
+
+export default {
+    name: 'DeviceTreeForZtree',
+    components: {
+      tree
+    },
+    data() {
+        return {
+          deviceService: new DeviceService(),
+          device: null,
+          nodes:[],
+          setting: {
+            callback: {
+              beforeExpand: this.beforeExpand
+            },
+            // async: {
+            //   enable: true,
+            //   type: "get",
+            //   url: `/api/device/query/tree`,
+            //   contentType: "application/json",
+            //   // autoParam: ["pid=parentId"],
+            // },
+            check: {
+              enable: false,
+            },
+            edit: {
+              enable: false,
+            }
+          },
+          defaultProps: {
+            children: 'children',
+            label: 'name',
+            isLeaf: 'isLeaf'
+          }
+        };
+    },
+    props: ['clickEvent', 'contextMenuEvent'],
+    mounted() {
+      this.deviceService.getAllDeviceList((data)=>{
+        console.log(data)
+        for (let i = 0; i < data.length; i++) {
+          console.log(data[i].name)
+          let node = {
+            name: data[i].name || data[i].deviceId,
+            id: data[i].deviceId,
+            isParent: true,
+          }
+          this.nodes.push(node)
+        }
+      }, (list)=>{
+        console.log("设备加载完成")
+      })
+    },
+    methods: {
+      onClick(evt, treeId, treeNode) {
+        console.log(evt)
+        console.log(treeId)
+        console.log(treeNode)
+      },
+      onCheck(evt, treeId, treeNode) {
+        console.log(evt)
+      },
+      beforeExpand(treeId, treeNode) {
+        console.log(treeId)
+        console.log(treeNode)
+        return true;
+      },
+      onExpand(evt, treeId, treeNode) {
+        // console.log(evt)
+        // console.log(treeId)
+        // console.log(treeNodes)
+      },
+      handleCreated(ztreeObj) {
+        console.log(ztreeObj)
+      }
+    }
+}
+</script>
+
+<style>
+.device-tree-main-box{
+  text-align: left;
+}
+.device-online{
+  color: #252525;
+}
+.device-offline{
+  color: #727272;
+}
+</style>

web_src/src/components/dialog/deviceEdit.vue

@@ -45,6 +45,12 @@
               <el-option key="GCJ02" label="GCJ02" value="GCJ02"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="目录结构" prop="treeType" >
+            <el-select v-model="form.treeType" style="float: left; width: 100%" >
+              <el-option key="WGS84" label="行政区划" value="CivilCode"></el-option>
+              <el-option key="GCJ02" label="业务分组" value="BusinessGroup"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="目录订阅" title="0为取消订阅" prop="subscribeCycleForCatalog" >
             <el-input v-model="form.subscribeCycleForCatalog" clearable ></el-input>
           </el-form-item>

web_src/src/components/live.vue

@@ -107,20 +107,24 @@ export default {
       console.log(idx);
       this.clear(idx.substring(idx.length - 1))
     },
-    clickEvent: function (data) {
-      if (data.channelId && data.subCount == 0) {
-        this.sendDevicePush(data)
+    clickEvent: function (device, data, isCatalog) {
+      if (data.channelId && !isCatalog) {
+        if (device.online === 0) {
+          this.$message.error('设备离线!不允许点播');
+        }else {
+          this.sendDevicePush(data)
+        }
       }
     },
-    contextMenuEvent: function (data) {
+    contextMenuEvent: function (device, event, data, isCatalog) {
 
     },
     //通知设备上传媒体流
     sendDevicePush: function (itemData) {
-      if (itemData.status === 0) {
-        this.$message.error('设备离线!');
-        return
-      }
+      // if (itemData.status === 0) {
+      //   this.$message.error('设备离线!');
+      //   return
+      // }
       this.save(itemData)
       let deviceId = itemData.deviceId;
       // this.isLoging = true;

web_src/src/components/map.vue

@@ -16,7 +16,8 @@
           <el-descriptions class="margin-top" :title="channel.name" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
             <el-descriptions-item label="编号" >{{channel.channelId}}</el-descriptions-item>
             <el-descriptions-item label="型号">{{channel.model}}</el-descriptions-item>
-            <el-descriptions-item label="经纬度" >{{channel.longitude}},{{channel.latitude}}</el-descriptions-item>
+            <el-descriptions-item label="经度" >{{channel[longitudeStr]}}</el-descriptions-item>
+            <el-descriptions-item label="纬度" >{{channel[latitudeStr]}}</el-descriptions-item>
             <el-descriptions-item label="生产厂商">{{channel.manufacture}}</el-descriptions-item>
             <el-descriptions-item label="行政区域" >{{channel.civilCode}}</el-descriptions-item>
             <el-descriptions-item label="设备归属" >{{channel.owner}}</el-descriptions-item>
@@ -28,7 +29,7 @@
             </el-descriptions-item>
           </el-descriptions>
           <div style="padding-top: 10px">
-            <el-button type="primary" size="small" title="播放" icon="el-icon-video-play" @click="play(channel)"></el-button>
+            <el-button v-bind:disabled="device == null || device.online === 0" type="primary" size="small" title="播放" icon="el-icon-video-play" @click="play(channel)"></el-button>
             <el-button type="primary" size="small" title="编辑位置" icon="el-icon-edit" @click="edit(channel)"></el-button>
             <el-button type="primary" size="small" title="轨迹查询" icon="el-icon-map-location" @click="getTrace(channel)"></el-button>
           </div>
@@ -64,11 +65,14 @@ export default {
       layer: null,
       lineLayer: null,
       channel: null,
+      device: null,
       infoBoxId: null,
       labelStyle: {
         width: "56px"
       },
       isLoging: false,
+      longitudeStr: "longitude",
+      latitudeStr: "latitude",
     };
   },
   created() {
@@ -78,17 +82,27 @@ export default {
       setTimeout(()=>{ // 延迟以等待地图加载完成 TODO 后续修改为通过是实际这；状态加回调完成
         this.deviceService.getAllChannel(false, false, this.$route.query.deviceId, this.channelsHandler)
       }, 1000)
-
+    }
+    if (window.mapParam.coordinateSystem == "GCJ-02") {
+      this.longitudeStr = "longitudeGcj02";
+      this.latitudeStr = "latitudeGcj02";
+    }else if (window.mapParam.coordinateSystem == "WGS84") {
+      this.longitudeStr = "longitudeWgs84";
+      this.latitudeStr = "latitudeWgs84";
+    }else {
+      this.longitudeStr = "longitude";
+      this.latitudeStr = "latitude";
     }
   },
   destroyed() {
 
   },
   methods: {
-    clickEvent: function (data) {
-      if (data.channelId && data.subCount == 0) {
+    clickEvent: function (device, data, isCatalog) {
+      this.device = device;
+      if (data.channelId && !isCatalog) {
         // 点击通道
-        if (data.longitude * data.latitude === 0) {
+        if (data[this.longitudeStr] * data[this.latitudeStr] === 0) {
           this.$message.error('未获取到位置信息');
         } else {
           if (this.layer != null) {
@@ -96,26 +110,29 @@ export default {
           }
           this.closeInfoBox()
           this.layer = this.$refs.map.addLayer([{
-            position: [data.longitude, data.latitude],
+            position: [data[this.longitudeStr], data[this.latitudeStr]],
             image: {
               src: this.getImageByChannel(data),
               anchor: [0.5, 1]
             },
             data: data
           }], this.featureClickEvent)
-          this.$refs.map.panTo([data.longitude, data.latitude], mapParam.maxZoom)
+          this.$refs.map.panTo([data[this.longitudeStr], data[this.latitudeStr]], mapParam.maxZoom)
         }
       }
     },
-    contextmenuEventHandler: function (event, data) {
-      if (data.channelId && data.subCount == 0) {
+    contextmenuEventHandler: function (device, event, data, isCatalog) {
+      console.log(device)
+      console.log(device.online)
+      this.device = device;
+      if (data.channelId && !isCatalog) {
         // 点击通道
         this.$contextmenu({
           items: [
             {
               label: "播放",
               icon: "el-icon-video-play",
-              disabled: false,
+              disabled: device.online === 0,
               onClick: () => {
                 this.play(data);
               }
@@ -183,22 +200,11 @@ export default {
         this.clean()
         this.closeInfoBox()
         let params = [];
-        let longitudeStr;
-        let latitudeStr;
-        if (window.mapParam.coordinateSystem == "GCJ-02") {
-          longitudeStr = "longitudeGcj02";
-          latitudeStr = "latitudeGcj02";
-        }else if (window.mapParam.coordinateSystem == "WGS84") {
-          longitudeStr = "longitudeWgs84";
-          latitudeStr = "latitudeWgs84";
-        }else {
-          longitudeStr = "longitude";
-          latitudeStr = "latitude";
-        }
+
 
         for (let i = 0; i < channels.length; i++) {
-          let longitude = channels[i][longitudeStr];
-          let latitude = channels[i][latitudeStr];
+          let longitude = channels[i][this.longitudeStr];
+          let latitude = channels[i][this.latitudeStr];
           if (longitude * latitude === 0) {
             continue;
           }
@@ -217,7 +223,7 @@ export default {
         this.layer = this.$refs.map.addLayer(params, this.featureClickEvent)
         console.log(4)
         if (params.length === 1) {
-          this.$refs.map.panTo([channels[0][longitudeStr], channels[0][latitudeStr]], mapParam.maxZoom)
+          this.$refs.map.panTo([channels[0][this.longitudeStr], channels[0][this.latitudeStr]], mapParam.maxZoom)
         } else if (params.length > 1) {
           this.$refs.map.fit(this.layer)
         } else {
@@ -266,19 +272,7 @@ export default {
         this.channel = channels[0]
       }
       this.$nextTick(() => {
-        let longitudeStr;
-        let latitudeStr;
-        if (window.mapParam.coordinateSystem == "GCJ-02") {
-          longitudeStr = "longitudeGcj02";
-          latitudeStr = "latitudeGcj02";
-        }else if (window.mapParam.coordinateSystem == "WGS84") {
-          longitudeStr = "longitudeWgs84";
-          latitudeStr = "latitudeWgs84";
-        }else {
-          longitudeStr = "longitude";
-          latitudeStr = "latitude";
-        }
-        let position = [this.channel[longitudeStr], this.channel[latitudeStr]];
+        let position = [this.channel[this.longitudeStr], this.channel[this.latitudeStr]];
         this.infoBoxId = this.$refs.map.openInfoBox(position, this.$refs.infobox, [0, -50])
       })
     },

web_src/src/components/service/DeviceService.js

@@ -133,6 +133,49 @@ class DeviceService{
       if (typeof (callback) == "function") callback(res.data)
     }).catch(errorCallback);
   }
+
+  getTree(deviceId, id, param3, param4) {
+
+  }
+
+  getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback) {
+    let currentPage = 1;
+    let count = 100;
+    let catalogList = []
+    this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
+  }
+
+  getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback) {
+    this.getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, (data) => {
+      if (data.list) {
+        if (typeof (callback) == "function") callback(data.list)
+        catalogList = catalogList.concat(data.list);
+        if (catalogList.length < data.total) {
+          currentPage ++
+          this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
+        }else {
+          if (typeof (endCallback) == "function") endCallback(catalogList)
+        }
+      }
+    }, errorCallback)
+  }
+  getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, callback, errorCallback) {
+    if (onlyCatalog == null || typeof onlyCatalog === "undefined") {
+      onlyCatalog = false;
+    }
+    this.$axios({
+      method: 'get',
+      url: `/api/device/query/tree/${deviceId}`,
+      params:{
+        page: currentPage,
+        count: count,
+        parentId: parentId,
+        onlyCatalog: onlyCatalog
+      }
+    }).then((res) =>{
+      if (typeof (callback) == "function") callback(res.data)
+    }).catch(errorCallback);
+  }
 }
 
 export default DeviceService;

web_src/src/router/index.js

@@ -59,7 +59,7 @@ export default new VueRouter({
           component: streamProxyList,
         },
         {
-          path: '/channelList/:deviceId/:parentChannelId/:count/:page',
+          path: '/channelList/:deviceId/:parentChannelId/',
           name: 'channelList',
           component: channelList,
         },

web_src/static/css/iconfont.css

@@ -1,6 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1291092 */
-  src: url('iconfont.woff2?t=1650436696596') format('woff2');
+  src: url('iconfont.woff2?t=1655453611360') format('woff2'),
+       url('iconfont.woff?t=1655453611360') format('woff'),
+       url('iconfont.ttf?t=1655453611360') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-list:before {
+  content: "\e7de";
+}
+
+.icon-tree:before {
+  content: "\e7df";
+}
+
+.icon-shipin:before {
+  content: "\e7db";
+}
+
+.icon-shipin1:before {
+  content: "\e7dc";
+}
+
+.icon-shipin2:before {
+  content: "\e7dd";
+}
+
+.icon-LC_icon_gps_fill:before {
+  content: "\e7da";
+}
+
 .icon-jiedianleizhukongzhongxin1:before {
   content: "\e9d0";
 }