Commit be9bf60e81e22d717199d73886a04ab3019390ab
1 parent
23b8667b
兼容人大金仓对online作为保留字段的要求
Showing
13 changed files
with
332 additions
and
624 deletions
sql/clean.sql
| 1 | -delete from device; | |
| 2 | -delete from device_alarm; | |
| 3 | -delete from device_channel; | |
| 4 | -delete from device_mobile_position; | |
| 5 | -delete from gb_stream; | |
| 6 | -delete from log; | |
| 7 | -delete from media_server; | |
| 8 | -delete from parent_platform; | |
| 9 | -delete from platform_catalog; | |
| 10 | -delete from platform_gb_channel; | |
| 11 | -delete from platform_gb_stream; | |
| 12 | -delete from stream_proxy; | |
| 13 | -delete from stream_push; | |
| 14 | 1 | \ No newline at end of file |
| 2 | +delete from wvp-device; | |
| 3 | +delete from wvp-device_alarm; | |
| 4 | +delete from wvp-device_channel; | |
| 5 | +delete from wvp-device_mobile_position; | |
| 6 | +delete from wvp-gb_stream; | |
| 7 | +delete from wvp-log; | |
| 8 | +delete from wvp-media_server; | |
| 9 | +delete from wvp-parent_platform; | |
| 10 | +delete from wvp-platform_catalog; | |
| 11 | +delete from wvp-platform_gb_channel; | |
| 12 | +delete from wvp-platform_gb_stream; | |
| 13 | +delete from wvp-stream_proxy; | |
| 14 | +delete from wvp-stream_push; | |
| 15 | 15 | \ No newline at end of file | ... | ... |
sql/初始化.sql
| 1 | --- MySQL dump 10.13 Distrib 8.0.31, for Linux (x86_64) | |
| 2 | --- | |
| 3 | --- Host: 127.0.0.1 Database: wvp | |
| 4 | --- ------------------------------------------------------ | |
| 5 | --- Server version 8.0.30 | |
| 1 | +/*建表*/ | |
| 2 | +create table wvp_device ( | |
| 3 | + id serial primary key , | |
| 4 | + device_id character varying(50) not null , | |
| 5 | + name character varying(255), | |
| 6 | + manufacturer character varying(255), | |
| 7 | + model character varying(255), | |
| 8 | + firmware character varying(255), | |
| 9 | + transport character varying(50), | |
| 10 | + stream_mode character varying(50), | |
| 11 | + on_line bool default false, | |
| 12 | + register_time character varying(50), | |
| 13 | + keepalive_time character varying(50), | |
| 14 | + ip character varying(50), | |
| 15 | + create_time character varying(50), | |
| 16 | + update_time character varying(50), | |
| 17 | + port integer, | |
| 18 | + expires integer, | |
| 19 | + subscribe_cycle_for_catalog integer DEFAULT 0, | |
| 20 | + subscribe_cycle_for_mobile_position integer DEFAULT 0, | |
| 21 | + mobile_position_submission_interval integer DEFAULT 5, | |
| 22 | + subscribe_cycle_for_alarm integer DEFAULT 0, | |
| 23 | + host_address character varying(50), | |
| 24 | + charset character varying(50), | |
| 25 | + ssrc_check bool default false, | |
| 26 | + geo_coord_sys character varying(50), | |
| 27 | + tree_type character varying(50), | |
| 28 | + media_server_id character varying(50), | |
| 29 | + custom_name character varying(255), | |
| 30 | + sdp_ip character varying(50), | |
| 31 | + local_ip character varying(50), | |
| 32 | + password character varying(255), | |
| 33 | + as_message_channel bool default false, | |
| 34 | + keepalive_interval_time integer, | |
| 35 | + constraint uk_device_device unique (device_id) | |
| 36 | +); | |
| 37 | + | |
| 38 | +create table wvp_device_alarm ( | |
| 39 | + id serial primary key , | |
| 40 | + device_id character varying(50) not null, | |
| 41 | + channel_id character varying(50) not null, | |
| 42 | + alarm_priority character varying(50), | |
| 43 | + alarm_method character varying(50), | |
| 44 | + alarm_time character varying(50), | |
| 45 | + alarm_description character varying(255), | |
| 46 | + longitude double precision, | |
| 47 | + latitude double precision, | |
| 48 | + alarm_type character varying(50), | |
| 49 | + create_time character varying(50) not null | |
| 50 | +); | |
| 51 | + | |
| 52 | +create table wvp_device_channel ( | |
| 53 | + id serial primary key , | |
| 54 | + channel_id character varying(50) not null, | |
| 55 | + name character varying(255), | |
| 56 | + manufacture character varying(50), | |
| 57 | + model character varying(50), | |
| 58 | + owner character varying(50), | |
| 59 | + civil_code character varying(50), | |
| 60 | + block character varying(50), | |
| 61 | + address character varying(50), | |
| 62 | + parent_id character varying(50), | |
| 63 | + safety_way integer, | |
| 64 | + register_way integer, | |
| 65 | + cert_num character varying(50), | |
| 66 | + certifiable integer, | |
| 67 | + err_code integer, | |
| 68 | + end_time character varying(50), | |
| 69 | + secrecy character varying(50), | |
| 70 | + ip_address character varying(50), | |
| 71 | + port integer, | |
| 72 | + password character varying(255), | |
| 73 | + ptz_type integer, | |
| 74 | + status bool default false, | |
| 75 | + longitude double precision, | |
| 76 | + latitude double precision, | |
| 77 | + stream_id character varying(50), | |
| 78 | + device_id character varying(50) not null, | |
| 79 | + parental character varying(50), | |
| 80 | + has_audio bool default false, | |
| 81 | + create_time character varying(50) not null, | |
| 82 | + update_time character varying(50) not null, | |
| 83 | + sub_count integer, | |
| 84 | + longitude_gcj02 double precision, | |
| 85 | + latitude_gcj02 double precision, | |
| 86 | + longitude_wgs84 double precision, | |
| 87 | + latitude_wgs84 double precision, | |
| 88 | + business_group_id character varying(50), | |
| 89 | + gps_time character varying(50), | |
| 90 | + constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id) | |
| 91 | +); | |
| 92 | + | |
| 93 | +create table wvp_device_mobile_position ( | |
| 94 | + id serial primary key, | |
| 95 | + device_id character varying(50) not null, | |
| 96 | + channel_id character varying(50) not null, | |
| 97 | + device_name character varying(255), | |
| 98 | + time character varying(50), | |
| 99 | + longitude double precision, | |
| 100 | + latitude double precision, | |
| 101 | + altitude double precision, | |
| 102 | + speed double precision, | |
| 103 | + direction double precision, | |
| 104 | + report_source character varying(50), | |
| 105 | + longitude_gcj02 double precision, | |
| 106 | + latitude_gcj02 double precision, | |
| 107 | + longitude_wgs84 double precision, | |
| 108 | + latitude_wgs84 double precision, | |
| 109 | + create_time character varying(50) | |
| 110 | +); | |
| 111 | + | |
| 112 | +create table wvp_gb_stream ( | |
| 113 | + gb_stream_id serial primary key, | |
| 114 | + app character varying(255) not null, | |
| 115 | + stream character varying(255) not null, | |
| 116 | + gb_id character varying(50) not null, | |
| 117 | + name character varying(255), | |
| 118 | + longitude double precision, | |
| 119 | + latitude double precision, | |
| 120 | + stream_type character varying(50), | |
| 121 | + media_server_id character varying(50), | |
| 122 | + create_time character varying(50), | |
| 123 | + constraint uk_gb_stream_unique_gb_id unique (gb_id), | |
| 124 | + constraint uk_gb_stream_unique_app_stream unique (app, stream) | |
| 125 | +); | |
| 126 | + | |
| 127 | +create table wvp_log ( | |
| 128 | + id serial primary key , | |
| 129 | + name character varying(50), | |
| 130 | + type character varying(50), | |
| 131 | + uri character varying(200), | |
| 132 | + address character varying(50), | |
| 133 | + result character varying(50), | |
| 134 | + timing bigint, | |
| 135 | + username character varying(50), | |
| 136 | + create_time character varying(50) | |
| 137 | +); | |
| 138 | + | |
| 139 | +create table wvp_media_server ( | |
| 140 | + id character varying(255) primary key , | |
| 141 | + ip character varying(50), | |
| 142 | + hook_ip character varying(50), | |
| 143 | + sdp_ip character varying(50), | |
| 144 | + stream_ip character varying(50), | |
| 145 | + http_port integer, | |
| 146 | + http_ssl_port integer, | |
| 147 | + rtmp_port integer, | |
| 148 | + rtmp_ssl_port integer, | |
| 149 | + rtp_proxy_port integer, | |
| 150 | + rtsp_port integer, | |
| 151 | + rtsp_ssl_port integer, | |
| 152 | + auto_config bool default false, | |
| 153 | + secret character varying(50), | |
| 154 | + rtp_enable bool default false, | |
| 155 | + rtp_port_range character varying(50), | |
| 156 | + record_assist_port integer, | |
| 157 | + default_server bool default false, | |
| 158 | + create_time character varying(50), | |
| 159 | + update_time character varying(50), | |
| 160 | + hook_alive_interval integer, | |
| 161 | + constraint uk_media_server_unique_ip_http_port unique (ip, http_port) | |
| 162 | +); | |
| 163 | + | |
| 164 | +create table wvp_platform ( | |
| 165 | + id serial primary key , | |
| 166 | + enable bool default false, | |
| 167 | + name character varying(255), | |
| 168 | + server_gb_id character varying(50), | |
| 169 | + server_gb_domain character varying(50), | |
| 170 | + server_ip character varying(50), | |
| 171 | + server_port integer, | |
| 172 | + device_gb_id character varying(50), | |
| 173 | + device_ip character varying(50), | |
| 174 | + device_port character varying(50), | |
| 175 | + username character varying(255), | |
| 176 | + password character varying(50), | |
| 177 | + expires character varying(50), | |
| 178 | + keep_timeout character varying(50), | |
| 179 | + transport character varying(50), | |
| 180 | + character_set character varying(50), | |
| 181 | + catalog_id character varying(50), | |
| 182 | + ptz bool default false, | |
| 183 | + rtcp bool default false, | |
| 184 | + status bool default false, | |
| 185 | + start_offline_push bool default false, | |
| 186 | + administrative_division character varying(50), | |
| 187 | + catalog_group integer, | |
| 188 | + create_time character varying(50), | |
| 189 | + update_time character varying(50), | |
| 190 | + tree_type character varying(50), | |
| 191 | + as_message_channel bool default false, | |
| 192 | + constraint uk_platform_unique_server_gb_id unique (server_gb_id) | |
| 193 | +); | |
| 194 | + | |
| 195 | +create table wvp_platform_catalog ( | |
| 196 | + id character varying(50), | |
| 197 | + platform_id character varying(50), | |
| 198 | + name character varying(255), | |
| 199 | + parent_id character varying(50), | |
| 200 | + civil_code character varying(50), | |
| 201 | + business_group_id character varying(50), | |
| 202 | + constraint uk_platform_catalog_id_platform_id unique (id, platform_id) | |
| 203 | +); | |
| 204 | + | |
| 205 | +create table wvp_platform_gb_channel ( | |
| 206 | + id serial primary key , | |
| 207 | + platform_id character varying(50), | |
| 208 | + catalog_id character varying(50), | |
| 209 | + device_channel_id integer, | |
| 210 | + constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id) | |
| 211 | +); | |
| 212 | + | |
| 213 | +create table wvp_platform_gb_stream ( | |
| 214 | + id serial primary key, | |
| 215 | + platform_id character varying(50), | |
| 216 | + catalog_id character varying(50), | |
| 217 | + gb_stream_id integer, | |
| 218 | + constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id) | |
| 219 | +); | |
| 220 | + | |
| 221 | +create table wvp_stream_proxy ( | |
| 222 | + id serial primary key, | |
| 223 | + type character varying(50), | |
| 224 | + app character varying(255), | |
| 225 | + stream character varying(255), | |
| 226 | + url character varying(255), | |
| 227 | + src_url character varying(255), | |
| 228 | + dst_url character varying(255), | |
| 229 | + timeout_ms integer, | |
| 230 | + ffmpeg_cmd_key character varying(255), | |
| 231 | + rtp_type character varying(50), | |
| 232 | + media_server_id character varying(50), | |
| 233 | + enable_audio bool default false, | |
| 234 | + enable_mp4 bool default false, | |
| 235 | + enable bool default false, | |
| 236 | + status boolean, | |
| 237 | + enable_remove_none_reader bool default false, | |
| 238 | + create_time character varying(50), | |
| 239 | + name character varying(255), | |
| 240 | + update_time character varying(50), | |
| 241 | + enable_disable_none_reader bool default false, | |
| 242 | + constraint uk_stream_proxy_app_stream unique (app, stream) | |
| 243 | +); | |
| 244 | + | |
| 245 | +create table wvp_stream_push ( | |
| 246 | + id serial primary key, | |
| 247 | + app character varying(255), | |
| 248 | + stream character varying(255), | |
| 249 | + total_reader_count character varying(50), | |
| 250 | + origin_type integer, | |
| 251 | + origin_type_str character varying(50), | |
| 252 | + create_time character varying(50), | |
| 253 | + alive_second integer, | |
| 254 | + media_server_id character varying(50), | |
| 255 | + server_id character varying(50), | |
| 256 | + push_time character varying(50), | |
| 257 | + status bool default false, | |
| 258 | + update_time character varying(50), | |
| 259 | + push_ing bool default false, | |
| 260 | + self bool default false, | |
| 261 | + constraint uk_stream_push_app_stream unique (app, stream) | |
| 262 | +); | |
| 263 | + | |
| 264 | +create table wvp_user ( | |
| 265 | + id serial primary key, | |
| 266 | + username character varying(255), | |
| 267 | + password character varying(255), | |
| 268 | + role_id integer, | |
| 269 | + create_time character varying(50), | |
| 270 | + update_time character varying(50), | |
| 271 | + push_key character varying(50), | |
| 272 | + constraint uk_user_username unique (username) | |
| 273 | +); | |
| 274 | + | |
| 275 | +create table wvp_user_role ( | |
| 276 | + id serial primary key, | |
| 277 | + name character varying(50), | |
| 278 | + authority character varying(50), | |
| 279 | + create_time character varying(50), | |
| 280 | + update_time character varying(50) | |
| 281 | +); | |
| 282 | + | |
| 283 | +/*初始数据*/ | |
| 284 | +INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3'); | |
| 285 | +INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57'); | |
| 6 | 286 | |
| 7 | -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; | |
| 8 | -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; | |
| 9 | -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; | |
| 10 | -/*!50503 SET NAMES utf8mb4 */; | |
| 11 | -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; | |
| 12 | -/*!40103 SET TIME_ZONE='+00:00' */; | |
| 13 | -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; | |
| 14 | -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; | |
| 15 | -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; | |
| 16 | -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; | |
| 17 | 287 | |
| 18 | --- | |
| 19 | --- Table structure for table `device` | |
| 20 | --- | |
| 21 | 288 | |
| 22 | -DROP TABLE IF EXISTS `device`; | |
| 23 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 24 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 25 | -CREATE TABLE `device` ( | |
| 26 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 27 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 28 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 29 | - `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 30 | - `model` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 31 | - `firmware` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 32 | - `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 33 | - `streamMode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 34 | - `online` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 35 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 36 | - `registerTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 37 | - `keepaliveTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 38 | - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 39 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 40 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 41 | - `port` int DEFAULT NULL, | |
| 42 | - `expires` int DEFAULT NULL, | |
| 43 | - `keepaliveIntervalTime` int DEFAULT NULL, | |
| 44 | - `subscribeCycleForCatalog` int DEFAULT NULL, | |
| 45 | - `hostAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 46 | - `charset` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 47 | - `subscribeCycleForMobilePosition` int DEFAULT NULL, | |
| 48 | - `mobilePositionSubmissionInterval` int DEFAULT '5', | |
| 49 | - `subscribeCycleForAlarm` int DEFAULT NULL, | |
| 50 | - `ssrcCheck` int DEFAULT '0', | |
| 51 | - `asMessageChannel` int DEFAULT '0', | |
| 52 | - `geoCoordSys` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 53 | - `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 54 | - `custom_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 55 | - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 56 | - `sdpIp` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 57 | - `localIp` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 58 | - PRIMARY KEY (`id`), | |
| 59 | - UNIQUE KEY `device_deviceId_uindex` (`deviceId`) | |
| 60 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; | |
| 61 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 62 | - | |
| 63 | --- | |
| 64 | --- Dumping data for table `device` | |
| 65 | --- | |
| 66 | - | |
| 67 | -LOCK TABLES `device` WRITE; | |
| 68 | -/*!40000 ALTER TABLE `device` DISABLE KEYS */; | |
| 69 | -/*!40000 ALTER TABLE `device` ENABLE KEYS */; | |
| 70 | -UNLOCK TABLES; | |
| 71 | - | |
| 72 | --- | |
| 73 | --- Table structure for table `device_alarm` | |
| 74 | --- | |
| 75 | - | |
| 76 | -DROP TABLE IF EXISTS `device_alarm`; | |
| 77 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 78 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 79 | -CREATE TABLE `device_alarm` ( | |
| 80 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 81 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 82 | - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 83 | - `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 84 | - `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 85 | - `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 86 | - `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 87 | - `longitude` double DEFAULT NULL, | |
| 88 | - `latitude` double DEFAULT NULL, | |
| 89 | - `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 90 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 91 | - PRIMARY KEY (`id`) USING BTREE | |
| 92 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 93 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 94 | - | |
| 95 | --- | |
| 96 | --- Dumping data for table `device_alarm` | |
| 97 | --- | |
| 98 | - | |
| 99 | -LOCK TABLES `device_alarm` WRITE; | |
| 100 | -/*!40000 ALTER TABLE `device_alarm` DISABLE KEYS */; | |
| 101 | -/*!40000 ALTER TABLE `device_alarm` ENABLE KEYS */; | |
| 102 | -UNLOCK TABLES; | |
| 103 | - | |
| 104 | --- | |
| 105 | --- Table structure for table `device_channel` | |
| 106 | --- | |
| 107 | - | |
| 108 | -DROP TABLE IF EXISTS `device_channel`; | |
| 109 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 110 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 111 | -CREATE TABLE `device_channel` ( | |
| 112 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 113 | - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 114 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 115 | - `manufacture` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 116 | - `model` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 117 | - `owner` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 118 | - `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 119 | - `block` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 120 | - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 121 | - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 122 | - `safetyWay` int DEFAULT NULL, | |
| 123 | - `registerWay` int DEFAULT NULL, | |
| 124 | - `certNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 125 | - `certifiable` int DEFAULT NULL, | |
| 126 | - `errCode` int DEFAULT NULL, | |
| 127 | - `endTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 128 | - `secrecy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 129 | - `ipAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 130 | - `port` int DEFAULT NULL, | |
| 131 | - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 132 | - `PTZType` int DEFAULT NULL, | |
| 133 | - `status` int DEFAULT NULL, | |
| 134 | - `longitude` double DEFAULT NULL, | |
| 135 | - `latitude` double DEFAULT NULL, | |
| 136 | - `streamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 137 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 138 | - `parental` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 139 | - `hasAudio` bit(1) DEFAULT NULL, | |
| 140 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 141 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 142 | - `subCount` int DEFAULT '0', | |
| 143 | - `longitudeGcj02` double DEFAULT NULL, | |
| 144 | - `latitudeGcj02` double DEFAULT NULL, | |
| 145 | - `longitudeWgs84` double DEFAULT NULL, | |
| 146 | - `latitudeWgs84` double DEFAULT NULL, | |
| 147 | - `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 148 | - `gpsTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 149 | - PRIMARY KEY (`id`), | |
| 150 | - UNIQUE KEY `device_channel_id_uindex` (`id`), | |
| 151 | - UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`) | |
| 152 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; | |
| 153 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 154 | - | |
| 155 | --- | |
| 156 | --- Dumping data for table `device_channel` | |
| 157 | --- | |
| 158 | - | |
| 159 | -LOCK TABLES `device_channel` WRITE; | |
| 160 | -/*!40000 ALTER TABLE `device_channel` DISABLE KEYS */; | |
| 161 | -/*!40000 ALTER TABLE `device_channel` ENABLE KEYS */; | |
| 162 | -UNLOCK TABLES; | |
| 163 | - | |
| 164 | --- | |
| 165 | --- Table structure for table `device_mobile_position` | |
| 166 | --- | |
| 167 | - | |
| 168 | -DROP TABLE IF EXISTS `device_mobile_position`; | |
| 169 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 170 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 171 | -CREATE TABLE `device_mobile_position` ( | |
| 172 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 173 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 174 | - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 175 | - `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 176 | - `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 177 | - `longitude` double NOT NULL, | |
| 178 | - `latitude` double NOT NULL, | |
| 179 | - `altitude` double DEFAULT NULL, | |
| 180 | - `speed` double DEFAULT NULL, | |
| 181 | - `direction` double DEFAULT NULL, | |
| 182 | - `reportSource` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 183 | - `longitudeGcj02` double DEFAULT NULL, | |
| 184 | - `latitudeGcj02` double DEFAULT NULL, | |
| 185 | - `longitudeWgs84` double DEFAULT NULL, | |
| 186 | - `latitudeWgs84` double DEFAULT NULL, | |
| 187 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 188 | - PRIMARY KEY (`id`) | |
| 189 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; | |
| 190 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 191 | - | |
| 192 | --- | |
| 193 | --- Dumping data for table `device_mobile_position` | |
| 194 | --- | |
| 195 | - | |
| 196 | -LOCK TABLES `device_mobile_position` WRITE; | |
| 197 | -/*!40000 ALTER TABLE `device_mobile_position` DISABLE KEYS */; | |
| 198 | -/*!40000 ALTER TABLE `device_mobile_position` ENABLE KEYS */; | |
| 199 | -UNLOCK TABLES; | |
| 200 | - | |
| 201 | --- | |
| 202 | --- Table structure for table `gb_stream` | |
| 203 | --- | |
| 204 | - | |
| 205 | -DROP TABLE IF EXISTS `gb_stream`; | |
| 206 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 207 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 208 | -CREATE TABLE `gb_stream` ( | |
| 209 | - `gbStreamId` int NOT NULL AUTO_INCREMENT, | |
| 210 | - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 211 | - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 212 | - `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 213 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 214 | - `longitude` double DEFAULT NULL, | |
| 215 | - `latitude` double DEFAULT NULL, | |
| 216 | - `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 217 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 218 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 219 | - PRIMARY KEY (`gbStreamId`) USING BTREE, | |
| 220 | - UNIQUE KEY `app` (`app`,`stream`) USING BTREE, | |
| 221 | - UNIQUE KEY `gbId` (`gbId`) USING BTREE | |
| 222 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 223 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 224 | - | |
| 225 | --- | |
| 226 | --- Dumping data for table `gb_stream` | |
| 227 | --- | |
| 228 | - | |
| 229 | -LOCK TABLES `gb_stream` WRITE; | |
| 230 | -/*!40000 ALTER TABLE `gb_stream` DISABLE KEYS */; | |
| 231 | -/*!40000 ALTER TABLE `gb_stream` ENABLE KEYS */; | |
| 232 | -UNLOCK TABLES; | |
| 233 | - | |
| 234 | --- | |
| 235 | --- Table structure for table `log` | |
| 236 | --- | |
| 237 | - | |
| 238 | -DROP TABLE IF EXISTS `log`; | |
| 239 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 240 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 241 | -CREATE TABLE `log` ( | |
| 242 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 243 | - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 244 | - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 245 | - `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 246 | - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 247 | - `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 248 | - `timing` bigint NOT NULL, | |
| 249 | - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 250 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 251 | - PRIMARY KEY (`id`) USING BTREE | |
| 252 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 253 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 254 | - | |
| 255 | --- | |
| 256 | --- Dumping data for table `log` | |
| 257 | --- | |
| 258 | - | |
| 259 | -LOCK TABLES `log` WRITE; | |
| 260 | -/*!40000 ALTER TABLE `log` DISABLE KEYS */; | |
| 261 | -/*!40000 ALTER TABLE `log` ENABLE KEYS */; | |
| 262 | -UNLOCK TABLES; | |
| 263 | - | |
| 264 | --- | |
| 265 | --- Table structure for table `media_server` | |
| 266 | --- | |
| 267 | - | |
| 268 | -DROP TABLE IF EXISTS `media_server`; | |
| 269 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 270 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 271 | -CREATE TABLE `media_server` ( | |
| 272 | - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 273 | - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 274 | - `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 275 | - `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 276 | - `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 277 | - `httpPort` int NOT NULL, | |
| 278 | - `httpSSlPort` int NOT NULL, | |
| 279 | - `rtmpPort` int NOT NULL, | |
| 280 | - `rtmpSSlPort` int NOT NULL, | |
| 281 | - `rtpProxyPort` int NOT NULL, | |
| 282 | - `rtspPort` int NOT NULL, | |
| 283 | - `rtspSSLPort` int NOT NULL, | |
| 284 | - `autoConfig` int NOT NULL, | |
| 285 | - `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 286 | - `rtpEnable` int NOT NULL, | |
| 287 | - `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 288 | - `recordAssistPort` int NOT NULL, | |
| 289 | - `defaultServer` int NOT NULL, | |
| 290 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 291 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 292 | - `hookAliveInterval` int NOT NULL, | |
| 293 | - PRIMARY KEY (`id`) USING BTREE, | |
| 294 | - UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE | |
| 295 | -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 296 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 297 | - | |
| 298 | --- | |
| 299 | --- Dumping data for table `media_server` | |
| 300 | --- | |
| 301 | - | |
| 302 | -LOCK TABLES `media_server` WRITE; | |
| 303 | -/*!40000 ALTER TABLE `media_server` DISABLE KEYS */; | |
| 304 | -/*!40000 ALTER TABLE `media_server` ENABLE KEYS */; | |
| 305 | -UNLOCK TABLES; | |
| 306 | - | |
| 307 | --- | |
| 308 | --- Table structure for table `parent_platform` | |
| 309 | --- | |
| 310 | - | |
| 311 | -DROP TABLE IF EXISTS `parent_platform`; | |
| 312 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 313 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 314 | -CREATE TABLE `parent_platform` ( | |
| 315 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 316 | - `enable` int DEFAULT NULL, | |
| 317 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 318 | - `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 319 | - `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 320 | - `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 321 | - `serverPort` int DEFAULT NULL, | |
| 322 | - `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 323 | - `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 324 | - `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 325 | - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 326 | - `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 327 | - `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 328 | - `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 329 | - `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 330 | - `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 331 | - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 332 | - `ptz` int DEFAULT NULL, | |
| 333 | - `rtcp` int DEFAULT NULL, | |
| 334 | - `asMessageChannel` int DEFAULT '0', | |
| 335 | - `status` bit(1) DEFAULT NULL, | |
| 336 | - `startOfflinePush` int DEFAULT '0', | |
| 337 | - `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 338 | - `catalogGroup` int DEFAULT '1', | |
| 339 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 340 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 341 | - `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 342 | - PRIMARY KEY (`id`), | |
| 343 | - UNIQUE KEY `parent_platform_id_uindex` (`id`), | |
| 344 | - UNIQUE KEY `parent_platform_pk` (`serverGBId`) | |
| 345 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 346 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 347 | - | |
| 348 | --- | |
| 349 | --- Dumping data for table `parent_platform` | |
| 350 | --- | |
| 351 | - | |
| 352 | -LOCK TABLES `parent_platform` WRITE; | |
| 353 | -/*!40000 ALTER TABLE `parent_platform` DISABLE KEYS */; | |
| 354 | -/*!40000 ALTER TABLE `parent_platform` ENABLE KEYS */; | |
| 355 | -UNLOCK TABLES; | |
| 356 | - | |
| 357 | --- | |
| 358 | --- Table structure for table `platform_catalog` | |
| 359 | --- | |
| 360 | - | |
| 361 | -DROP TABLE IF EXISTS `platform_catalog`; | |
| 362 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 363 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 364 | -CREATE TABLE `platform_catalog` ( | |
| 365 | - `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 366 | - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 367 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 368 | - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 369 | - `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 370 | - `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 371 | - PRIMARY KEY (`id`) USING BTREE | |
| 372 | -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 373 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 374 | - | |
| 375 | --- | |
| 376 | --- Dumping data for table `platform_catalog` | |
| 377 | --- | |
| 378 | - | |
| 379 | -LOCK TABLES `platform_catalog` WRITE; | |
| 380 | -/*!40000 ALTER TABLE `platform_catalog` DISABLE KEYS */; | |
| 381 | -/*!40000 ALTER TABLE `platform_catalog` ENABLE KEYS */; | |
| 382 | -UNLOCK TABLES; | |
| 383 | - | |
| 384 | --- | |
| 385 | --- Table structure for table `platform_gb_channel` | |
| 386 | --- | |
| 387 | - | |
| 388 | -DROP TABLE IF EXISTS `platform_gb_channel`; | |
| 389 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 390 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 391 | -CREATE TABLE `platform_gb_channel` ( | |
| 392 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 393 | - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 394 | - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 395 | - `deviceChannelId` int NOT NULL, | |
| 396 | - PRIMARY KEY (`id`) | |
| 397 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; | |
| 398 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 399 | - | |
| 400 | --- | |
| 401 | --- Dumping data for table `platform_gb_channel` | |
| 402 | --- | |
| 403 | - | |
| 404 | -LOCK TABLES `platform_gb_channel` WRITE; | |
| 405 | -/*!40000 ALTER TABLE `platform_gb_channel` DISABLE KEYS */; | |
| 406 | -/*!40000 ALTER TABLE `platform_gb_channel` ENABLE KEYS */; | |
| 407 | -UNLOCK TABLES; | |
| 408 | - | |
| 409 | --- | |
| 410 | --- Table structure for table `platform_gb_stream` | |
| 411 | --- | |
| 412 | - | |
| 413 | -DROP TABLE IF EXISTS `platform_gb_stream`; | |
| 414 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 415 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 416 | -CREATE TABLE `platform_gb_stream` ( | |
| 417 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 418 | - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 419 | - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 420 | - `gbStreamId` int NOT NULL, | |
| 421 | - PRIMARY KEY (`id`), | |
| 422 | - UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`) | |
| 423 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 424 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 425 | - | |
| 426 | --- | |
| 427 | --- Dumping data for table `platform_gb_stream` | |
| 428 | --- | |
| 429 | - | |
| 430 | -LOCK TABLES `platform_gb_stream` WRITE; | |
| 431 | -/*!40000 ALTER TABLE `platform_gb_stream` DISABLE KEYS */; | |
| 432 | -/*!40000 ALTER TABLE `platform_gb_stream` ENABLE KEYS */; | |
| 433 | -UNLOCK TABLES; | |
| 434 | - | |
| 435 | --- | |
| 436 | --- Table structure for table `stream_proxy` | |
| 437 | --- | |
| 438 | - | |
| 439 | -DROP TABLE IF EXISTS `stream_proxy`; | |
| 440 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 441 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 442 | -CREATE TABLE `stream_proxy` ( | |
| 443 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 444 | - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 445 | - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 446 | - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 447 | - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 448 | - `src_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 449 | - `dst_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 450 | - `timeout_ms` int DEFAULT NULL, | |
| 451 | - `ffmpeg_cmd_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 452 | - `rtp_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 453 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 454 | - `enable_audio` bit(1) DEFAULT NULL, | |
| 455 | - `enable_mp4` bit(1) DEFAULT NULL, | |
| 456 | - `enable` bit(1) NOT NULL, | |
| 457 | - `status` bit(1) NOT NULL, | |
| 458 | - `enable_remove_none_reader` bit(1) NOT NULL, | |
| 459 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 460 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 461 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 462 | - `enable_disable_none_reader` bit(1) DEFAULT NULL, | |
| 463 | - PRIMARY KEY (`id`), | |
| 464 | - UNIQUE KEY `stream_proxy_pk` (`app`,`stream`) | |
| 465 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; | |
| 466 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 467 | - | |
| 468 | --- | |
| 469 | --- Dumping data for table `stream_proxy` | |
| 470 | --- | |
| 471 | - | |
| 472 | -LOCK TABLES `stream_proxy` WRITE; | |
| 473 | -/*!40000 ALTER TABLE `stream_proxy` DISABLE KEYS */; | |
| 474 | -/*!40000 ALTER TABLE `stream_proxy` ENABLE KEYS */; | |
| 475 | -UNLOCK TABLES; | |
| 476 | - | |
| 477 | --- | |
| 478 | --- Table structure for table `stream_push` | |
| 479 | --- | |
| 480 | - | |
| 481 | -DROP TABLE IF EXISTS `stream_push`; | |
| 482 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 483 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 484 | -CREATE TABLE `stream_push` ( | |
| 485 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 486 | - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 487 | - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 488 | - `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 489 | - `originType` int DEFAULT NULL, | |
| 490 | - `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 491 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 492 | - `aliveSecond` int DEFAULT NULL, | |
| 493 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 494 | - `serverId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 495 | - `pushTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 496 | - `status` int DEFAULT NULL, | |
| 497 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 498 | - `pushIng` int DEFAULT NULL, | |
| 499 | - `self` int DEFAULT NULL, | |
| 500 | - PRIMARY KEY (`id`), | |
| 501 | - UNIQUE KEY `stream_push_pk` (`app`,`stream`) | |
| 502 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; | |
| 503 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 504 | - | |
| 505 | --- | |
| 506 | --- Dumping data for table `stream_push` | |
| 507 | --- | |
| 508 | - | |
| 509 | -LOCK TABLES `stream_push` WRITE; | |
| 510 | -/*!40000 ALTER TABLE `stream_push` DISABLE KEYS */; | |
| 511 | -/*!40000 ALTER TABLE `stream_push` ENABLE KEYS */; | |
| 512 | -UNLOCK TABLES; | |
| 513 | - | |
| 514 | --- | |
| 515 | --- Table structure for table `user` | |
| 516 | --- | |
| 517 | - | |
| 518 | -DROP TABLE IF EXISTS `user`; | |
| 519 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 520 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 521 | -CREATE TABLE `user` ( | |
| 522 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 523 | - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 524 | - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 525 | - `roleId` int NOT NULL, | |
| 526 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 527 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 528 | - `pushKey` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | |
| 529 | - PRIMARY KEY (`id`) USING BTREE, | |
| 530 | - UNIQUE KEY `user_username_uindex` (`username`) USING BTREE | |
| 531 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 532 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 533 | - | |
| 534 | --- | |
| 535 | --- Dumping data for table `user` | |
| 536 | --- | |
| 537 | - | |
| 538 | -LOCK TABLES `user` WRITE; | |
| 539 | -/*!40000 ALTER TABLE `user` DISABLE KEYS */; | |
| 540 | -INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3'); | |
| 541 | -/*!40000 ALTER TABLE `user` ENABLE KEYS */; | |
| 542 | -UNLOCK TABLES; | |
| 543 | - | |
| 544 | --- | |
| 545 | --- Table structure for table `user_role` | |
| 546 | --- | |
| 547 | - | |
| 548 | -DROP TABLE IF EXISTS `user_role`; | |
| 549 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | |
| 550 | -/*!50503 SET character_set_client = utf8mb4 */; | |
| 551 | -CREATE TABLE `user_role` ( | |
| 552 | - `id` int NOT NULL AUTO_INCREMENT, | |
| 553 | - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 554 | - `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 555 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 556 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | |
| 557 | - PRIMARY KEY (`id`) USING BTREE | |
| 558 | -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | |
| 559 | -/*!40101 SET character_set_client = @saved_cs_client */; | |
| 560 | - | |
| 561 | --- | |
| 562 | --- Dumping data for table `user_role` | |
| 563 | --- | |
| 564 | - | |
| 565 | -LOCK TABLES `user_role` WRITE; | |
| 566 | -/*!40000 ALTER TABLE `user_role` DISABLE KEYS */; | |
| 567 | -INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57'); | |
| 568 | -/*!40000 ALTER TABLE `user_role` ENABLE KEYS */; | |
| 569 | -UNLOCK TABLES; | |
| 570 | -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; | |
| 571 | - | |
| 572 | -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; | |
| 573 | -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; | |
| 574 | -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; | |
| 575 | -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; | |
| 576 | -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; | |
| 577 | -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; | |
| 578 | -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; | |
| 579 | - | |
| 580 | --- Dump completed on 2022-11-29 11:47:46 | |
| 581 | 289 | \ No newline at end of file | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
| ... | ... | @@ -78,7 +78,7 @@ public class Device { |
| 78 | 78 | * 在线 |
| 79 | 79 | */ |
| 80 | 80 | @Schema(description = "是否在线,true为在线,false为离线") |
| 81 | - private boolean online; | |
| 81 | + private boolean onLine; | |
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | /** |
| ... | ... | @@ -286,12 +286,12 @@ public class Device { |
| 286 | 286 | this.hostAddress = hostAddress; |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | - public boolean isOnline() { | |
| 290 | - return online; | |
| 289 | + public boolean isOnLine() { | |
| 290 | + return onLine; | |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - public void setOnline(boolean online) { | |
| 294 | - this.online = online; | |
| 293 | + public void setOnLine(boolean onLine) { | |
| 294 | + this.onLine = onLine; | |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | public int getChannelCount() { | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
| ... | ... | @@ -65,7 +65,7 @@ public class NotifyRequestForCatalogProcessor extends SIPRequestProcessorParent |
| 65 | 65 | String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader); |
| 66 | 66 | |
| 67 | 67 | Device device = redisCatchStorage.getDevice(deviceId); |
| 68 | - if (device == null || !device.isOnline()) { | |
| 68 | + if (device == null || !device.isOnLine()) { | |
| 69 | 69 | logger.warn("[收到目录订阅]:{}, 但是设备已经离线", (device != null ? device.getDeviceId():"" )); |
| 70 | 70 | return; |
| 71 | 71 | } | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
| ... | ... | @@ -372,7 +372,7 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements |
| 372 | 372 | String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader); |
| 373 | 373 | |
| 374 | 374 | Device device = redisCatchStorage.getDevice(deviceId); |
| 375 | - if (device == null || !device.isOnline()) { | |
| 375 | + if (device == null || !device.isOnLine()) { | |
| 376 | 376 | logger.warn("[收到目录订阅]:{}, 但是设备已经离线", (device != null ? device.getDeviceId():"" )); |
| 377 | 377 | return; |
| 378 | 378 | } | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
| ... | ... | @@ -166,7 +166,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen |
| 166 | 166 | device.setGeoCoordSys("WGS84"); |
| 167 | 167 | device.setTreeType("CivilCode"); |
| 168 | 168 | device.setDeviceId(deviceId); |
| 169 | - device.setOnline(false); | |
| 169 | + device.setOnLine(false); | |
| 170 | 170 | } |
| 171 | 171 | device.setIp(remoteAddressInfo.getIp()); |
| 172 | 172 | device.setPort(remoteAddressInfo.getPort()); | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
| ... | ... | @@ -83,12 +83,12 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp |
| 83 | 83 | |
| 84 | 84 | device.setKeepaliveTime(DateUtil.getNow()); |
| 85 | 85 | |
| 86 | - if (device.isOnline()) { | |
| 86 | + if (device.isOnLine()) { | |
| 87 | 87 | deviceService.updateDevice(device); |
| 88 | 88 | }else { |
| 89 | 89 | // 对于已经离线的设备判断他的注册是否已经过期 |
| 90 | 90 | if (!deviceService.expire(device)){ |
| 91 | - device.setOnline(false); | |
| 91 | + device.setOnLine(false); | |
| 92 | 92 | deviceService.online(device, null); |
| 93 | 93 | } |
| 94 | 94 | } | ... | ... |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java
| ... | ... | @@ -54,7 +54,7 @@ public class DeviceInfoResponseMessageHandler extends SIPRequestProcessorParent |
| 54 | 54 | public void handForDevice(RequestEvent evt, Device device, Element rootElement) { |
| 55 | 55 | logger.debug("接收到DeviceInfo应答消息"); |
| 56 | 56 | // 检查设备是否存在, 不存在则不回复 |
| 57 | - if (device == null || !device.isOnline()) { | |
| 57 | + if (device == null || !device.isOnLine()) { | |
| 58 | 58 | logger.warn("[接收到DeviceInfo应答消息,但是设备已经离线]:" + (device != null ? device.getDeviceId():"" )); |
| 59 | 59 | return; |
| 60 | 60 | } | ... | ... |
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
| ... | ... | @@ -118,7 +118,7 @@ public class DeviceServiceImpl implements IDeviceService { |
| 118 | 118 | |
| 119 | 119 | // 第一次上线 或则设备之前是离线状态--进行通道同步和设备信息查询 |
| 120 | 120 | if (device.getCreateTime() == null) { |
| 121 | - device.setOnline(true); | |
| 121 | + device.setOnLine(true); | |
| 122 | 122 | device.setCreateTime(now); |
| 123 | 123 | logger.info("[设备上线,首次注册]: {},查询设备信息以及通道信息", device.getDeviceId()); |
| 124 | 124 | deviceMapper.add(device); |
| ... | ... | @@ -130,8 +130,8 @@ public class DeviceServiceImpl implements IDeviceService { |
| 130 | 130 | } |
| 131 | 131 | sync(device); |
| 132 | 132 | }else { |
| 133 | - if(!device.isOnline()){ | |
| 134 | - device.setOnline(true); | |
| 133 | + if(!device.isOnLine()){ | |
| 134 | + device.setOnLine(true); | |
| 135 | 135 | device.setCreateTime(now); |
| 136 | 136 | deviceMapper.update(device); |
| 137 | 137 | redisCatchStorage.updateDevice(device); |
| ... | ... | @@ -185,7 +185,7 @@ public class DeviceServiceImpl implements IDeviceService { |
| 185 | 185 | } |
| 186 | 186 | String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + deviceId; |
| 187 | 187 | dynamicTask.stop(registerExpireTaskKey); |
| 188 | - device.setOnline(false); | |
| 188 | + device.setOnLine(false); | |
| 189 | 189 | redisCatchStorage.updateDevice(device); |
| 190 | 190 | deviceMapper.update(device); |
| 191 | 191 | //进行通道离线 |
| ... | ... | @@ -231,7 +231,7 @@ public class DeviceServiceImpl implements IDeviceService { |
| 231 | 231 | } |
| 232 | 232 | logger.info("[移除目录订阅]: {}", device.getDeviceId()); |
| 233 | 233 | String taskKey = device.getDeviceId() + "catalog"; |
| 234 | - if (device.isOnline()) { | |
| 234 | + if (device.isOnLine()) { | |
| 235 | 235 | Runnable runnable = dynamicTask.get(taskKey); |
| 236 | 236 | if (runnable instanceof ISubscribeTask) { |
| 237 | 237 | ISubscribeTask subscribeTask = (ISubscribeTask) runnable; |
| ... | ... | @@ -264,7 +264,7 @@ public class DeviceServiceImpl implements IDeviceService { |
| 264 | 264 | } |
| 265 | 265 | logger.info("[移除移动位置订阅]: {}", device.getDeviceId()); |
| 266 | 266 | String taskKey = device.getDeviceId() + "mobile_position"; |
| 267 | - if (device.isOnline()) { | |
| 267 | + if (device.isOnLine()) { | |
| 268 | 268 | Runnable runnable = dynamicTask.get(taskKey); |
| 269 | 269 | if (runnable instanceof ISubscribeTask) { |
| 270 | 270 | ISubscribeTask subscribeTask = (ISubscribeTask) runnable; |
| ... | ... | @@ -331,7 +331,7 @@ public class DeviceServiceImpl implements IDeviceService { |
| 331 | 331 | |
| 332 | 332 | @Override |
| 333 | 333 | public void checkDeviceStatus(Device device) { |
| 334 | - if (device == null || !device.isOnline()) { | |
| 334 | + if (device == null || !device.isOnLine()) { | |
| 335 | 335 | return; |
| 336 | 336 | } |
| 337 | 337 | try { |
| ... | ... | @@ -568,7 +568,7 @@ public class DeviceServiceImpl implements IDeviceService { |
| 568 | 568 | |
| 569 | 569 | @Override |
| 570 | 570 | public void addDevice(Device device) { |
| 571 | - device.setOnline(false); | |
| 571 | + device.setOnLine(false); | |
| 572 | 572 | device.setCreateTime(DateUtil.getNow()); |
| 573 | 573 | device.setUpdateTime(DateUtil.getNow()); |
| 574 | 574 | deviceMapper.addCustomDevice(device); | ... | ... |
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
| ... | ... | @@ -41,7 +41,7 @@ public interface DeviceMapper { |
| 41 | 41 | "as_message_channel," + |
| 42 | 42 | "geo_coord_sys," + |
| 43 | 43 | "tree_type," + |
| 44 | - "online," + | |
| 44 | + "on_line," + | |
| 45 | 45 | "media_server_id," + |
| 46 | 46 | "(SELECT count(0) FROM wvp_device_channel WHERE device_id=wvp_device.device_id) as channel_count "+ |
| 47 | 47 | " FROM wvp_device WHERE device_id = #{deviceId}") |
| ... | ... | @@ -75,7 +75,7 @@ public interface DeviceMapper { |
| 75 | 75 | "as_message_channel,"+ |
| 76 | 76 | "geo_coord_sys,"+ |
| 77 | 77 | "tree_type,"+ |
| 78 | - "online"+ | |
| 78 | + "on_line"+ | |
| 79 | 79 | ") VALUES (" + |
| 80 | 80 | "#{deviceId}," + |
| 81 | 81 | "#{name}," + |
| ... | ... | @@ -104,7 +104,7 @@ public interface DeviceMapper { |
| 104 | 104 | "#{asMessageChannel}," + |
| 105 | 105 | "#{geoCoordSys}," + |
| 106 | 106 | "#{treeType}," + |
| 107 | - "#{online}" + | |
| 107 | + "#{onLine}" + | |
| 108 | 108 | ")") |
| 109 | 109 | int add(Device device); |
| 110 | 110 | |
| ... | ... | @@ -120,7 +120,7 @@ public interface DeviceMapper { |
| 120 | 120 | "<if test=\"localIp != null\">, local_ip=#{localIp}</if>" + |
| 121 | 121 | "<if test=\"port != null\">, port=#{port}</if>" + |
| 122 | 122 | "<if test=\"hostAddress != null\">, host_address=#{hostAddress}</if>" + |
| 123 | - "<if test=\"online != null\">, online=#{online}</if>" + | |
| 123 | + "<if test=\"onLine != null\">, on_line=#{onLine}</if>" + | |
| 124 | 124 | "<if test=\"registerTime != null\">, register_time=#{registerTime}</if>" + |
| 125 | 125 | "<if test=\"keepaliveTime != null\">, keepalive_time=#{keepaliveTime}</if>" + |
| 126 | 126 | "<if test=\"keepaliveIntervalTime != null\">, keepalive_interval_time=#{keepaliveIntervalTime}</if>" + |
| ... | ... | @@ -159,15 +159,15 @@ public interface DeviceMapper { |
| 159 | 159 | "as_message_channel,"+ |
| 160 | 160 | "geo_coord_sys,"+ |
| 161 | 161 | "tree_type,"+ |
| 162 | - "online,"+ | |
| 162 | + "on_line,"+ | |
| 163 | 163 | "media_server_id,"+ |
| 164 | 164 | "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " + |
| 165 | 165 | "FROM wvp_device de" + |
| 166 | - "<if test=\"online != null\"> where online=${online}</if>"+ | |
| 166 | + "<if test=\"onLine != null\"> where on_line=${onLine}</if>"+ | |
| 167 | 167 | " order by create_time desc "+ |
| 168 | 168 | " </script>" |
| 169 | 169 | ) |
| 170 | - List<Device> getDevices(Boolean online); | |
| 170 | + List<Device> getDevices(Boolean onLine); | |
| 171 | 171 | |
| 172 | 172 | @Delete("DELETE FROM wvp_device WHERE device_id=#{deviceId}") |
| 173 | 173 | int del(String deviceId); |
| ... | ... | @@ -200,8 +200,8 @@ public interface DeviceMapper { |
| 200 | 200 | "as_message_channel,"+ |
| 201 | 201 | "geo_coord_sys,"+ |
| 202 | 202 | "tree_type,"+ |
| 203 | - "online"+ | |
| 204 | - " FROM wvp_device WHERE online = true") | |
| 203 | + "on_line"+ | |
| 204 | + " FROM wvp_device WHERE on_line = true") | |
| 205 | 205 | List<Device> getOnlineDevices(); |
| 206 | 206 | @Select("SELECT " + |
| 207 | 207 | "device_id,"+ |
| ... | ... | @@ -231,7 +231,7 @@ public interface DeviceMapper { |
| 231 | 231 | "as_message_channel,"+ |
| 232 | 232 | "geo_coord_sys,"+ |
| 233 | 233 | "tree_type,"+ |
| 234 | - "online"+ | |
| 234 | + "on_line"+ | |
| 235 | 235 | " FROM wvp_device WHERE ip = #{host} AND port=#{port}") |
| 236 | 236 | Device getDeviceByHostAndPort(String host, int port); |
| 237 | 237 | |
| ... | ... | @@ -270,7 +270,7 @@ public interface DeviceMapper { |
| 270 | 270 | "as_message_channel,"+ |
| 271 | 271 | "geo_coord_sys,"+ |
| 272 | 272 | "tree_type,"+ |
| 273 | - "online,"+ | |
| 273 | + "on_line,"+ | |
| 274 | 274 | "media_server_id"+ |
| 275 | 275 | ") VALUES (" + |
| 276 | 276 | "#{deviceId}," + |
| ... | ... | @@ -284,7 +284,7 @@ public interface DeviceMapper { |
| 284 | 284 | "#{asMessageChannel}," + |
| 285 | 285 | "#{geoCoordSys}," + |
| 286 | 286 | "#{treeType}," + |
| 287 | - "#{online}," + | |
| 287 | + "#{onLine}," + | |
| 288 | 288 | "#{mediaServerId}" + |
| 289 | 289 | ")") |
| 290 | 290 | void addCustomDevice(Device device); | ... | ... |
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
| ... | ... | @@ -561,7 +561,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage { |
| 561 | 561 | |
| 562 | 562 | @Override |
| 563 | 563 | public boolean deviceIsOnline(String deviceId) { |
| 564 | - return getDevice(deviceId).isOnline(); | |
| 564 | + return getDevice(deviceId).isOnLine(); | |
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | ... | ... |
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
| ... | ... | @@ -90,7 +90,7 @@ public class ApiDeviceController { |
| 90 | 90 | deviceJsonObject.put("RecvStreamIP", ""); |
| 91 | 91 | deviceJsonObject.put("CatalogInterval", 3600); // 通道目录抓取周期 |
| 92 | 92 | deviceJsonObject.put("SubscribeInterval", device.getSubscribeCycleForCatalog()); // 订阅周期(秒), 0 表示后台不周期订阅 |
| 93 | - deviceJsonObject.put("Online", device.isOnline()); | |
| 93 | + deviceJsonObject.put("Online", device.isOnLine()); | |
| 94 | 94 | deviceJsonObject.put("Password", ""); |
| 95 | 95 | deviceJsonObject.put("MediaTransport", device.getTransport()); |
| 96 | 96 | deviceJsonObject.put("RemoteIP", device.getIp()); | ... | ... |
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
| ... | ... | @@ -92,7 +92,7 @@ public class ApiStreamController { |
| 92 | 92 | result.put("error","device[ " + serial + " ]未找到"); |
| 93 | 93 | resultDeferredResult.setResult(result); |
| 94 | 94 | return resultDeferredResult; |
| 95 | - }else if (!device.isOnline()) { | |
| 95 | + }else if (!device.isOnLine()) { | |
| 96 | 96 | JSONObject result = new JSONObject(); |
| 97 | 97 | result.put("error","device[ " + code + " ]offline"); |
| 98 | 98 | resultDeferredResult.setResult(result); | ... | ... |