Commit 8b0ff3767b23f9479a0b3ebe8e343ed6470bd194
Merge branch 'wvp-28181-2.0'
# Conflicts: # sql/update.sql # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
Showing
100 changed files
with
1578 additions
and
371 deletions
Too many changes to show.
To preserve performance only 100 of 204 files are displayed.
README.md
| 1 |  | 1 |  |
| 2 | -# 寮绠卞嵆鐢ㄧ殑鐨8181鍗忚瑙嗛骞冲彴 | 2 | +# 寮绠卞嵆鐢ㄧ殑28181鍗忚瑙嗛骞冲彴 |
| 3 | 3 | ||
| 4 | [](https://travis-ci.org/xia-chu/ZLMediaKit) | 4 | [](https://travis-ci.org/xia-chu/ZLMediaKit) |
| 5 | [](https://github.com/xia-chu/ZLMediaKit/blob/master/LICENSE) | 5 | [](https://github.com/xia-chu/ZLMediaKit/blob/master/LICENSE) |
| @@ -25,7 +25,7 @@ WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勫紑绠卞嵆鐢ㄧ殑缃戠 | @@ -25,7 +25,7 @@ WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勫紑绠卞嵆鐢ㄧ殑缃戠 | ||
| 25 | 鏃ㄥ湪鎵撻犱竴涓槗閰嶇疆,鏄撲娇鐢,渚夸簬缁存姢鐨8181鍥芥爣淇′护绯荤粺, 渚濇墭浼樼鐨勫紑婧愭祦濯掍綋鏈嶅姟妗嗘灦ZLMediaKit, 瀹炵幇涓涓畬鏁存槗鐢℅B28181骞冲彴. | 25 | 鏃ㄥ湪鎵撻犱竴涓槗閰嶇疆,鏄撲娇鐢,渚夸簬缁存姢鐨8181鍥芥爣淇′护绯荤粺, 渚濇墭浼樼鐨勫紑婧愭祦濯掍綋鏈嶅姟妗嗘灦ZLMediaKit, 瀹炵幇涓涓畬鏁存槗鐢℅B28181骞冲彴. |
| 26 | 26 | ||
| 27 | # 閮ㄧ讲鏂囨。 | 27 | # 閮ㄧ讲鏂囨。 |
| 28 | -[https://github.com/648540858/wvp-GB28181-pro/wiki](https://github.com/648540858/wvp-GB28181-pro/wiki) | 28 | +[doc.wvp-pro.cn](https://doc.wvp-pro.cn) |
| 29 | 29 | ||
| 30 | # gitee鍚屾浠撳簱 | 30 | # gitee鍚屾浠撳簱 |
| 31 | https://gitee.com/pan648540858/wvp-GB28181-pro.git | 31 | https://gitee.com/pan648540858/wvp-GB28181-pro.git |
bootstrap.sh
100755 → 100644
doc/README.md
0 → 100644
| 1 | +# 介绍 | ||
| 2 | + | ||
| 3 | +> 开箱即用的28181协议视频平台 | ||
| 4 | + | ||
| 5 | +# 概述 | ||
| 6 | +- WVP-PRO基于GB/T 28181-2016标准实现的流媒体平台，依托优秀的开源流媒体服务[ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit)，提供完善丰富的功能。 | ||
| 7 | +- GB/T 28181-2016 中文标准名称是《公共安全视频监控联网系统信息传输、交换、控制技术要求》是监控领域的国家标准。大量应用于政府视频平台。 | ||
| 8 | +- 通过28181协议你可以将IPC摄像头接入平台，可以观看也可以使用28181/rtsp/rtmp/flv等协议将视频流分发到其他平台。 | ||
| 9 | + | ||
| 10 | +# 特性 | ||
| 11 | +- 实现标准的28181信令，兼容常见的品牌设备，比如海康、大华、宇视等品牌的IPC、NVR以及平台。 | ||
| 12 | +- 支持将国标设备级联到其他国标平台，也支持将不支持国标的设备的图像或者直播推送到其他国标平台 | ||
| 13 | +- 前端完善，自带完整前端页面，无需二次开发可直接部署使用。 | ||
| 14 | +- 完全开源，且使用MIT许可协议。保留版权的情况下可以用于商业项目。 | ||
| 15 | +- 支持多流媒体节点负载均衡。 | ||
| 16 | + | ||
| 17 | +# 我们实现了哪些国标功能 | ||
| 18 | +**作为上级平台** | ||
| 19 | +- [X] 注册 | ||
| 20 | +- [X] 注销 | ||
| 21 | +- [X] 实时视音频点播 | ||
| 22 | +- [X] 设备控制 | ||
| 23 | + - [X] 云台控制 | ||
| 24 | + - [ ] 远程启动 | ||
| 25 | + - [ ] 录像控制 | ||
| 26 | + - [ ] 报警布防/撤防 | ||
| 27 | + - [ ] 报警复位 | ||
| 28 | + - [X] 强制关键帧 | ||
| 29 | + - [ ] 拉框放大 | ||
| 30 | + - [ ] 拉框缩小 | ||
| 31 | + - [ ] 看守位控制 | ||
| 32 | + - [ ] 设备配置 | ||
| 33 | +- [X] 报警事件通知和分发 | ||
| 34 | +- [X] 设备目录订阅 | ||
| 35 | +- [X] 网络设备信息查询 | ||
| 36 | + - [X] 设备目录查询 | ||
| 37 | + - [X] 设备状态查询 | ||
| 38 | + - [ ] 设备配置查询 | ||
| 39 | + - [ ] 设备预置位查询 | ||
| 40 | +- [X] 状态信息报送 | ||
| 41 | +- [X] 设备视音频文件检索 | ||
| 42 | +- [X] 历史视音频的回放 | ||
| 43 | + - [X] 播放 | ||
| 44 | + - [X] 暂停 | ||
| 45 | + - [X] 进/退 | ||
| 46 | + - [X] 停止 | ||
| 47 | +- [X] 视音频文件下载 | ||
| 48 | +- [X] 校时 | ||
| 49 | +- [X] 订阅和通知 | ||
| 50 | + - [X] 事件订阅 | ||
| 51 | + - [X] 移动设备位置订阅 | ||
| 52 | + - [X] 报警订阅 | ||
| 53 | + - [X] 目录订阅 | ||
| 54 | +- [ ] 语音广播 | ||
| 55 | +- [ ] 语音对讲 | ||
| 56 | + | ||
| 57 | +**作为下级平台** | ||
| 58 | +- [X] 注册 | ||
| 59 | +- [X] 注销 | ||
| 60 | +- [X] 实时视音频点播 | ||
| 61 | +- [ ] 设备控制 | ||
| 62 | + - [ ] 云台控制 | ||
| 63 | + - [ ] 远程启动 | ||
| 64 | + - [ ] 录像控制 | ||
| 65 | + - [ ] 报警布防/撤防 | ||
| 66 | + - [ ] 报警复位 | ||
| 67 | + - [ ] 强制关键帧 | ||
| 68 | + - [ ] 拉框放大 | ||
| 69 | + - [ ] 拉框缩小 | ||
| 70 | + - [ ] 看守位控制 | ||
| 71 | + - [ ] 设备配置 | ||
| 72 | +- [ ] 报警事件通知和分发 | ||
| 73 | +- [X] 设备目录订阅 | ||
| 74 | +- [X] 网络设备信息查询 | ||
| 75 | + - [X] 设备目录查询 | ||
| 76 | + - [X] 设备状态查询 | ||
| 77 | + - [ ] 设备配置查询 | ||
| 78 | + - [ ] 设备预置位查询 | ||
| 79 | +- [X] 状态信息报送 | ||
| 80 | +- [X] 设备视音频文件检索 | ||
| 81 | +- [X] 历史视音频的回放 | ||
| 82 | + - [X] 播放 | ||
| 83 | + - [x] 暂停 | ||
| 84 | + - [x] 进/退 | ||
| 85 | + - [x] 停止 | ||
| 86 | +- [ ] 视音频文件下载 | ||
| 87 | +- [ ] ~~校时~~ | ||
| 88 | +- [X] 订阅和通知 | ||
| 89 | + - [X] 事件订阅 | ||
| 90 | + - [X] 移动设备位置订阅 | ||
| 91 | + - [ ] 报警订阅 | ||
| 92 | + - [X] 目录订阅 | ||
| 93 | +- [ ] 语音广播 | ||
| 94 | +- [ ] 语音对讲 | ||
| 95 | + | ||
| 96 | + | ||
| 97 | + | ||
| 98 | + | ||
| 99 | +# 社区 | ||
| 100 | +代码目前托管在GitHub和Gitee，Gitee目前作为加速仓库使用，不接受issue。 | ||
| 101 | +GitHub： [https://github.com/648540858/wvp-GB28181-pro](https://github.com/648540858/wvp-GB28181-pro) | ||
| 102 | +Gitee： [https://gitee.com/pan648540858/wvp-GB28181-pro](https://gitee.com/pan648540858/wvp-GB28181-pro) | ||
| 0 | \ No newline at end of file | 103 | \ No newline at end of file |
doc/_content/ability/_media/cascade1.png
0 → 100644
37.4 KB
doc/_content/ability/_media/cascade2.png
0 → 100644
162 KB
doc/_content/ability/_media/cascade3.png
0 → 100644
129 KB
doc/_content/ability/_media/cascade4.png
0 → 100644
119 KB
doc/_content/ability/_media/img.png
0 → 100644
13.1 KB
doc/_content/ability/_media/img_1.png
0 → 100644
17.1 KB
doc/_content/ability/_media/img_10.png
0 → 100644
65.1 KB
doc/_content/ability/_media/img_11.png
0 → 100644
80.5 KB
doc/_content/ability/_media/img_12.png
0 → 100644
66.2 KB
doc/_content/ability/_media/img_13.png
0 → 100644
58.1 KB
doc/_content/ability/_media/img_14.png
0 → 100644
692 Bytes
doc/_content/ability/_media/img_15.png
0 → 100644
98.9 KB
doc/_content/ability/_media/img_16.png
0 → 100644
41.5 KB
doc/_content/ability/_media/img_17.png
0 → 100644
56.3 KB
doc/_content/ability/_media/img_18.png
0 → 100644
64.6 KB
doc/_content/ability/_media/img_2.png
0 → 100644
41.1 KB
doc/_content/ability/_media/img_3.png
0 → 100644
16.2 KB
doc/_content/ability/_media/img_4.png
0 → 100644
136 KB
doc/_content/ability/_media/img_5.png
0 → 100644
152 KB
doc/_content/ability/_media/img_6.png
0 → 100644
62.2 KB
doc/_content/ability/_media/img_7.png
0 → 100644
46.3 KB
doc/_content/ability/_media/img_8.png
0 → 100644
43.8 KB
doc/_content/ability/_media/img_9.png
0 → 100644
80.1 KB
doc/_content/ability/auto_play.md
0 → 100644
doc/_content/ability/cascade.md
0 → 100644
| 1 | +<!-- 国标级联的使用 --> | ||
| 2 | +# 国标级联的使用 | ||
| 3 | +国标28181不同平台之间支持两种连接方式，平级和上下级，WVP目前支持向上级级联。 | ||
| 4 | +## 1 接入平台 | ||
| 5 | +### 1.1 wvp-pro | ||
| 6 | +#### 1.1.1 wvp-pro管理页面点击添加 | ||
| 7 | +  | ||
| 8 | +#### 1.1.2 填入wvp-pro上级平台信息 | ||
| 9 | +  | ||
| 10 | +  | ||
| 11 | +#### 1.1.3 编辑wvp-pro上级设备信息，开启订阅 | ||
| 12 | +  | ||
| 13 | +### 1.2 大华平台 | ||
| 14 | +### 1.3 海康平台 | ||
| 15 | +### 1.4 liveGBS | ||
| 16 | +#### 1.4.1. wvp-pro管理页面点击添加 | ||
| 17 | +  | ||
| 18 | +#### 1.4.2. 填入liveGBS平台信息 | ||
| 19 | +  | ||
| 20 | +  | ||
| 21 | +#### 1.4.3. 编辑liveGBS设备信息，开启目录订阅 | ||
| 22 | +  | ||
| 23 | +#### 1.4.4. 编辑liveGBS设备信息，开启GPS订阅 | ||
| 24 | +  | ||
| 25 | + | ||
| 26 | +## 2 添加目录与通道 | ||
| 27 | +1. 级联平台添加目录信息 | ||
| 28 | +  | ||
| 29 | +2. 为目录添加通道 | ||
| 30 | +  | ||
| 31 | +3. 设置默认流目录 | ||
| 32 | +如果需要后续自动生成的流信息都在某一个节点下，可以在对应节点右键设置为默认 | ||
| 33 | +  | ||
| 34 | + |
doc/_content/ability/cascade2.md
0 → 100644
| 1 | +<!-- 国标级联的使用 --> | ||
| 2 | +# 国标级联的使用 | ||
| 3 | +国标28181不同平台之间支持两种连接方式，平级和上下级，WVP目前支持向上级级联。 | ||
| 4 | +## 添加上级平台 | ||
| 5 | +在国标级联页面点击“添加”按钮，以推送到上级WVP为例子，参看[接入设备](./_content/ability/device.md) | ||
| 6 | + | ||
| 7 | +点击保存可以在上级的国标通道列表看到新增加的设备； | ||
| 8 | +国标级联列表出现了级联的这个平台；同时状态显示为在线，如果状态为离线那么可能是你的服务信息配置有误或者网络不通。 | ||
| 9 | +订阅信息列有三个图标，表示上级开启订阅，从左到右依次是：报警订阅，目录订阅，移动位置订阅。 | ||
| 10 | +## 推送通道 | ||
| 11 | +点击你要推送的平台的“选择通道”按钮。 | ||
| 12 | + | ||
| 13 | +- **页面结构** | ||
| 14 | + - 左侧为目录结构 | ||
| 15 | + 选择未分配，则右侧显示待分配的通道，可以点击“添加按钮”，在弹窗中选择要放置的位置，保存后即可添加通道成功 | ||
| 16 | + 选择其他的目录可以看到已经分配在这个目录下的通道，可以对其进行删除后重新在未分配中去分配。 | ||
| 17 | + - 右侧为数据展示以及操作 | ||
| 18 | + 国标通道栏内为来自其他国标设备/平台的通道；直播流通道为来自推流/拉流代理的通道。 | ||
| 0 | \ No newline at end of file | 19 | \ No newline at end of file |
doc/_content/ability/cloud_record.md
0 → 100644
| 1 | +<!-- 云端录像 --> | ||
| 2 | +# 云端录像 | ||
| 3 | +云端录像是对录制在zlm服务下的录像文件的管理，录像的文件路径默认在ZLM/www/record下，使用云端录像功能必须部署wvp-pro-assist，主要通过调用wvp-pro-assist的接口完成各种功能。 | ||
| 4 | +如果你需要24小时的录像，目前有一个这种方案，可以参考[7*24不间断录像](./_content/ability/continuous_recording.md)。 | ||
| 5 | +1. 云段录像支持录像文件的查看，播放（可能因为编码的原因导致无法播放）； | ||
| 6 | +2. 支持录像的下载； | ||
| 7 | +3. 支持录像的合并下载； | ||
| 8 | +功能没有太多特殊的地方就不一一介绍了，大家自行体验吧。 |
doc/_content/ability/continuous_recording.md
0 → 100644
| 1 | +<!-- 7*24不间断录像 --> | ||
| 2 | +# 7*24不间断录像 | ||
| 3 | + | ||
| 4 | +目前如果要实现不间断录像如果只是关闭无人观看停止推流是不够的，设备可能经历断网，重启，都会导致录像的中断，目前给大家提供一种可用的临时方案。 | ||
| 5 | + | ||
| 6 | +**原理：** wvp支持使用流地址自动点播，即你拿到一个流地址直接去播放，即使设备处于未点播状态，wvp会自动帮你点播；ZLM | ||
| 7 | +的拉流代理成功后会无限重试，只要流一恢复就可以拉起来，基于这两个原理。 | ||
| 8 | +**方案如下：** | ||
| 9 | +1. wvp的配置中user-settings->auto-apply-play设置为团true,开启自动点播； | ||
| 10 | +2. 点击你要录像的通道，点击播放页面左下角的“更多地址”，点击rtsp，此时复制了rtsp地址到剪贴板； | ||
| 11 | +3. 在拉流代理中添加一路流，地址填写你复制的地址，启用成功即可。 | ||
| 12 | +**前提：** | ||
| 13 | +1. wvp使用多端口收流，不然你无法得到一个固定的流地址，也就无法实现自动点播。 | ||
| 14 | + |
doc/_content/ability/device.md
0 → 100644
| 1 | +<!-- 接入设备 --> | ||
| 2 | +# 接入设备 | ||
| 3 | +设备接入主要是需要在设备上配置28181上级也就是WVP-PRO的信息，只有信息一致的情况才可以注册成功。设备注册成功后打开WVP->国标设备,可以看到新增加的设备；[设备使用](./_content/ability/device_use.md)， | ||
| 4 | +主要有以下字段需要配置： | ||
| 5 | + | ||
| 6 | +- sip->ip | ||
| 7 | +本机IP，不要使用127.0.0.1/0.0.0.0, 除非你对项目及其熟悉 | ||
| 8 | + | ||
| 9 | +- sip->port | ||
| 10 | +28181服务监听的端口 | ||
| 11 | + | ||
| 12 | +- sip->domain | ||
| 13 | +domain宜采用ID统一编码的前十位编码。 | ||
| 14 | + | ||
| 15 | +- sip->id | ||
| 16 | +28181服务ID | ||
| 17 | + | ||
| 18 | +- sip->password | ||
| 19 | +28181服务密码 | ||
| 20 | + | ||
| 21 | +- 配置信息在如下位置 | ||
| 22 | + | ||
| 23 | + | ||
| 24 | +*** | ||
| 25 | +## 大华摄像头 | ||
| 26 | + | ||
| 27 | +## 大华NVR | ||
| 28 | + | ||
| 29 | +## 艾科威视摄像头 | ||
| 30 | + | ||
| 31 | +## 水星摄像头 | ||
| 32 | + | ||
| 33 | +## 海康摄像头 | ||
| 34 | + | ||
| 35 | + | ||
| 36 | +[设备使用](_content/ability/device_use.md) |
doc/_content/ability/device_use.md
0 → 100644
| 1 | +<!-- 设备使用 --> | ||
| 2 | +# 设备使用 | ||
| 3 | +### 更新设备通道 | ||
| 4 | + 点击列表末尾的“刷新”按钮，可以看到一个圆形进度条，等进度结束提示成功后即可更新完成，如果通道数量有变化你可以看点击左上角的即可看到通道数量的变化；如果通道数量仍未0,那么可能时对方尚未推送通道给你。 | ||
| 5 | +### 查看设备通道 | ||
| 6 | + 点击列表末尾的“通道”按钮， | ||
| 7 | +### 查看设备定位 | ||
| 8 | + 点击列表末尾的“定位”按钮，即可跳转到地图页面看到设备的位置 | ||
| 9 | +### 编辑设备在WVP中一些功能 | ||
| 10 | +点击列表末尾的“编辑”按钮，即可在打开的弹窗中对设备功能进行修改 | ||
| 11 | +- 设备名称 | ||
| 12 | + 如何未能从设备里读取到设备名称或者需要自己重命名，那么可以修改此选项。 | ||
| 13 | +- 字符集 | ||
| 14 | + 修改读取设备数据时使用的字符集，默认为GB2312,但是GB2312收录的汉字不全，所以有时候回遇到乱码，可以修改为UTF-8来解决。 | ||
| 15 | +- 地理坐标系 | ||
| 16 | + 展示此设备定位信息时使用的设用什么坐标系来解析经纬度，一般不用修改，如果遇到定位不准，可以修改尝试修改此选项解决。 | ||
| 17 | +- 目录结构 | ||
| 18 | + 展示设备的通道信息时，使用设备作为树形结构的依据，国标28181定义了两种树形结构，详情查看[国标28181的树形结构](./_content/theory/channel_tree.md)； | ||
| 19 | +- 目录订阅 | ||
| 20 | + 填写订阅周期即可对设备开启目录订阅，设备如果支持目录订阅那么设备在通道信息发生变化时就会通知WVP哪些通道发生了那些变化，包括通道增加/删除/更新/上线/下线/视频丢失/故障。0为取消订阅。 | ||
| 21 | + 一般NVR和平台对接可以开启此选项，直接接摄像机开启此选项意义不大。 | ||
| 22 | +- 移动位置订阅 | ||
| 23 | + 对设备开启移动位置订阅，设备如果支持目录订阅那么设备位置发生变化时会通知到WVP,一般执法记录仪可以开启此选项，对固定位置的设备意义不大。 | ||
| 24 | +- SSRC校验 | ||
| 25 | + 为了解决部分设备出现的串流问题，可以打开此选项。ZLM会严格按照给定的ssrc处理视频流。部分设备流信息不标准，开启可能导致无法点播。 | ||
| 26 | +### 删除设备 | ||
| 27 | + 可以删除WVP中的设备信息，如果设备28181配置未更改，那么设备在下一次注册后仍然会注册上来。 | ||
| 28 | +### 点播视频 | ||
| 29 | + 进入通道列表后，点击列表末尾的“播放”按钮，稍等即可弹出播放页面 | ||
| 30 | +### 设备录像 | ||
| 31 | + 进入通道列表后，点击列表末尾的“设备录像”按钮，也可以在播放页面点击录像查询进入录像查看页面，选择要查看的日期即可对录像进行播放和下载。 | ||
| 32 | +### 云台控制 | ||
| 33 | + 可以对支持云台功能的设备进行上下左右的转动以及拉近拉远的操作。 | ||
| 34 | +### 获取视频的播放器地址 | ||
| 35 | + 视频点播成功后在实时视频页面，点击“更多地址”可以看到所有的播放地址，地址是否可以播放与你是否完整编译启用zlm功能有关，更与网络有关。 | ||
| 0 | \ No newline at end of file | 36 | \ No newline at end of file |
doc/_content/ability/gis.md
0 → 100644
| 1 | +<!-- 电子地图 --> | ||
| 2 | +# 电子地图 | ||
| 3 | +WVP提供了简单的电子地图用于设备的定位以及移动设备的轨迹信息，电子地图基于开源的地图引擎openlayers开发。 | ||
| 4 | +### 查看设备定位 | ||
| 5 | +1. 可以在设备列表点击“定位”按钮,自动跳转到电子地图页面； | ||
| 6 | +2. 在电子地图页面在设备上右键点击“定位”获取设备/平台下的所有通道位置。 | ||
| 7 | +3. 单击通道信息可以定位到具体的通道 | ||
| 8 | + | ||
| 9 | + | ||
| 10 | +### 查询设备轨迹 | ||
| 11 | +查询轨迹需要提前配置save-position-history选项开启轨迹信息的保存，目前WVP此处未支持分库分表，对于大数据量的轨迹信息无法胜任，有需求请自行二次开发或者定制开发。 | ||
| 12 | +在电子地图页面在设备上右键点击“查询轨迹”获取设备轨迹信息。 | ||
| 13 | + | ||
| 14 | +PS： 目前的底图仅用用作演示和学习，商用情况请自行购买授权使用。 | ||
| 15 | + | ||
| 16 | +### 更换底图以及底图配置 | ||
| 17 | +目前WVP支持使用了更换底图，配置文件在web_src/static/js/mapConfig.js，请修改后重新编译前端文件。 | ||
| 18 | +```javascript | ||
| 19 | +window.mapParam = { | ||
| 20 | + // 开启/关闭地图功能 | ||
| 21 | + enable: true, | ||
| 22 | + // 坐标系 GCJ-02 WGS-84, | ||
| 23 | + coordinateSystem: "GCJ-02", | ||
| 24 | + // 地图瓦片地址 | ||
| 25 | + tilesUrl: "http://webrd0{1-4}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8", | ||
| 26 | + // 瓦片大小 | ||
| 27 | + tileSize: 256, | ||
| 28 | + // 默认层级 | ||
| 29 | + zoom:10, | ||
| 30 | + // 默认地图中心点 | ||
| 31 | + center:[116.41020, 39.915119], | ||
| 32 | + // 地图最大层级 | ||
| 33 | + maxZoom:18, | ||
| 34 | + // 地图最小层级 | ||
| 35 | + minZoom: 3 | ||
| 36 | +} | ||
| 37 | +``` |
doc/_content/ability/node_manger.md
0 → 100644
| 1 | +<!-- 节点管理 --> | ||
| 2 | +# 节点管理 | ||
| 3 | +WVP支持单个WVP多个ZLM的方案来扩展WVP的视频并发能力，并发点播是因为带宽和性能的原因，单个ZLM节点能支持的路数有限，所以WVP增加了ZLM集群来扩展并发并且保证ZLM的高可用。 | ||
| 4 | +## 默认节点 | ||
| 5 | +WVP中为了保证功能的完整性，ZLM节点至少要有一个默认节点，这个节点不是在管理页面添加的，而是在WVP的配置文件中配置的，这个节点不可在页面删除。每次启动会自动从配置文件中读取配置写入数据库备用。 | ||
| 6 | +## 新增节点 | ||
| 7 | +启动你要添加的zlm节点，然后点击“添加节点”按钮输入zlm的ip， http端口，SECRET。点击测试测试完成则开始对节点进行详细的设置，如果你的zlm是使用docker启动的，可能存在zlm使用的端口与宿主机端口不一致的情况，需要在这里一一配置。 | ||
| 8 | +## wvp使用多个节点的原理 | ||
| 9 | +wvp会把连接的节点统一记录在redis中，并记录zlm的负载情况，当新的请求到来时，会取出负载最低的那个zlm进行使用。以此保证节点负载均衡。 |
doc/_content/ability/online_doc.md
0 → 100644
doc/_content/ability/proxy.md
0 → 100644
| 1 | +<!-- 拉流代理 --> | ||
| 2 | +# 拉流代理 | ||
| 3 | +不是所有的摄像机都支持国标或者推流的，但是这些设备可以得到一个视频播放地址，通常为rtsp协议， | ||
| 4 | +以大华为例： | ||
| 5 | +```text | ||
| 6 | +rtsp://{user}:{passwd}@{ipc_ip}:{rtsp_port}/cam/realmonitor?channel=1&subtype=0 | ||
| 7 | +``` | ||
| 8 | +可以得到这样一个流地址，可以直接用vlc进行播放，此时我们可以通过拉流代理功能将这个设备推送给其他国标平台了。 | ||
| 9 | +流程如下： | ||
| 10 | +```plantuml | ||
| 11 | +@startuml | ||
| 12 | +"摄像机" <- "ZLMediaKit": 1. 流去流信息到ZLM | ||
| 13 | +"ZLMediaKit" -> "WVP-PRO": 2. 收到hook通知得到流信息 | ||
| 14 | +"上级国标平台" -> "WVP-PRO": 3. 点播这路视频 | ||
| 15 | +"WVP-PRO" -> "ZLMediaKit": 4. 通知推流到上级国标平台 | ||
| 16 | +@enduml | ||
| 17 | +``` | ||
| 18 | +## 添加代理 | ||
| 19 | +拉流代理支持两种方式： | ||
| 20 | +1. ZLM中直接代理流，支持RTSP/RTMP，不支持转码； | ||
| 21 | +2. 借助ffmpeg完成拉转，可以通过修改ffmpeg拉转参数完成转码。 | ||
| 22 | +点击页面的“添加代理”，安装提示操作即可，保存并启用成功后，可以在国标级联中[添加通道推送给上级平台](./_content/ability/cascade?id=_2-%e6%b7%bb%e5%8a%a0%e7%9b%ae%e5%bd%95%e4%b8%8e%e9%80%9a%e9%81%93) | ||
| 23 | + | ||
| 24 | +PS： ffmpeg默认模板不需修改，需要修改参数自行去ZLM配置文件中添加一个即可。 |
doc/_content/ability/push.md
0 → 100644
| 1 | +<!-- 推流列表 --> | ||
| 2 | +# 推流列表 | ||
| 3 | +## 功能说明 | ||
| 4 | + | ||
| 5 | +WVP支持三种图像输入方式，直播，[拉流代理](_content/ability/proxy.md)，[国标](_content/ability/device.md),直播设备接入流程如下 | ||
| 6 | +```plantuml | ||
| 7 | +@startuml | ||
| 8 | +"直播设备" -> "ZLMediaKit": 1. 发起推流 | ||
| 9 | +"ZLMediaKit" -> "WVP-PRO": 2. 收到hook通知得到流信息 | ||
| 10 | +"上级国标平台" -> "WVP-PRO": 3. 点播这路视频 | ||
| 11 | +"WVP-PRO" -> "ZLMediaKit": 4. 通知推流到上级国标平台 | ||
| 12 | +@enduml | ||
| 13 | +``` | ||
| 14 | +1. 默认情况下WVP收到推流信息后，列表中出现这条推流信息，此时你可以点击“加入国标”按钮为此路推流配置名称以及国标编号，只有有国标编号的推流才可以添加到级联平台，保存成功后可以在国标级联中[添加通道推送给上级平台](_content/ability/cascade?id=_2-%e6%b7%bb%e5%8a%a0%e7%9b%ae%e5%bd%95%e4%b8%8e%e9%80%9a%e9%81%93) | ||
| 15 | +2. WVP也支持推流前导入大量通道直接推送给上级，点击“下载模板”按钮，根据示例修改模板后，点击“通道导入”按钮导入通道数据，保存成功后可以在国标级联中[添加通道推送给上级平台](_content/ability/cascade?id=_2-%e6%b7%bb%e5%8a%a0%e7%9b%ae%e5%bd%95%e4%b8%8e%e9%80%9a%e9%81%93) | ||
| 16 | + | ||
| 17 | +## 推拉流鉴权规则 | ||
| 18 | +为了保护服务器的WVP默认开启推流鉴权（目前不支持关闭此功能） | ||
| 19 | + | ||
| 20 | +### 推流规则 | ||
| 21 | +推流时需要携带推流鉴权的签名sign，sign=md5(pushKey),pushKey来自用户表，每个用户会有一个不同的pushKey. | ||
| 22 | +例如app=test，stream=live，pushKey=1000，ip=192.168.1.4, port=10554 那么推流地址为： | ||
| 23 | +``` | ||
| 24 | +rtsp://192.168.1.4:10554/test/live?sign=a9b7ba70783b617e9998dc4dd82eb3c5 | ||
| 25 | +``` | ||
| 26 | +支持推流时自定义播放鉴权Id，参数名为callId，此时sign=md5(callId_pushKey) | ||
| 27 | +例如app=test，stream=live，pushKey=1000，callId=12345678, ip=192.168.1.4, port=10554 那么推流地址为： | ||
| 28 | +``` | ||
| 29 | +rtsp://192.168.1.4:10554/test/live?callId=12345678&sign=c8e6e01dde2d60c66dcea8d2498ffef1 | ||
| 30 | +``` | ||
| 31 | +### 播放规则 | ||
| 32 | +默认情况播放不需要鉴权，但是如果推流时携带了callId，那么播放时必须携带callId | ||
| 33 | +例如app=test，stream=live，无callId, ip=192.168.1.4, port=10554 那么播放地址为： | ||
| 34 | +``` | ||
| 35 | +rtsp://192.168.1.4:10554/test/live | ||
| 36 | +``` | ||
| 37 | +例如app=test，stream=live，callId=12345678, ip=192.168.1.4, port=10554 那么播放地址为： | ||
| 38 | +``` | ||
| 39 | +rtsp://192.168.1.4:10554/test/live?callId=12345678 | ||
| 40 | +``` | ||
| 41 | + |
doc/_content/ability/user.md
0 → 100644
doc/_content/about_doc.md
0 → 100644
doc/_content/disclaimers.md
0 → 100644
doc/_content/donation.md
0 → 100644
| 1 | +# 捐赠 | ||
| 2 | +项目目前仍在积极开发。大家的捐赠以及start可以让我看到大家的支持于关注。更加有动力把项目维护下去。 | ||
| 3 | + | ||
| 4 | +<div align="left"> | ||
| 5 | +<img src=_media/weixin.jpg style="height: 500px; border: 1px solid #e2e2e2"/> | ||
| 6 | +<img src=_media/zhifubao.jpg style="height: 500px; border: 1px solid #e2e2e2; margin-left: 20px"/> | ||
| 7 | +</div> | ||
| 0 | \ No newline at end of file | 8 | \ No newline at end of file |
doc/_content/introduction/_media/img.png
0 → 100644
112 KB
doc/_content/introduction/_media/img_1.png
0 → 100644
150 KB
doc/_content/introduction/_media/img_2.png
0 → 100644
206 KB
doc/_content/introduction/compile.md
0 → 100644
| 1 | +<!-- 编译 --> | ||
| 2 | +# 编译 | ||
| 3 | +WVP-PRO不只是实现了国标28181的协议，本身也是一个完整的视频平台。所以对于新手来说，你可能需要一些耐心来完成。遇到问题不要焦躁，你可以 | ||
| 4 | +1. 百度 | ||
| 5 | +2. 如果身边有熟悉java的朋友，可以咨询下朋友； | ||
| 6 | +3. 来群里（901799015）咨询群友； | ||
| 7 | +4. 向作者发送邮件648540858@qq.com； | ||
| 8 | +5. 作者远程支持（有偿）。 | ||
| 9 | + 如果这些仍不能解决你的问题，那么你可能需要与作者我一起合作完成这个项目，解决你遇到的问题。 | ||
| 10 | + | ||
| 11 | + | ||
| 12 | +WVP-PRO使用Spring boot开发，maven管理依赖。对于熟悉spring开发的朋友是很容易进行编译部署以及运行的。 | ||
| 13 | +下面将提供一种通用方法方便大家运行项目。 | ||
| 14 | +## 1 服务介绍 | ||
| 15 | +| 服务 | 作用 | 是否必须 | | ||
| 16 | +|----------------|------------------------------------------|-------------------------| | ||
| 17 | +| WVP-PRO | 实现国标28181的信令以及视频平台相关的功能 | 是 | | ||
| 18 | +| ZLMediaKit | 为WVP-PRO提供国标28181的媒体部分的实现，以及各种视频流格式的分发支持 | 是 | | ||
| 19 | +| wvp-pro-assist | wvp的辅助录像程序，也可单独跟zlm一起使用，提供录像控制,录像合并下载接口 | 否（不安装只是影响云端录像功能和国标录像下载） | | ||
| 20 | + | ||
| 21 | +## 2 安装依赖 | ||
| 22 | +| 依赖 | 版本 | 用途 | 开发环境需要 | 生产环境需要 | | ||
| 23 | +|--------|------------|-------------|--------|--------| | ||
| 24 | +| jdk | >=1.8 | 运行与编译java代码 | 是 | 是 | | ||
| 25 | +| maven | >=3.3 | 管理java代码依赖 | 否 | 否 | | ||
| 26 | +| git || 下载/更新/提交代码 | 否 | 否 | | ||
| 27 | +| nodejs || 编译于运行前端文件 | 否 | 否 | | ||
| 28 | +| npm || 管理前端文件依赖 | 否 | 否 | | ||
| 29 | + | ||
| 30 | +如果你是一个新手，建议你使用linux或者macOS平台。windows不推荐。 | ||
| 31 | + | ||
| 32 | +ubuntu环境，以ubuntu 18为例： | ||
| 33 | +``` bash | ||
| 34 | +apt-get install -y openjdk-11-jre git maven nodejs npm | ||
| 35 | +``` | ||
| 36 | +centos环境,以centos 8为例： | ||
| 37 | +```bash | ||
| 38 | +yum install -y java-1.8.0-openjdk.x86_64 git maven nodejs npm | ||
| 39 | +``` | ||
| 40 | +window环境，以windows10为例： | ||
| 41 | +```bash | ||
| 42 | +这里不细说了，百度或者谷歌一搜一大把，基本都是下一步下一步，然后配置环境变量。 | ||
| 43 | +``` | ||
| 44 | +## 3 安装mysql以及redis | ||
| 45 | +这里依然是参考网上教程，自行安装吧。 | ||
| 46 | + | ||
| 47 | +## 4 编译ZLMediaKit | ||
| 48 | +参考ZLMediaKit[WIKI](https://github.com/ZLMediaKit/ZLMediaKit/wiki)，截取一下关键步骤： | ||
| 49 | +```bash | ||
| 50 | +# 国内用户推荐从同步镜像网站gitee下载 | ||
| 51 | +git clone --depth 1 https://gitee.com/xia-chu/ZLMediaKit | ||
| 52 | +cd ZLMediaKit | ||
| 53 | +# 千万不要忘记执行这句命令 | ||
| 54 | +git submodule update --init | ||
| 55 | +``` | ||
| 56 | +## 5 编译WVP-PRO | ||
| 57 | +### 5.1 可以通过git克隆，也可以在项目下载点击下载 | ||
| 58 | + | ||
| 59 | + | ||
| 60 | +从gitee克隆 | ||
| 61 | +```bash | ||
| 62 | +git clone https://gitee.com/pan648540858/wvp-GB28181-pro.git | ||
| 63 | +``` | ||
| 64 | +从github克隆 | ||
| 65 | +```bash | ||
| 66 | +git clone https://github.com/648540858/wvp-GB28181-pro.git | ||
| 67 | +``` | ||
| 68 | + | ||
| 69 | +### 5.2 编译前端页面 | ||
| 70 | +```shell script | ||
| 71 | +cd wvp-GB28181-pro/web_src/ | ||
| 72 | +npm --registry=https://registry.npm.taobao.org install | ||
| 73 | +npm run build | ||
| 74 | +``` | ||
| 75 | +编译如果报错, 一般都是网络问题, 导致的依赖包下载失败 | ||
| 76 | +编译完成后在src/main/resources下出现static目录 | ||
| 77 | +**编译完成一般是这个样子，中间没有报红的错误信息** | ||
| 78 | + | ||
| 79 | + | ||
| 80 | +### 5.3 打包项目, 生成可执行jar | ||
| 81 | +```bash | ||
| 82 | +cd wvp-GB28181-pro | ||
| 83 | +mvn package | ||
| 84 | +``` | ||
| 85 | +编译如果报错, 一般都是网络问题, 导致的依赖包下载失败 | ||
| 86 | +编译完成后在target目录下出现wvp-pro-***.jar。 | ||
| 87 | +接下来[配置服务](./_content/introduction/config.md) | ||
| 88 | + | ||
| 89 | + | ||
| 90 | + | ||
| 91 | + | ||
| 92 | + | ||
| 93 | + | ||
| 94 | + | ||
| 95 | + |
doc/_content/introduction/config.md
0 → 100644
| 1 | +<!-- 配置 --> | ||
| 2 | +# 配置 | ||
| 3 | +对于首次测试或者新手同学，我建议在局域网测试，并且关闭服务器与客户机的防火墙测试。建议部署在linux进行测试。 | ||
| 4 | + | ||
| 5 | +```plantuml | ||
| 6 | +@startuml | ||
| 7 | +"WVP-PRO" -> "ZLMediaKit": RESTful 接口 | ||
| 8 | +"WVP-PRO" <-- "ZLMediaKit": Web Hook 接口 | ||
| 9 | +@enduml | ||
| 10 | +``` | ||
| 11 | +WVP-PRO通过调用ZLMediaKit的RESTful接口实现对ZLMediaKit行为的控制; ZLMediaKit通过Web Hook 接口把消息通知WVP-PRO。通过这种方式，实现了两者的互通。 | ||
| 12 | +对于最简单的配置，你不需要修改ZLMediaKit的任何默认配置。你只需要在WVP-PRO中配置的ZLMediaKit信息即可 | ||
| 13 | +## 1 WVP配置文件位置 | ||
| 14 | +基于spring boot的开发方式，配置文件的加载是很灵活的。默认在src/main/resources/application.yml，部分配置项是可选，你不需要全部配置在配置文件中， | ||
| 15 | +完全的配置说明可以参看all-application.yml。 | ||
| 16 | +### 1.1 默认加载配置文件方式 | ||
| 17 | +使用maven打包后的jar包里，已经存在了配置文件，但是每次打开jar包修改配置文件或者修改后再打包都是比较麻烦的，所以大家可通过指定配置文件路径来加载指定位置的配置文件。 | ||
| 18 | +```shell | ||
| 19 | +cd wvp-GB28181-pro/target | ||
| 20 | +java -jar wvp-pro-*.jar --spring.config.location=../src/main/resources/application.yml | ||
| 21 | +``` | ||
| 22 | +### 1.2 迁移配置文件以方便启动 | ||
| 23 | +由于配置文件的命令比较长，所以为了启动方便通常我会把配置文件放到jar包的同级目录，类似这样, | ||
| 24 | +移除jar包内/BOOT-INF/classes/下所有以application开头的文件，使用解压缩工具打开jar即可，不需要解压出来。 | ||
| 25 | +```shell | ||
| 26 | +cd wvp-GB28181-pro/target | ||
| 27 | +mv ../src/main/resources/application-dev.yml application.yml | ||
| 28 | +java -jar wvp-pro-*.jar | ||
| 29 | +``` | ||
| 30 | +这也是我自己最常用的方式。 | ||
| 31 | +## 2 配置WVP-PRO | ||
| 32 | +### 2.1 Mysql数据库配置 | ||
| 33 | +首先你需要创建一个名为wvp（也可使用其他名字）的数据库，并使用sql/mysql.sql导入数据库，初始化数据库结构。 | ||
| 34 | +在application-dev.yml中配置（使用1.2方式的是在jar包的同级目录的application.yml）配置数据库连接，包括数据库连接信息，密码。 | ||
| 35 | +### 2.2 Redis数据库配置 | ||
| 36 | +配置wvp中的redis连接信息，建议wvp自己单独使用一个db。 | ||
| 37 | +### 2.3 配置服务启动端口（可直接使用默认配置） | ||
| 38 | +```yaml | ||
| 39 | +# [可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 | ||
| 40 | +server: | ||
| 41 | + port: 18080 | ||
| 42 | +``` | ||
| 43 | +### 2.4 配置28181相关信息（可直接使用默认配置） | ||
| 44 | +```yaml | ||
| 45 | +# 作为28181服务器的配置 | ||
| 46 | +sip: | ||
| 47 | + # [必须修改] 本机的IP | ||
| 48 | + ip: 192.168.1.3 | ||
| 49 | + # [可选] 28181服务监听的端口 | ||
| 50 | + port: 5060 | ||
| 51 | + # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007） | ||
| 52 | + # 后两位为行业编码，定义参照附录D.3 | ||
| 53 | + # 3701020049标识山东济南历下区 信息行业接入 | ||
| 54 | + # [可选] | ||
| 55 | + domain: 3402000000 | ||
| 56 | + # [可选] | ||
| 57 | + id: 34020000002000000001 | ||
| 58 | + # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验 | ||
| 59 | + password: 12345678 | ||
| 60 | +``` | ||
| 61 | +### 2.5 配置ZLMediaKit连接信息 | ||
| 62 | +```yaml | ||
| 63 | +#zlm 默认服务器配置 | ||
| 64 | +media: | ||
| 65 | + # ZLMediaKit的服务ID，必须配置 | ||
| 66 | + id: FQ3TF8yT83wh5Wvz | ||
| 67 | + # [必须修改] zlm服务器的内网IP，sdp-ip与stream-ip使用默认值的情况下，这里不要使用127.0.0.1/0.0.0.0 | ||
| 68 | + ip: 192.168.1.3 | ||
| 69 | + # [必须修改] zlm服务器的http.port | ||
| 70 | + http-port: 6080 | ||
| 71 | + # [可选] zlm服务器的hook.admin_params=secret | ||
| 72 | + secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc | ||
| 73 | + # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试 | ||
| 74 | + rtp: | ||
| 75 | + # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输 | ||
| 76 | + enable: true | ||
| 77 | + # [可选] 在此范围内选择端口用于媒体流传输, | ||
| 78 | + port-range: 30000,30500 # 端口范围 | ||
| 79 | + # [可选] 国标级联在此范围内选择端口发送媒体流, | ||
| 80 | + send-port-range: 30000,30500 # 端口范围 | ||
| 81 | + # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用 | ||
| 82 | + record-assist-port: 18081 | ||
| 83 | +``` | ||
| 84 | +### 2.4 个性化定制信息配置 | ||
| 85 | +```yaml | ||
| 86 | +# [根据业务需求配置] | ||
| 87 | +user-settings: | ||
| 88 | + # [可选] 服务ID，不写则为000000 | ||
| 89 | + server-id: | ||
| 90 | + # [可选] 自动点播， 使用固定流地址进行播放时，如果未点播则自动进行点播, 需要rtp.enable=true | ||
| 91 | + auto-apply-play: false | ||
| 92 | + # [可选] 部分设备需要扩展SDP，需要打开此设置 | ||
| 93 | + senior-sdp: false | ||
| 94 | + # 保存移动位置历史轨迹：true:保留历史数据，false:仅保留最后的位置(默认) | ||
| 95 | + save-position-history: false | ||
| 96 | + # 点播等待超时时间,单位：毫秒 | ||
| 97 | + play-timeout: 3000 | ||
| 98 | + # 等待音视频编码信息再返回， true： 可以根据编码选择合适的播放器，false： 可以更快点播 | ||
| 99 | + wait-track: false | ||
| 100 | + # 是否开启接口鉴权 | ||
| 101 | + interface-authentication: true | ||
| 102 | + # 自动配置redis 可以过期事件 | ||
| 103 | + redis-config: true | ||
| 104 | + # 接口鉴权例外的接口, 即不进行接口鉴权的接口,尽量详细书写，尽量不用/**，至少两级目录 | ||
| 105 | + interface-authentication-excludes: | ||
| 106 | + - /api/v1/** | ||
| 107 | + # 推流直播是否录制 | ||
| 108 | + record-push-live: true | ||
| 109 | + # 国标是否录制 | ||
| 110 | + record-sip: true | ||
| 111 | + # 是否将日志存储进数据库 | ||
| 112 | + logInDatebase: true | ||
| 113 | + # 第三方匹配，用于从stream钟获取有效信息 | ||
| 114 | + thirdPartyGBIdReg: [\s\S]* | ||
| 115 | +``` | ||
| 116 | + | ||
| 117 | + | ||
| 118 | +如果配置信息无误，你可以启动zlm，再启动wvp来测试了，启动成功的话，你可以在wvp的日志下看到zlm已连接的提示。 | ||
| 119 | +接下来[部署到服务器](./_content/introduction/deployment.md)， 如何你只是本地运行直接再本地运行即可。 | ||
| 0 | \ No newline at end of file | 120 | \ No newline at end of file |
doc/_content/introduction/deployment.md
0 → 100644
| 1 | +<!-- 部署 --> | ||
| 2 | + | ||
| 3 | +# 部署 | ||
| 4 | +**请仔细阅读以下内容** | ||
| 5 | +1. WVP-PRO与ZLM支持分开部署，但是wvp-pro-assist必须与zlm部署在同一台主机; | ||
| 6 | +2. 需要开放的端口 | ||
| 7 | +| 服务 | 端口 | 类型 | 必选 | | ||
| 8 | +|-----|:-------------------------|-------------|-------| | ||
| 9 | +| wvp | server.port | tcp | 是 | | ||
| 10 | +| wvp | sip.port | udp and tcp | 是 | | ||
| 11 | +| zlm | http.port | tcp | 是 | | ||
| 12 | +| zlm | http.sslport | tcp | 否 | | ||
| 13 | +| zlm | rtmp.port | tcp | 否 | | ||
| 14 | +| zlm | rtmp.sslport | tcp | 否 | | ||
| 15 | +| zlm | rtsp.port | udp and tcp | 否 | | ||
| 16 | +| zlm | rtsp.sslport | udp and tcp | 否 | | ||
| 17 | +| zlm | rtp_proxy.port | udp and tcp | 单端口开放 | | ||
| 18 | +| zlm | rtp.port-range(在wvp中配置) | udp and tcp | 多端口开放 | | ||
| 19 | + | ||
| 20 | +3. 测试环境部署建议所有服务部署在一台主机，关闭防火墙，减少因网络出现问题的可能; | ||
| 21 | +4. WVP-PRO与ZLM支持分开部署，但是wvp-pro-assist必须与zlm部署在同一台主机; | ||
| 22 | +5. 生产环境按需开放端口，但是建议修改默认端口，尤其是5060端口，易受到攻击; | ||
| 23 | +6. zlm使用docker部署的情况，要求端口映射一致，比如映射5060,应将外部端口也映射为5060端口; | ||
| 24 | +7. 启动服务，以linux为例 | ||
| 25 | +**启动WVP-PRO** | ||
| 26 | +```shell | ||
| 27 | +nohup java -jar java -jar wvp-pro-*.jar & | ||
| 28 | +``` | ||
| 29 | + | ||
| 30 | +**启动ZLM** | ||
| 31 | +```shell | ||
| 32 | +nohup ./MediaServer -d -m 3 & | ||
| 33 | +``` | ||
| 34 | + | ||
| 35 | +[接入设备](./_content/ability/device.md) | ||
| 36 | + |
doc/_content/qa/_media/img.png
0 → 100644
139 KB
doc/_content/qa/_media/img_1.png
0 → 100644
117 KB
doc/_content/qa/_media/img_2.png
0 → 100644
72.3 KB
doc/_content/qa/_media/img_3.png
0 → 100644
90.2 KB
doc/_content/qa/_media/img_4.png
0 → 100644
48 KB
doc/_content/qa/_media/img_5.png
0 → 100644
149 KB
doc/_content/qa/bug.md
0 → 100644
| 1 | +<!-- 反馈bug --> | ||
| 2 | +# 反馈bug | ||
| 3 | +代码是在不断的完善的，不断修改会修复旧的问题也有可能引入新的问题，所以遇到BUG是很正常的一件事。所以遇到问题不要烦燥，咱们就事论事就好了。 | ||
| 4 | +## 如何反馈 | ||
| 5 | +1. 更新代码，很可能你遇到问题别人已经更早的遇到了，或者是作者自己发现了，已经解决了，所以你可以更新代码再次进行测试; | ||
| 6 | +2. 可以在github提ISSUE，我几乎每天都会去看issue，你的问题我会尽快给予答复; | ||
| 7 | +3. 你可以来我的QQ群里，询问群友看看是否遇到了同样的问题; | ||
| 8 | +4. 你可以私聊我的QQ，如果我有时间我会给你答复，但是除非你有明确的复现步骤或者修复方案，否则你可能等不到我的答复。 | ||
| 9 | + | ||
| 10 | +## 如何快速解决BUG | ||
| 11 | +目前解决BUG有三种方式: | ||
| 12 | +1. 作者验证以及修复; | ||
| 13 | +2. 热心开发者提来的PR; | ||
| 14 | +3. 使用运维手段屏蔽BUG的影响。 | ||
| 15 | + | ||
| 16 | +- 对于第一种：详细的复现步骤，完整的抓包文件，有条理的错误分析都可以帮助作者复现问题，进而解决问题。解决问题往往不是最难的，复现才是。 | ||
| 17 | +- 对于第二种：如果你是开发者，你已经发现了造成BUG的原因以及知道如何正确的修复，那么我很希望你PR，SRS的大佬经常说的，开源不是一个人的事。所以你的参与就是最大的鼓励。 | ||
| 18 | +- 对于第三种：如果你有一个有经验的运维伙伴，那么部分问题是可以通过运维的手段暂时屏蔽的，在等待修复的这段时间了以保证项目的运行。 | ||
| 19 | + |
doc/_content/qa/development.md
0 → 100644
| 1 | +<!-- 参与开发 --> | ||
| 2 | +# 参与到开发中来 | ||
| 3 | +非常欢迎有兴趣的小伙伴一起来维护这个项目 | ||
| 4 | +## 与开发有关的信息 | ||
| 5 | +- 开发语言：后端java + 前端vue； | ||
| 6 | +- jdk版本： 1.8； | ||
| 7 | +- 作者自用开发ide： jetbrains intellij idea； | ||
| 8 | +- nodejs/npm版本：v10.19.0/6.14.4； | ||
| 9 | +- 后端使用Spring boot框架开发； | ||
| 10 | +- 项目大量使用了异步操作； | ||
| 11 | +- 跟代码学流程需要参考28181文档，只看代码你会很懵的； | ||
| 12 | +- 必须学会[抓包](_content/skill/tcpdump.md),这是必须的 | ||
| 13 | + | ||
| 14 | +## 提交代码 | ||
| 15 | +大家可以通过fork项目的方式提交自己的代码，然后提交PR，我来合并到主线。提交代码的过程中我们需要遵循“**阿里编码规约**”，现有代码也有很多代码没有做到，但是我们在朝这个方向努力。 | ||
| 0 | \ No newline at end of file | 16 | \ No newline at end of file |
doc/_content/qa/img.png
0 → 100644
139 KB
doc/_content/qa/play_error.md
0 → 100644
| 1 | +<!-- 点播错误 --> | ||
| 2 | +# 点播错误 | ||
| 3 | +排查点播错误你首先要清除[点播的基本流程](_content/theory/play.md),一般的流程如下： | ||
| 4 | +```plantuml | ||
| 5 | +@startuml | ||
| 6 | +"WEB用户" -> "WVP-PRO": 1. 发起点播请求 | ||
| 7 | +"设备" <- "WVP-PRO": 2. Invite(携带SDP消息体) | ||
| 8 | +"设备" --> "WVP-PRO": 3. 200OK(携带SDP消息体) | ||
| 9 | +"设备" <-- "WVP-PRO": 4. Ack | ||
| 10 | +"设备" -> "ZLMediaKit": 5. 发送实时流 | ||
| 11 | +"WVP-PRO" <- "ZLMediaKit": 6. 流改变事件 | ||
| 12 | +"WEB用户" <-- "WVP-PRO": 7. 回复流播放地址（携带流地址） | ||
| 13 | +"WVP-PRO" <- "ZLMediaKit": 8. 无人观看事件 | ||
| 14 | +"设备" <- "WVP-PRO": 9 Bye消息 | ||
| 15 | +"设备" --> "WVP-PRO": 10 200OK | ||
| 16 | +@enduml | ||
| 17 | +``` | ||
| 18 | +针对几种常见的错误，我们来分析一下，也方便大家对号入座解决常见的问题 | ||
| 19 | +## 点播收到错误码 | ||
| 20 | +这个错误一般表现为点击"播放"按钮后很快得到一个错误。 | ||
| 21 | +1. **400错误码** | ||
| 22 | +出现400错误玛时一般是这样的流程是这样的 | ||
| 23 | +```plantuml | ||
| 24 | +@startuml | ||
| 25 | +"WEB用户" -> "WVP-PRO": 1. 发起点播请求 | ||
| 26 | +"设备" <- "WVP-PRO": 2. Invite(携带SDP消息体) | ||
| 27 | +"设备" --> "WVP-PRO": 3. 400错误 | ||
| 28 | +@enduml | ||
| 29 | +``` | ||
| 30 | +此时通常是设备认为WVP发送了错误的消息给它，它认为消息不全或者错误所以直接返回400错误，此时我们需要[抓包](_content/skill/tcpdump.md)来分析是否缺失了内容，也可以直接联系对方询问为什么返回了400。 | ||
| 31 | +WVP不能保证兼容所有的设备，有些实现不规范的设备可能在对接时就会出现上述问题，你可以联系作者帮忙对接。 | ||
| 32 | +2. **500错误码** | ||
| 33 | +500或者大于500小于600的错误码一般多是设备内部出了问题，解决方式有两个，第一种直接联系设备/平台客服寻求解决；第二种，如果你有确定可以对接这个设备的平台那么可以把对接这个平台的抓包和对接wvp的抓包同时发送给我，我来尝试解决。 | ||
| 34 | + | ||
| 35 | + | ||
| 36 | +## 点播超时 | ||
| 37 | +点播超时的情况大致分为两种：点播超时和收流超时 | ||
| 38 | +1. **点播超时** | ||
| 39 | +点播超时错误一般为信令的超时，比如长时间为收到对方的回复，可能出现在流程中 “3. 200OK(携带SDP消息体)”这个位置，即我们发送点播消息，但是设备没有回复，可能的原因： | ||
| 40 | +> 1. 设备内部错误，未能回复消息 | ||
| 41 | +> 2. 网络原因消息未到到达设备 | ||
| 42 | + | ||
| 43 | +大部分时候是原因2，所以遇到这个错误我们首先要排查我们我的网路，如果你是公网部署，那么也可能时心跳周期太长，导致的路由NAT失效，WVP的消息无法通道原来的IP端口号发送给设备。 | ||
| 44 | + | ||
| 45 | +2. **收流超时** | ||
| 46 | +收流超时可能发生在流程中的5和6,可能的原因有： | ||
| 47 | +> 1. 设备发送了流但是发送到了错误的ip和端口上，而这个信息是在invite消息的sdp中指定的，就是流程2Invite(携带SDP消息体)中，而这个错误很可能来自你的配置错误，比如你设置了127.0.0.1导致设备网127.0.0.1上发流，或者是你WVP在公网，但是你给设备了一个内网ip，导致设备无法把流发送过来； | ||
| 48 | +> 2. 设备内部错误未发送流； | ||
| 49 | +> 2. 设备发送了流，但是流无法识别，可能存在于流不规范和网络很差的情况下； | ||
| 50 | +> 3. 设备发送了流，zlm也收到了，但是zlm无法通过hook通知到wvp，此时原因是你可以检查zlm的配置文件中的hook配置，看看是否无法从zlm连接到wvp； | ||
| 51 | +> 4. 设备发送了流，但是开启SSRC校验，设备的流不够规范采用错误的ssrc，导致zlm选择丢弃； | ||
| 52 | + | ||
| 53 | +针对这些可能的错误原因我建议的排查顺序： | ||
| 54 | +- 关闭ssrc校验； | ||
| 55 | +- 查看zlm配置的hook是否可以连接到zlm； | ||
| 56 | +- 查看zlm日志是否有流注册； | ||
| 57 | +- 抓包查看流的信息，看看流是否正常发送，甚至可以导出发送原始流，用vlc播放，看看是否可以播放。 |
doc/_content/qa/regiser_error.md
0 → 100644
doc/_content/qa/start_error.md
0 → 100644
| 1 | +<!-- 启动时报错 --> | ||
| 2 | +# 启动时报错 | ||
| 3 | +启动时的报错大部分时候是因为你的配置有问题，比如mysql没连接上，redis没连接上，18080/15060端口占用了，这些都会导致启动是报错，修改配置配置之后都可以解决； | ||
| 4 | +下面我整理的一些常见的错误，大家可以先对号入座的简单排查下。 | ||
| 5 | +> **常见错误** | ||
| 6 | + | ||
| 7 | + | ||
| 8 | +**错误原因：** redis配置错误，可能原因： redis未启动/ip错误/端口错误/网络不通 | ||
| 9 | +--- | ||
| 10 | + | ||
| 11 | +**错误原因：** redis配置错误，可能原因： 密码错误 | ||
| 12 | +--- | ||
| 13 | + | ||
| 14 | +**错误原因：** mysql配置错误，可能原因： mysql未启动/ip错误/端口错误/网络不通 | ||
| 15 | +--- | ||
| 16 | + | ||
| 17 | +**错误原因：** mysql配置错误，可能原因： 用户名/密码错误 | ||
| 18 | +--- | ||
| 19 | + | ||
| 20 | +**错误原因：** SIP配置错误，可能原因： SIP端口被占用 | ||
| 21 | +--- | ||
| 22 | + | ||
| 23 | +**错误原因：** WVP Tomcat端口配置错误，可能原因： server.port端口被占用 | ||
| 24 | +--- | ||
| 0 | \ No newline at end of file | 25 | \ No newline at end of file |
doc/_content/skill/_media/img.png
0 → 100644
43.8 KB
doc/_content/skill/_media/img_1.png
0 → 100644
105 KB
doc/_content/skill/_media/img_2.png
0 → 100644
15.9 KB
doc/_content/skill/tcpdump.md
0 → 100644
| 1 | +<!-- 抓包 --> | ||
| 2 | +# 抓包 | ||
| 3 | +如果说对于网络编程，有什么工具是必会的，我觉得抓包肯定是其中之一了。作为GB/T 28181调试过程中最重要的手段，我觉得如果你真对他有兴趣，或者系统遇到问题可以最快的得到解决，那么抓包你就一定要学会了。 | ||
| 4 | + | ||
| 5 | +## 抓包工具的选择 | ||
| 6 | +### 1. Wireshark | ||
| 7 | +在具备图形界面的系统上，比如windows，linux发行版ubuntu，opensuse等，我一般直接使用Wireshark直接进行抓包，也方便进行内容的查看。 | ||
| 8 | +### 2. Tcpdump | ||
| 9 | +在使用命令行的系统，比如linux服务器，我一般使用Tcpdump进行抓包，无需额外安装，系统一般自带，抓包的到的文件，可以使用Wireshark打开，在图形界面下方便查看内容。 | ||
| 10 | + | ||
| 11 | +## 工具安装 | ||
| 12 | +Wireshark的安装很简单，根据提示一步步点击就好了，在linux需要解决权限的问题，如果和我一样使用图形界面的linux发行版的话，可以参看如下步骤; windows的小伙伴直接略过即可 | ||
| 13 | +```shell | ||
| 14 | +# 1. 添加wireshark用户组 | ||
| 15 | +sudo groupadd wireshark | ||
| 16 | +# 2. 将dumpcap更改为wireshark用户组 | ||
| 17 | +sudo chgrp wireshark /usr/bin/dumpcap | ||
| 18 | +# 3. 让wireshark用户组有root权限使用dumpcap | ||
| 19 | +sudo chmod 4755 /usr/bin/dumpcap | ||
| 20 | +# 4. 将需要使用的用户名加入wireshark用户组 | ||
| 21 | +sudo gpasswd -a $USER wireshark | ||
| 22 | +``` | ||
| 23 | +tcpdump一般linux都是自带，无需安装，可以这样验证;显示版本信息即是已安装 | ||
| 24 | +```shell | ||
| 25 | +tcpdump --version | ||
| 26 | +``` | ||
| 27 | +## 开始抓包 | ||
| 28 | +### 使用Wireshark | ||
| 29 | +在28181中我一般只关注sip包和rtp包，所以我一般是直接过滤sip和rtp，可以输入框输入 `sip or rtp`这样即可，如果设备来源比较多还可以加上ip和端口号的过滤`(sip or rtp )and ip.addr==192.168.1.3 and udp.port==5060` | ||
| 30 | +详细的过滤规则可以自行百度，我可以提供一些常用的给大家参考 | ||
| 31 | + | ||
| 32 | +**只过滤SIP：** | ||
| 33 | +```shell | ||
| 34 | +sip | ||
| 35 | +``` | ||
| 36 | +**只获取rtp数据：** | ||
| 37 | +```shell | ||
| 38 | +rtp | ||
| 39 | +``` | ||
| 40 | +**默认方式：** | ||
| 41 | +```shell | ||
| 42 | +sip or rtp | ||
| 43 | +``` | ||
| 44 | +**过滤IP：** | ||
| 45 | +```shell | ||
| 46 | + sip and ip.addr==192.168.1.3 | ||
| 47 | +``` | ||
| 48 | +**过滤端口：** | ||
| 49 | +```shell | ||
| 50 | + sip and udp.port==5060 | ||
| 51 | +``` | ||
| 52 | +输入命令开启抓包后，此时可以进行操作，比如点播，录像回访等，操作完成回到Wireshark点击红色的停止即可，需要保存文件可以点击`文件->导出特定分组`导出过滤后的数据，也可以直接`文件->另存为`保存未过滤的数据。 | ||
| 53 | +### 使用tcpdump | ||
| 54 | +对于服务器抓包，为了得到足够完整的数据，我一般会要求直接抓取网卡数据而不过滤，如下： | ||
| 55 | +抓取网卡首先需要获取网卡名，在linux我一般使用`ip addr`获取网卡信息，如下所示： | ||
| 56 | + | ||
| 57 | +```shell | ||
| 58 | +sudo tcpdump -i wlp3s0 -w demo.pcap | ||
| 59 | +``` | ||
| 60 | + | ||
| 61 | +命令行会停留在这个位置，此时可以进行操作，比如点播，录像回放等，操作完成回到命令行使用`Ctrl+C`结束命令行，在当前目录下得到demo.pcap，将这个文件下载到图形界面操作系统里，即可使用Wireshark查看了 | ||
| 62 | +更多的操作可以参考： [https://www.cnblogs.com/jiujuan/p/9017495.html](https://www.cnblogs.com/jiujuan/p/9017495.html) |
doc/_content/theory/_media/img.png
0 → 100644
96.4 KB
doc/_content/theory/_media/img_1.png
0 → 100644
105 KB
doc/_content/theory/_media/img_2.png
0 → 100644
16.8 KB
doc/_content/theory/_media/img_3.png
0 → 100644
82.8 KB
doc/_content/theory/_media/img_4.png
0 → 100644
45.6 KB
doc/_content/theory/_media/img_5.png
0 → 100644
59.5 KB
doc/_content/theory/_media/img_6.png
0 → 100644
51.7 KB
doc/_content/theory/_media/img_7.png
0 → 100644
80 KB
doc/_content/theory/_media/img_8.png
0 → 100644
23.7 KB
doc/_content/theory/_media/img_9.png
0 → 100644
28 KB
doc/_content/theory/channel_tree.md
0 → 100644
| 1 | +<!-- 通道的树形结构 --> | ||
| 2 | + | ||
| 3 | +# 通道的树形结构 | ||
| 4 | + | ||
| 5 | +国标28181规定了两种组织设备树的方式 | ||
| 6 | +1. **行政区划** | ||
| 7 | + 行政区划模式下主要是以行政区划作为目录节点例如：河北省->邯郸市->广平县 | ||
| 8 | +  | ||
| 9 | +2. **业务分组** | ||
| 10 | + 业务分组主要自定义的目录树的一种组织形式，但是对定义的目录的国标编号有一定的要求。 | ||
| 11 | + 第一级别需要是业务分组类型，即国标编码中的11、12、13是215,例如：65010200002150000001； | ||
| 12 | + 业务分组下是虚拟组织，即国标编码中的11、12、13是216,例如：65010200002160000002。 | ||
| 13 | + 虚拟组织下不可是业务分组，虚拟组织下可以继续添加虚拟组织。 | ||
| 14 | +  |
doc/_content/theory/code.md
0 → 100644
| 1 | +<!-- 统一编码规则 --> | ||
| 2 | + | ||
| 3 | +# 统一编码规则 | ||
| 4 | +## D.1 编码规则 A | ||
| 5 | +>  编码规则 A 由中心编码(8位)、行业编码(2位)、类型编码(3位)和序号(7位)四个码段共20位十 | ||
| 6 | +>进制数字字符构成,即系统编码 =中心编码 + 行业编码 + 类型编码 + 序号。 | ||
| 7 | +>  编码规则 A 的详细说明见表 D.1。其中,中心编码指用户或设备所归属的监控中心的编码,按照监控中心所在地的行政区划代码确定, | ||
| 8 | +> 当不是基层单位时空余位为0。行政区划代码采用 GB/T2260— 2007规定的行政区划代码表示。行业编码是指用户或设备所归属的行业,行业编码对照表见 D.3。 | ||
| 9 | +> 类型编码指定了设备或用户的具体类型,其中的前端设备包含公安系统和非公安系统的前端设备,终端用 户包含公安系统和非公安系统的终端用户。 | ||
| 10 | + | ||
| 11 | + | ||
| 12 | + | ||
| 13 | + | ||
| 14 | + | ||
| 15 | +## D.2 编码规则 B | ||
| 16 | +>  编码规则 B由中心编码(8位)、行业编码(2位)、序号(4位)和类型编码(2位)四个码段构成,即系 | ||
| 17 | +>统编码 =中心编码 + 行业编码 +序号+类型编码。编码规则 B的详细说明见表 D.2。 | ||
| 18 | + | ||
| 19 | + | ||
| 20 | + | ||
| 21 | + | ||
| 22 | +## D.3 行业编码对照表 | ||
| 23 | +>  行业编码对照表见表 D.3。 | ||
| 24 | + | ||
| 25 | + | ||
| 0 | \ No newline at end of file | 26 | \ No newline at end of file |
doc/_content/theory/img.png
0 → 100644
23.7 KB
doc/_content/theory/play.md
0 → 100644
| 1 | +<!-- 点播流程 --> | ||
| 2 | + | ||
| 3 | +# 点播流程 | ||
| 4 | +> 以下为WVP-PRO点播流程。点播成功前的任何一个环节出现问题都可能出现点播超时，这也是排查点播超时的依据。 | ||
| 5 | + | ||
| 6 | +```plantuml | ||
| 7 | +@startuml | ||
| 8 | +"WEB用户" -> "WVP-PRO": 1. 发起点播请求 | ||
| 9 | +"设备" <- "WVP-PRO": 2. Invite(携带SDP消息体) | ||
| 10 | +"设备" --> "WVP-PRO": 3. 200OK(携带SDP消息体) | ||
| 11 | +"设备" <-- "WVP-PRO": 4. Ack | ||
| 12 | +"设备" -> "ZLMediaKit": 5. 发送实时流 | ||
| 13 | +"WVP-PRO" <- "ZLMediaKit": 6. 流改变事件 | ||
| 14 | +"WEB用户" <-- "WVP-PRO": 7. 回复流播放地址（携带流地址） | ||
| 15 | +"WVP-PRO" <- "ZLMediaKit": 8. 无人观看事件 | ||
| 16 | +"设备" <- "WVP-PRO": 9 Bye消息 | ||
| 17 | +"设备" --> "WVP-PRO": 10 200OK | ||
| 18 | +@enduml | ||
| 19 | +``` | ||
| 20 | + | ||
| 21 | + | ||
| 22 | +## 注册流程描述如下: | ||
| 23 | +1. 用户从网页或调用接口发起点播请求; | ||
| 24 | +2. WVP-PRO向摄像机发送Invite消息,消息头域中携带 Subject字段,表明点播的视频源ID、发送方媒体流序列号、ZLMediaKit接收流使用的IP、端口号、 | ||
| 25 | + 接收端媒体流序列号等参数,SDP消息体中 s字段为“Play”代表实时点播，y字段描述SSRC值,f字段描述媒体参数。 | ||
| 26 | +3. 摄像机向WVP-PRO回复200OK，消息体中描述了媒体流发送者发送媒体流的IP、端口、媒体格式、SSRC字段等内容。 | ||
| 27 | +4. WVP-PRO向设备回复Ack， 会话建立成功。 | ||
| 28 | +5. 设备向ZLMediaKit发送实时流。 | ||
| 29 | +6. ZLMediaKit向WVP-PRO发送流改变事件。 | ||
| 30 | +7. WVP-PRO向WEB用户回复播放地址。 | ||
| 31 | +8. ZLMediaKit向WVP发送流无人观看事件。 | ||
| 32 | +9. WVP-PRO向设备回复Bye， 结束会话。 | ||
| 33 | +10. 设备回复200OK，会话结束成功。 |
doc/_content/theory/register.md
0 → 100644
| 1 | +<!-- 注册流程 --> | ||
| 2 | + | ||
| 3 | +# 注册流程 | ||
| 4 | +WVP-PRO目前仅支持国标中描述的基本注册流程，也是最常用的， | ||
| 5 | +> 基本注册即采用IETFRFC3261规定的基于数字摘要的挑战应答式安全技术进行注册. | ||
| 6 | + | ||
| 7 | +```plantuml | ||
| 8 | +@startuml | ||
| 9 | +"设备" -> "WVP-PRO": 1. Register | ||
| 10 | +"设备" <-- "WVP-PRO": 2. 401 Unauthorized | ||
| 11 | +"设备" -> "WVP-PRO": 3. Register | ||
| 12 | +"设备" <-- "WVP-PRO": 4. 200 OK | ||
| 13 | +@enduml | ||
| 14 | +``` | ||
| 15 | + | ||
| 16 | + | ||
| 17 | +> 注册流程描述如下: | ||
| 18 | +> 1. 摄像机向WVP-PRO服务器发送 Register请求; | ||
| 19 | +> 2. WVP-PRO向摄像机发送响应401,并在响应的消息头 WWW_Authenticate字段中给出适合摄像机的认证体制和参数; | ||
| 20 | +> 3. 摄像机重新向WVP-PRO发送 Register请求,在请求的 Authorization字段给出信任书, 包含认证信息; | ||
| 21 | +> 4. WVP-PRO对请求进行验证,如果检查出 摄像机身份合法,向摄像机发送成功响应 200OK,如果身份不合法则发送拒绝服务应答。 |
doc/_coverpage.md
0 → 100644
| 1 | +<!-- 封面 --> | ||
| 2 | + | ||
| 3 | + | ||
| 4 | +# WVP-PRO <small>2.0</small> | ||
| 5 | + | ||
| 6 | +> 开箱即用的28181协议视频平台。 | ||
| 7 | + | ||
| 8 | +- 基于GB/T28181-2016标准信令实现，兼容GB/T28181-2011。 | ||
| 9 | +- 自带完整前端页面，开箱即用。 | ||
| 10 | +- 完全开源，且使用MIT许可协议。可以在保留版权信息的基础上商用。 | ||
| 11 | + | ||
| 12 | +[GitHub](https://github.com/648540858/wvp-GB28181-pro) | ||
| 13 | +[Gitee](https://gitee.com/pan648540858/wvp-GB28181-pro) | ||
| 14 | + | ||
| 15 | +<!-- 背景色 --> | ||
| 16 | + | ||
| 17 | +[//]: # ([comment]: <> ()) |
doc/_media/favicon.ico
0 → 100644
No preview for this file type
doc/_media/logo-mini.png
0 → 100644
22.4 KB
doc/_media/logo.png
0 → 100644
65.5 KB
doc/_media/weixin.jpg
0 → 100644
87.1 KB
doc/_media/zhifubao.jpg
0 → 100644
421 KB
doc/_navbar.md
0 → 100644
| 1 | +<!-- 导航栏 --> |
doc/_sidebar.md
0 → 100644
| 1 | +<!-- 侧边栏 --> | ||
| 2 | + | ||
| 3 | +* **编译与部署** | ||
| 4 | + * [编译](_content/introduction/compile.md) | ||
| 5 | + * [配置](_content/introduction/config.md) | ||
| 6 | + * [部署](_content/introduction/deployment.md) | ||
| 7 | +* **功能与使用** | ||
| 8 | + * [接入设备](_content/ability/device.md) | ||
| 9 | + * [设备使用](_content/ability/device_use.md) | ||
| 10 | + * [国标级联](_content/ability/cascade2.md) | ||
| 11 | + * [推流列表](_content/ability/push.md) | ||
| 12 | + * [拉流代理](_content/ability/proxy.md) | ||
| 13 | + * [电子地图](_content/ability/gis.md) | ||
| 14 | + * [节点管理](_content/ability/node_manger.md) | ||
| 15 | + * [云端录像](_content/ability/cloud_record.md) | ||
| 16 | + * [不间断录像](_content/ability/continuous_recording.md) | ||
| 17 | +* **流程与原理** | ||
| 18 | + * [统一编码规则](_content/theory/code.md) | ||
| 19 | + * [树形结构](_content/theory/channel_tree.md) | ||
| 20 | + * [注册流程](_content/theory/register.md) | ||
| 21 | + * [点播流程](_content/theory/play.md) | ||
| 22 | +* **必备技巧** | ||
| 23 | + * [抓包](_content/skill/tcpdump.md) | ||
| 24 | + | ||
| 25 | +* **常见问答** | ||
| 26 | + - [如何反馈BUG](_content/qa/bug.md) | ||
| 27 | + - [如何参与开发](_content/qa/development.md) | ||
| 28 | + - [启动报错的解决办法](_content/qa/start_error.md) | ||
| 29 | + - [设备注册不上来的解决办法](_content/qa/regiser_error.md) | ||
| 30 | + - [点播超时/报错的解决办法](_content/qa/play_error.md) | ||
| 31 | +* [**免责声明**](_content/disclaimers.md) | ||
| 32 | +* [**捐赠**](_content/donation.md) | ||
| 33 | +* [**关于本文档**](_content/about_doc.md) |
doc/index.html
0 → 100644
| 1 | +<!DOCTYPE html> | ||
| 2 | +<html lang="en"> | ||
| 3 | +<head> | ||
| 4 | + <meta charset="UTF-8"> | ||
| 5 | + <title>WVP-PRO文档</title> | ||
| 6 | + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> | ||
| 7 | + <meta name="description" content="Description"> | ||
| 8 | + <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"> | ||
| 9 | + <link rel="icon" href="_media/favicon.ico" type="image/x-icon" /> | ||
| 10 | + <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css"> | ||
| 11 | +<!-- <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css">--> | ||
| 12 | + <style> | ||
| 13 | + .cover{ | ||
| 14 | + background: linear-gradient(to left bottom, hsl(82, 100%, 85%) 0%,hsl(199, 100%, 85%) 100%) !important; | ||
| 15 | + } | ||
| 16 | + </style> | ||
| 17 | +</head> | ||
| 18 | +<body> | ||
| 19 | + <div id="app">加载中</div> | ||
| 20 | + <script> | ||
| 21 | + window.$docsify = { | ||
| 22 | + name: 'WVP-RPO使用文档', | ||
| 23 | + repo: 'https://github.com/648540858/wvp-GB28181-pro', | ||
| 24 | + loadSidebar: true, // 开启侧边栏 | ||
| 25 | + loadNavbar: true, // 开启导航栏 | ||
| 26 | + coverpage: true, // 开启封面 | ||
| 27 | + | ||
| 28 | + subMaxLevel: 3, | ||
| 29 | + plantuml: { | ||
| 30 | + skin: 'default', | ||
| 31 | + }, | ||
| 32 | + search: { | ||
| 33 | + maxAge: 86400000, // 过期时间，单位毫秒，默认一天 | ||
| 34 | + paths: 'auto', // or 'auto' | ||
| 35 | + placeholder: '搜索', | ||
| 36 | + noData: '找不到结果', | ||
| 37 | + // 搜索标题的最大层级, 1 - 6 | ||
| 38 | + depth: 4, | ||
| 39 | + hideOtherSidebarContent: false, // 是否隐藏其他侧边栏内容 | ||
| 40 | + }, | ||
| 41 | + copyCode: { | ||
| 42 | + buttonText : '复制', | ||
| 43 | + errorText : '错误', | ||
| 44 | + successText: '已复制' | ||
| 45 | + }, | ||
| 46 | + // disqus: 'shortname' | ||
| 47 | + } | ||
| 48 | + </script> | ||
| 49 | + <!-- Docsify v4 --> | ||
| 50 | + <script src="//cdn.jsdelivr.net/npm/docsify@4"></script> | ||
| 51 | + <script src="//unpkg.com/docsify-plantuml/dist/docsify-plantuml.min.js"></script> | ||
| 52 | + <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/search.min.js"></script> | ||
| 53 | + <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script> | ||
| 54 | + <script src="//cdn.jsdelivr.net/npm/docsify-copy-code/dist/docsify-copy-code.min.js"></script> | ||
| 55 | + | ||
| 56 | + </script> | ||
| 57 | +<!-- <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/disqus.min.js"></script>--> | ||
| 58 | +</body> | ||
| 59 | +</html> |
pom.xml
| @@ -61,6 +61,13 @@ | @@ -61,6 +61,13 @@ | ||
| 61 | <dependency> | 61 | <dependency> |
| 62 | <groupId>org.springframework.boot</groupId> | 62 | <groupId>org.springframework.boot</groupId> |
| 63 | <artifactId>spring-boot-starter-data-redis</artifactId> | 63 | <artifactId>spring-boot-starter-data-redis</artifactId> |
| 64 | + <exclusions> | ||
| 65 | + <!-- 去掉 Lettuce 的依赖， Spring Boot 优先使用 Lettuce 作为 Redis 客户端 --> | ||
| 66 | + <exclusion> | ||
| 67 | + <groupId>io.lettuce</groupId> | ||
| 68 | + <artifactId>lettuce-core</artifactId> | ||
| 69 | + </exclusion> | ||
| 70 | + </exclusions> | ||
| 64 | </dependency> | 71 | </dependency> |
| 65 | <dependency> | 72 | <dependency> |
| 66 | <groupId>org.springframework.boot</groupId> | 73 | <groupId>org.springframework.boot</groupId> |
| @@ -75,6 +82,12 @@ | @@ -75,6 +82,12 @@ | ||
| 75 | <groupId>org.mybatis.spring.boot</groupId> | 82 | <groupId>org.mybatis.spring.boot</groupId> |
| 76 | <artifactId>mybatis-spring-boot-starter</artifactId> | 83 | <artifactId>mybatis-spring-boot-starter</artifactId> |
| 77 | <version>2.1.4</version> | 84 | <version>2.1.4</version> |
| 85 | + <exclusions> | ||
| 86 | + <exclusion> | ||
| 87 | + <groupId>com.zaxxer</groupId> | ||
| 88 | + <artifactId>HikariCP</artifactId> | ||
| 89 | + </exclusion> | ||
| 90 | + </exclusions> | ||
| 78 | </dependency> | 91 | </dependency> |
| 79 | <dependency> | 92 | <dependency> |
| 80 | <groupId>org.springframework.boot</groupId> | 93 | <groupId>org.springframework.boot</groupId> |
| @@ -84,7 +97,6 @@ | @@ -84,7 +97,6 @@ | ||
| 84 | <dependency> | 97 | <dependency> |
| 85 | <groupId>redis.clients</groupId> | 98 | <groupId>redis.clients</groupId> |
| 86 | <artifactId>jedis</artifactId> | 99 | <artifactId>jedis</artifactId> |
| 87 | - <version>${jedis-version}</version> | ||
| 88 | </dependency> | 100 | </dependency> |
| 89 | 101 | ||
| 90 | <!-- druid数据库连接池 --> | 102 | <!-- druid数据库连接池 --> |
| @@ -265,14 +277,14 @@ | @@ -265,14 +277,14 @@ | ||
| 265 | </configuration> | 277 | </configuration> |
| 266 | </plugin> | 278 | </plugin> |
| 267 | 279 | ||
| 268 | - <plugin> | 280 | + <!-- <plugin> |
| 269 | <groupId>pl.project13.maven</groupId> | 281 | <groupId>pl.project13.maven</groupId> |
| 270 | <artifactId>git-commit-id-plugin</artifactId> | 282 | <artifactId>git-commit-id-plugin</artifactId> |
| 271 | <version>3.0.1</version> | 283 | <version>3.0.1</version> |
| 272 | <configuration> | 284 | <configuration> |
| 273 | <offline>true</offline> | 285 | <offline>true</offline> |
| 274 | </configuration> | 286 | </configuration> |
| 275 | - </plugin> | 287 | + </plugin>--> |
| 276 | 288 | ||
| 277 | <plugin> | 289 | <plugin> |
| 278 | <groupId>org.apache.maven.plugins</groupId> | 290 | <groupId>org.apache.maven.plugins</groupId> |
sql/mysql.sql
| @@ -2,55 +2,60 @@ | @@ -2,55 +2,60 @@ | ||
| 2 | -- | 2 | -- |
| 3 | -- Host: 127.0.0.1 Database: wvp2 | 3 | -- Host: 127.0.0.1 Database: wvp2 |
| 4 | -- ------------------------------------------------------ | 4 | -- ------------------------------------------------------ |
| 5 | --- Server version 8.0.29-0ubuntu0.22.04.2 | 5 | +-- Server version 8.0.29-0ubuntu0.22.04.3 |
| 6 | 6 | ||
| 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 */; | 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 */; | 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 */; | 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 | 17 | ||
| 18 | -- | 18 | -- |
| 19 | -- Table structure for table `device` | 19 | -- Table structure for table `device` |
| 20 | -- | 20 | -- |
| 21 | 21 | ||
| 22 | DROP TABLE IF EXISTS `device`; | 22 | DROP TABLE IF EXISTS `device`; |
| 23 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 23 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 24 | /*!50503 SET character_set_client = utf8mb4 */; | 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 | - `registerTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 36 | - `keepaliveTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 37 | - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 38 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 39 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 40 | - `port` int NOT NULL, | ||
| 41 | - `expires` int NOT NULL, | ||
| 42 | - `subscribeCycleForCatalog` int NOT NULL, | ||
| 43 | - `hostAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 44 | - `charset` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 45 | - `subscribeCycleForMobilePosition` int DEFAULT NULL, | ||
| 46 | - `mobilePositionSubmissionInterval` int DEFAULT '5', | ||
| 47 | - `subscribeCycleForAlarm` int DEFAULT NULL, | ||
| 48 | - `ssrcCheck` int DEFAULT '0', | ||
| 49 | - `geoCoordSys` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 50 | - `treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 51 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 52 | - UNIQUE KEY `device_deviceId_uindex` (`deviceId`) USING BTREE | ||
| 53 | -) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 25 | +CREATE TABLE `device` |
| 26 | +( | ||
| 27 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 28 | + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 29 | + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 30 | + `manufacturer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 31 | + `model` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 32 | + `firmware` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 33 | + `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 34 | + `streamMode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 35 | + `online` 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 NOT 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 NOT NULL, | ||
| 42 | + `expires` int NOT NULL, | ||
| 43 | + `subscribeCycleForCatalog` int NOT NULL, | ||
| 44 | + `hostAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 45 | + `charset` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 46 | + `subscribeCycleForMobilePosition` int DEFAULT NULL, | ||
| 47 | + `mobilePositionSubmissionInterval` int DEFAULT '5 ', | ||
| 48 | + `subscribeCycleForAlarm` int DEFAULT NULL, | ||
| 49 | + `ssrcCheck` int DEFAULT '0 ', | ||
| 50 | + `geoCoordSys` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 51 | + `treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 52 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 53 | + UNIQUE KEY `device_deviceId_uindex` (`deviceId`) USING BTREE | ||
| 54 | +) ENGINE = InnoDB | ||
| 55 | + AUTO_INCREMENT = 53 | ||
| 56 | + DEFAULT CHARSET = utf8mb4 | ||
| 57 | + COLLATE = utf8mb4_general_ci | ||
| 58 | + ROW_FORMAT = DYNAMIC; | ||
| 54 | /*!40101 SET character_set_client = @saved_cs_client */; | 59 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 55 | 60 | ||
| 56 | -- | 61 | -- |
| @@ -58,8 +63,10 @@ CREATE TABLE `device` ( | @@ -58,8 +63,10 @@ CREATE TABLE `device` ( | ||
| 58 | -- | 63 | -- |
| 59 | 64 | ||
| 60 | LOCK TABLES `device` WRITE; | 65 | LOCK TABLES `device` WRITE; |
| 61 | -/*!40000 ALTER TABLE `device` DISABLE KEYS */; | ||
| 62 | -/*!40000 ALTER TABLE `device` ENABLE KEYS */; | 66 | +/*!40000 ALTER TABLE `device` |
| 67 | + DISABLE KEYS */; | ||
| 68 | +/*!40000 ALTER TABLE `device` | ||
| 69 | + ENABLE KEYS */; | ||
| 63 | UNLOCK TABLES; | 70 | UNLOCK TABLES; |
| 64 | 71 | ||
| 65 | -- | 72 | -- |
| @@ -67,22 +74,26 @@ UNLOCK TABLES; | @@ -67,22 +74,26 @@ UNLOCK TABLES; | ||
| 67 | -- | 74 | -- |
| 68 | 75 | ||
| 69 | DROP TABLE IF EXISTS `device_alarm`; | 76 | DROP TABLE IF EXISTS `device_alarm`; |
| 70 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 77 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 71 | /*!50503 SET character_set_client = utf8mb4 */; | 78 | /*!50503 SET character_set_client = utf8mb4 */; |
| 72 | -CREATE TABLE `device_alarm` ( | ||
| 73 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 74 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 75 | - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 76 | - `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 77 | - `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 78 | - `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 79 | - `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 80 | - `longitude` double DEFAULT NULL, | ||
| 81 | - `latitude` double DEFAULT NULL, | ||
| 82 | - `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 83 | - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 84 | - PRIMARY KEY (`id`) USING BTREE | ||
| 85 | -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 79 | +CREATE TABLE `device_alarm` |
| 80 | +( | ||
| 81 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 82 | + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 83 | + `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 84 | + `alarmPriority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 85 | + `alarmMethod` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 86 | + `alarmTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 87 | + `alarmDescription` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 88 | + `longitude` double DEFAULT NULL, | ||
| 89 | + `latitude` double DEFAULT NULL, | ||
| 90 | + `alarmType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 91 | + `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 92 | + PRIMARY KEY (`id`) USING BTREE | ||
| 93 | +) ENGINE = InnoDB | ||
| 94 | + DEFAULT CHARSET = utf8mb4 | ||
| 95 | + COLLATE = utf8mb4_general_ci | ||
| 96 | + ROW_FORMAT = DYNAMIC; | ||
| 86 | /*!40101 SET character_set_client = @saved_cs_client */; | 97 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 87 | 98 | ||
| 88 | -- | 99 | -- |
| @@ -90,8 +101,10 @@ CREATE TABLE `device_alarm` ( | @@ -90,8 +101,10 @@ CREATE TABLE `device_alarm` ( | ||
| 90 | -- | 101 | -- |
| 91 | 102 | ||
| 92 | LOCK TABLES `device_alarm` WRITE; | 103 | LOCK TABLES `device_alarm` WRITE; |
| 93 | -/*!40000 ALTER TABLE `device_alarm` DISABLE KEYS */; | ||
| 94 | -/*!40000 ALTER TABLE `device_alarm` ENABLE KEYS */; | 104 | +/*!40000 ALTER TABLE `device_alarm` |
| 105 | + DISABLE KEYS */; | ||
| 106 | +/*!40000 ALTER TABLE `device_alarm` | ||
| 107 | + ENABLE KEYS */; | ||
| 95 | UNLOCK TABLES; | 108 | UNLOCK TABLES; |
| 96 | 109 | ||
| 97 | -- | 110 | -- |
| @@ -99,50 +112,55 @@ UNLOCK TABLES; | @@ -99,50 +112,55 @@ UNLOCK TABLES; | ||
| 99 | -- | 112 | -- |
| 100 | 113 | ||
| 101 | DROP TABLE IF EXISTS `device_channel`; | 114 | DROP TABLE IF EXISTS `device_channel`; |
| 102 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 115 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 103 | /*!50503 SET character_set_client = utf8mb4 */; | 116 | /*!50503 SET character_set_client = utf8mb4 */; |
| 104 | -CREATE TABLE `device_channel` ( | ||
| 105 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 106 | - `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 107 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 108 | - `manufacture` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 109 | - `model` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 110 | - `owner` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 111 | - `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 112 | - `block` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 113 | - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 114 | - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 115 | - `safetyWay` int DEFAULT NULL, | ||
| 116 | - `registerWay` int DEFAULT NULL, | ||
| 117 | - `certNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 118 | - `certifiable` int DEFAULT NULL, | ||
| 119 | - `errCode` int DEFAULT NULL, | ||
| 120 | - `endTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 121 | - `secrecy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 122 | - `ipAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 123 | - `port` int DEFAULT NULL, | ||
| 124 | - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 125 | - `PTZType` int DEFAULT NULL, | ||
| 126 | - `status` int DEFAULT NULL, | ||
| 127 | - `longitude` double DEFAULT NULL, | ||
| 128 | - `latitude` double DEFAULT NULL, | ||
| 129 | - `streamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 130 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 131 | - `parental` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 132 | - `hasAudio` bit(1) DEFAULT NULL, | ||
| 133 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 134 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 135 | - `subCount` int DEFAULT '0', | ||
| 136 | - `longitudeGcj02` double DEFAULT NULL, | ||
| 137 | - `latitudeGcj02` double DEFAULT NULL, | ||
| 138 | - `longitudeWgs84` double DEFAULT NULL, | ||
| 139 | - `latitudeWgs84` double DEFAULT NULL, | ||
| 140 | - `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 141 | - `gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 142 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 143 | - UNIQUE KEY `device_channel_id_uindex` (`id`) USING BTREE, | ||
| 144 | - UNIQUE KEY `device_channel_pk` (`channelId`,`deviceId`) USING BTREE | ||
| 145 | -) ENGINE=InnoDB AUTO_INCREMENT=19331 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 117 | +CREATE TABLE `device_channel` |
| 118 | +( | ||
| 119 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 120 | + `channelId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 121 | + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 122 | + `manufacture` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 123 | + `model` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 124 | + `owner` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 125 | + `civilCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 126 | + `block` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 127 | + `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 128 | + `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 129 | + `safetyWay` int DEFAULT NULL, | ||
| 130 | + `registerWay` int DEFAULT NULL, | ||
| 131 | + `certNum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 132 | + `certifiable` int DEFAULT NULL, | ||
| 133 | + `errCode` int DEFAULT NULL, | ||
| 134 | + `endTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 135 | + `secrecy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 136 | + `ipAddress` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 137 | + `port` int DEFAULT NULL, | ||
| 138 | + `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 139 | + `PTZType` int DEFAULT NULL, | ||
| 140 | + `status` int DEFAULT NULL, | ||
| 141 | + `longitude` double DEFAULT NULL, | ||
| 142 | + `latitude` double DEFAULT NULL, | ||
| 143 | + `streamId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 144 | + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 145 | + `parental` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 146 | + `hasAudio` bit(1) DEFAULT NULL, | ||
| 147 | + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 148 | + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 149 | + `subCount` int DEFAULT '0 ', | ||
| 150 | + `longitudeGcj02` double DEFAULT NULL, | ||
| 151 | + `latitudeGcj02` double DEFAULT NULL, | ||
| 152 | + `longitudeWgs84` double DEFAULT NULL, | ||
| 153 | + `latitudeWgs84` double DEFAULT NULL, | ||
| 154 | + `businessGroupId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 155 | + `gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 156 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 157 | + UNIQUE KEY `device_channel_id_uindex` (`id`) USING BTREE, | ||
| 158 | + UNIQUE KEY `device_channel_pk` (`channelId`, `deviceId`) USING BTREE | ||
| 159 | +) ENGINE = InnoDB | ||
| 160 | + AUTO_INCREMENT = 19496 | ||
| 161 | + DEFAULT CHARSET = utf8mb4 | ||
| 162 | + COLLATE = utf8mb4_general_ci | ||
| 163 | + ROW_FORMAT = DYNAMIC; | ||
| 146 | /*!40101 SET character_set_client = @saved_cs_client */; | 164 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 147 | 165 | ||
| 148 | -- | 166 | -- |
| @@ -150,8 +168,10 @@ CREATE TABLE `device_channel` ( | @@ -150,8 +168,10 @@ CREATE TABLE `device_channel` ( | ||
| 150 | -- | 168 | -- |
| 151 | 169 | ||
| 152 | LOCK TABLES `device_channel` WRITE; | 170 | LOCK TABLES `device_channel` WRITE; |
| 153 | -/*!40000 ALTER TABLE `device_channel` DISABLE KEYS */; | ||
| 154 | -/*!40000 ALTER TABLE `device_channel` ENABLE KEYS */; | 171 | +/*!40000 ALTER TABLE `device_channel` |
| 172 | + DISABLE KEYS */; | ||
| 173 | +/*!40000 ALTER TABLE `device_channel` | ||
| 174 | + ENABLE KEYS */; | ||
| 155 | UNLOCK TABLES; | 175 | UNLOCK TABLES; |
| 156 | 176 | ||
| 157 | -- | 177 | -- |
| @@ -159,27 +179,32 @@ UNLOCK TABLES; | @@ -159,27 +179,32 @@ UNLOCK TABLES; | ||
| 159 | -- | 179 | -- |
| 160 | 180 | ||
| 161 | DROP TABLE IF EXISTS `device_mobile_position`; | 181 | DROP TABLE IF EXISTS `device_mobile_position`; |
| 162 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 182 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 163 | /*!50503 SET character_set_client = utf8mb4 */; | 183 | /*!50503 SET character_set_client = utf8mb4 */; |
| 164 | -CREATE TABLE `device_mobile_position` ( | ||
| 165 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 166 | - `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 167 | - `channelId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 168 | - `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 169 | - `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 170 | - `longitude` double NOT NULL, | ||
| 171 | - `latitude` double NOT NULL, | ||
| 172 | - `altitude` double DEFAULT NULL, | ||
| 173 | - `speed` double DEFAULT NULL, | ||
| 174 | - `direction` double DEFAULT NULL, | ||
| 175 | - `reportSource` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 176 | - `longitudeGcj02` double DEFAULT NULL, | ||
| 177 | - `latitudeGcj02` double DEFAULT NULL, | ||
| 178 | - `longitudeWgs84` double DEFAULT NULL, | ||
| 179 | - `latitudeWgs84` double DEFAULT NULL, | ||
| 180 | - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 181 | - PRIMARY KEY (`id`) USING BTREE | ||
| 182 | -) ENGINE=InnoDB AUTO_INCREMENT=6751 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 184 | +CREATE TABLE `device_mobile_position` |
| 185 | +( | ||
| 186 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 187 | + `deviceId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 188 | + `channelId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 189 | + `deviceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 190 | + `time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 191 | + `longitude` double NOT NULL, | ||
| 192 | + `latitude` double NOT NULL, | ||
| 193 | + `altitude` double DEFAULT NULL, | ||
| 194 | + `speed` double DEFAULT NULL, | ||
| 195 | + `direction` double DEFAULT NULL, | ||
| 196 | + `reportSource` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 197 | + `longitudeGcj02` double DEFAULT NULL, | ||
| 198 | + `latitudeGcj02` double DEFAULT NULL, | ||
| 199 | + `longitudeWgs84` double DEFAULT NULL, | ||
| 200 | + `latitudeWgs84` double DEFAULT NULL, | ||
| 201 | + `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 202 | + PRIMARY KEY (`id`) USING BTREE | ||
| 203 | +) ENGINE = InnoDB | ||
| 204 | + AUTO_INCREMENT = 6956 | ||
| 205 | + DEFAULT CHARSET = utf8mb4 | ||
| 206 | + COLLATE = utf8mb4_general_ci | ||
| 207 | + ROW_FORMAT = DYNAMIC; | ||
| 183 | /*!40101 SET character_set_client = @saved_cs_client */; | 208 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 184 | 209 | ||
| 185 | -- | 210 | -- |
| @@ -187,8 +212,10 @@ CREATE TABLE `device_mobile_position` ( | @@ -187,8 +212,10 @@ CREATE TABLE `device_mobile_position` ( | ||
| 187 | -- | 212 | -- |
| 188 | 213 | ||
| 189 | LOCK TABLES `device_mobile_position` WRITE; | 214 | LOCK TABLES `device_mobile_position` WRITE; |
| 190 | -/*!40000 ALTER TABLE `device_mobile_position` DISABLE KEYS */; | ||
| 191 | -/*!40000 ALTER TABLE `device_mobile_position` ENABLE KEYS */; | 215 | +/*!40000 ALTER TABLE `device_mobile_position` |
| 216 | + DISABLE KEYS */; | ||
| 217 | +/*!40000 ALTER TABLE `device_mobile_position` | ||
| 218 | + ENABLE KEYS */; | ||
| 192 | UNLOCK TABLES; | 219 | UNLOCK TABLES; |
| 193 | 220 | ||
| 194 | -- | 221 | -- |
| @@ -196,24 +223,29 @@ UNLOCK TABLES; | @@ -196,24 +223,29 @@ UNLOCK TABLES; | ||
| 196 | -- | 223 | -- |
| 197 | 224 | ||
| 198 | DROP TABLE IF EXISTS `gb_stream`; | 225 | DROP TABLE IF EXISTS `gb_stream`; |
| 199 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 226 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 200 | /*!50503 SET character_set_client = utf8mb4 */; | 227 | /*!50503 SET character_set_client = utf8mb4 */; |
| 201 | -CREATE TABLE `gb_stream` ( | ||
| 202 | - `gbStreamId` int NOT NULL AUTO_INCREMENT, | ||
| 203 | - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 204 | - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 205 | - `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 206 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 207 | - `longitude` double DEFAULT NULL, | ||
| 208 | - `latitude` double DEFAULT NULL, | ||
| 209 | - `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 210 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 211 | - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 212 | - `gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 213 | - PRIMARY KEY (`gbStreamId`) USING BTREE, | ||
| 214 | - UNIQUE KEY `app` (`app`,`stream`) USING BTREE, | ||
| 215 | - UNIQUE KEY `gbId` (`gbId`) USING BTREE | ||
| 216 | -) ENGINE=InnoDB AUTO_INCREMENT=301681 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 228 | +CREATE TABLE `gb_stream` |
| 229 | +( | ||
| 230 | + `gbStreamId` int NOT NULL AUTO_INCREMENT, | ||
| 231 | + `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 232 | + `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 233 | + `gbId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 234 | + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 235 | + `longitude` double DEFAULT NULL, | ||
| 236 | + `latitude` double DEFAULT NULL, | ||
| 237 | + `streamType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 238 | + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 239 | + `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 240 | + `gpsTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 241 | + PRIMARY KEY (`gbStreamId`) USING BTREE, | ||
| 242 | + UNIQUE KEY `app` (`app`, `stream`) USING BTREE, | ||
| 243 | + UNIQUE KEY `gbId` (`gbId`) USING BTREE | ||
| 244 | +) ENGINE = InnoDB | ||
| 245 | + AUTO_INCREMENT = 301754 | ||
| 246 | + DEFAULT CHARSET = utf8mb4 | ||
| 247 | + COLLATE = utf8mb4_general_ci | ||
| 248 | + ROW_FORMAT = DYNAMIC; | ||
| 217 | /*!40101 SET character_set_client = @saved_cs_client */; | 249 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 218 | 250 | ||
| 219 | -- | 251 | -- |
| @@ -221,8 +253,10 @@ CREATE TABLE `gb_stream` ( | @@ -221,8 +253,10 @@ CREATE TABLE `gb_stream` ( | ||
| 221 | -- | 253 | -- |
| 222 | 254 | ||
| 223 | LOCK TABLES `gb_stream` WRITE; | 255 | LOCK TABLES `gb_stream` WRITE; |
| 224 | -/*!40000 ALTER TABLE `gb_stream` DISABLE KEYS */; | ||
| 225 | -/*!40000 ALTER TABLE `gb_stream` ENABLE KEYS */; | 256 | +/*!40000 ALTER TABLE `gb_stream` |
| 257 | + DISABLE KEYS */; | ||
| 258 | +/*!40000 ALTER TABLE `gb_stream` | ||
| 259 | + ENABLE KEYS */; | ||
| 226 | UNLOCK TABLES; | 260 | UNLOCK TABLES; |
| 227 | 261 | ||
| 228 | -- | 262 | -- |
| @@ -230,20 +264,25 @@ UNLOCK TABLES; | @@ -230,20 +264,25 @@ UNLOCK TABLES; | ||
| 230 | -- | 264 | -- |
| 231 | 265 | ||
| 232 | DROP TABLE IF EXISTS `log`; | 266 | DROP TABLE IF EXISTS `log`; |
| 233 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 267 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 234 | /*!50503 SET character_set_client = utf8mb4 */; | 268 | /*!50503 SET character_set_client = utf8mb4 */; |
| 235 | -CREATE TABLE `log` ( | ||
| 236 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 237 | - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 238 | - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 239 | - `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 240 | - `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 241 | - `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 242 | - `timing` bigint NOT NULL, | ||
| 243 | - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 244 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 245 | - PRIMARY KEY (`id`) USING BTREE | ||
| 246 | -) ENGINE=InnoDB AUTO_INCREMENT=34997 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 269 | +CREATE TABLE `log` |
| 270 | +( | ||
| 271 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 272 | + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 273 | + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 274 | + `uri` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 275 | + `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 276 | + `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 277 | + `timing` bigint NOT NULL, | ||
| 278 | + `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 279 | + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 280 | + PRIMARY KEY (`id`) USING BTREE | ||
| 281 | +) ENGINE = InnoDB | ||
| 282 | + AUTO_INCREMENT = 42703 | ||
| 283 | + DEFAULT CHARSET = utf8mb4 | ||
| 284 | + COLLATE = utf8mb4_general_ci | ||
| 285 | + ROW_FORMAT = DYNAMIC; | ||
| 247 | /*!40101 SET character_set_client = @saved_cs_client */; | 286 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 248 | 287 | ||
| 249 | -- | 288 | -- |
| @@ -251,8 +290,10 @@ CREATE TABLE `log` ( | @@ -251,8 +290,10 @@ CREATE TABLE `log` ( | ||
| 251 | -- | 290 | -- |
| 252 | 291 | ||
| 253 | LOCK TABLES `log` WRITE; | 292 | LOCK TABLES `log` WRITE; |
| 254 | -/*!40000 ALTER TABLE `log` DISABLE KEYS */; | ||
| 255 | -/*!40000 ALTER TABLE `log` ENABLE KEYS */; | 293 | +/*!40000 ALTER TABLE `log` |
| 294 | + DISABLE KEYS */; | ||
| 295 | +/*!40000 ALTER TABLE `log` | ||
| 296 | + ENABLE KEYS */; | ||
| 256 | UNLOCK TABLES; | 297 | UNLOCK TABLES; |
| 257 | 298 | ||
| 258 | -- | 299 | -- |
| @@ -260,35 +301,39 @@ UNLOCK TABLES; | @@ -260,35 +301,39 @@ UNLOCK TABLES; | ||
| 260 | -- | 301 | -- |
| 261 | 302 | ||
| 262 | DROP TABLE IF EXISTS `media_server`; | 303 | DROP TABLE IF EXISTS `media_server`; |
| 263 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 304 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 264 | /*!50503 SET character_set_client = utf8mb4 */; | 305 | /*!50503 SET character_set_client = utf8mb4 */; |
| 265 | -CREATE TABLE `media_server` ( | ||
| 266 | - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 267 | - `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 268 | - `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 269 | - `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 270 | - `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 271 | - `httpPort` int NOT NULL, | ||
| 272 | - `httpSSlPort` int NOT NULL, | ||
| 273 | - `rtmpPort` int NOT NULL, | ||
| 274 | - `rtmpSSlPort` int NOT NULL, | ||
| 275 | - `rtpProxyPort` int NOT NULL, | ||
| 276 | - `rtspPort` int NOT NULL, | ||
| 277 | - `rtspSSLPort` int NOT NULL, | ||
| 278 | - `autoConfig` int NOT NULL, | ||
| 279 | - `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 280 | - `streamNoneReaderDelayMS` int NOT NULL, | ||
| 281 | - `rtpEnable` int NOT NULL, | ||
| 282 | - `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 283 | - `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 284 | - `recordAssistPort` int NOT NULL, | ||
| 285 | - `defaultServer` int NOT NULL, | ||
| 286 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 287 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 288 | - `hookAliveInterval` int NOT NULL, | ||
| 289 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 290 | - UNIQUE KEY `media_server_i` (`ip`,`httpPort`) USING BTREE | ||
| 291 | -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 306 | +CREATE TABLE `media_server` |
| 307 | +( | ||
| 308 | + `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 309 | + `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 310 | + `hookIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 311 | + `sdpIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 312 | + `streamIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 313 | + `httpPort` int NOT NULL, | ||
| 314 | + `httpSSlPort` int NOT NULL, | ||
| 315 | + `rtmpPort` int NOT NULL, | ||
| 316 | + `rtmpSSlPort` int NOT NULL, | ||
| 317 | + `rtpProxyPort` int NOT NULL, | ||
| 318 | + `rtspPort` int NOT NULL, | ||
| 319 | + `rtspSSLPort` int NOT NULL, | ||
| 320 | + `autoConfig` int NOT NULL, | ||
| 321 | + `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 322 | + `streamNoneReaderDelayMS` int NOT NULL, | ||
| 323 | + `rtpEnable` int NOT NULL, | ||
| 324 | + `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 325 | + `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 326 | + `recordAssistPort` int NOT NULL, | ||
| 327 | + `defaultServer` int NOT NULL, | ||
| 328 | + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 329 | + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 330 | + `hookAliveInterval` int NOT NULL, | ||
| 331 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 332 | + UNIQUE KEY `media_server_i` (`ip`, `httpPort`) USING BTREE | ||
| 333 | +) ENGINE = InnoDB | ||
| 334 | + DEFAULT CHARSET = utf8mb4 | ||
| 335 | + COLLATE = utf8mb4_general_ci | ||
| 336 | + ROW_FORMAT = DYNAMIC; | ||
| 292 | /*!40101 SET character_set_client = @saved_cs_client */; | 337 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 293 | 338 | ||
| 294 | -- | 339 | -- |
| @@ -296,8 +341,10 @@ CREATE TABLE `media_server` ( | @@ -296,8 +341,10 @@ CREATE TABLE `media_server` ( | ||
| 296 | -- | 341 | -- |
| 297 | 342 | ||
| 298 | LOCK TABLES `media_server` WRITE; | 343 | LOCK TABLES `media_server` WRITE; |
| 299 | -/*!40000 ALTER TABLE `media_server` DISABLE KEYS */; | ||
| 300 | -/*!40000 ALTER TABLE `media_server` ENABLE KEYS */; | 344 | +/*!40000 ALTER TABLE `media_server` |
| 345 | + DISABLE KEYS */; | ||
| 346 | +/*!40000 ALTER TABLE `media_server` | ||
| 347 | + ENABLE KEYS */; | ||
| 301 | UNLOCK TABLES; | 348 | UNLOCK TABLES; |
| 302 | 349 | ||
| 303 | -- | 350 | -- |
| @@ -305,39 +352,44 @@ UNLOCK TABLES; | @@ -305,39 +352,44 @@ UNLOCK TABLES; | ||
| 305 | -- | 352 | -- |
| 306 | 353 | ||
| 307 | DROP TABLE IF EXISTS `parent_platform`; | 354 | DROP TABLE IF EXISTS `parent_platform`; |
| 308 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 355 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 309 | /*!50503 SET character_set_client = utf8mb4 */; | 356 | /*!50503 SET character_set_client = utf8mb4 */; |
| 310 | -CREATE TABLE `parent_platform` ( | ||
| 311 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 312 | - `enable` int DEFAULT NULL, | ||
| 313 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 314 | - `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 315 | - `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 316 | - `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 317 | - `serverPort` int DEFAULT NULL, | ||
| 318 | - `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 319 | - `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 320 | - `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 321 | - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 322 | - `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 323 | - `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 324 | - `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 325 | - `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 326 | - `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 327 | - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 328 | - `ptz` int DEFAULT NULL, | ||
| 329 | - `rtcp` int DEFAULT NULL, | ||
| 330 | - `status` bit(1) DEFAULT NULL, | ||
| 331 | - `shareAllLiveStream` int DEFAULT NULL, | ||
| 332 | - `startOfflinePush` int DEFAULT '0', | ||
| 333 | - `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 334 | - `catalogGroup` int DEFAULT '1', | ||
| 335 | - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 336 | - `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 337 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 338 | - UNIQUE KEY `parent_platform_id_uindex` (`id`) USING BTREE, | ||
| 339 | - UNIQUE KEY `parent_platform_pk` (`serverGBId`) USING BTREE | ||
| 340 | -) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 357 | +CREATE TABLE `parent_platform` |
| 358 | +( | ||
| 359 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 360 | + `enable` int DEFAULT NULL, | ||
| 361 | + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 362 | + `serverGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 363 | + `serverGBDomain` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 364 | + `serverIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 365 | + `serverPort` int DEFAULT NULL, | ||
| 366 | + `deviceGBId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 367 | + `deviceIp` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 368 | + `devicePort` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 369 | + `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 370 | + `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 371 | + `expires` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 372 | + `keepTimeout` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 373 | + `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 374 | + `characterSet` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 375 | + `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 376 | + `ptz` int DEFAULT NULL, | ||
| 377 | + `rtcp` int DEFAULT NULL, | ||
| 378 | + `status` bit(1) DEFAULT NULL, | ||
| 379 | + `startOfflinePush` int DEFAULT '0 ', | ||
| 380 | + `administrativeDivision` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 381 | + `catalogGroup` int DEFAULT '1 ', | ||
| 382 | + `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 383 | + `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 384 | + `treeType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 385 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 386 | + UNIQUE KEY `parent_platform_id_uindex` (`id`) USING BTREE, | ||
| 387 | + UNIQUE KEY `parent_platform_pk` (`serverGBId`) USING BTREE | ||
| 388 | +) ENGINE = InnoDB | ||
| 389 | + AUTO_INCREMENT = 40 | ||
| 390 | + DEFAULT CHARSET = utf8mb4 | ||
| 391 | + COLLATE = utf8mb4_general_ci | ||
| 392 | + ROW_FORMAT = DYNAMIC; | ||
| 341 | /*!40101 SET character_set_client = @saved_cs_client */; | 393 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 342 | 394 | ||
| 343 | -- | 395 | -- |
| @@ -345,8 +397,10 @@ CREATE TABLE `parent_platform` ( | @@ -345,8 +397,10 @@ CREATE TABLE `parent_platform` ( | ||
| 345 | -- | 397 | -- |
| 346 | 398 | ||
| 347 | LOCK TABLES `parent_platform` WRITE; | 399 | LOCK TABLES `parent_platform` WRITE; |
| 348 | -/*!40000 ALTER TABLE `parent_platform` DISABLE KEYS */; | ||
| 349 | -/*!40000 ALTER TABLE `parent_platform` ENABLE KEYS */; | 400 | +/*!40000 ALTER TABLE `parent_platform` |
| 401 | + DISABLE KEYS */; | ||
| 402 | +/*!40000 ALTER TABLE `parent_platform` | ||
| 403 | + ENABLE KEYS */; | ||
| 350 | UNLOCK TABLES; | 404 | UNLOCK TABLES; |
| 351 | 405 | ||
| 352 | -- | 406 | -- |
| @@ -354,15 +408,21 @@ UNLOCK TABLES; | @@ -354,15 +408,21 @@ UNLOCK TABLES; | ||
| 354 | -- | 408 | -- |
| 355 | 409 | ||
| 356 | DROP TABLE IF EXISTS `platform_catalog`; | 410 | DROP TABLE IF EXISTS `platform_catalog`; |
| 357 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 411 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 358 | /*!50503 SET character_set_client = utf8mb4 */; | 412 | /*!50503 SET character_set_client = utf8mb4 */; |
| 359 | -CREATE TABLE `platform_catalog` ( | ||
| 360 | - `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 361 | - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 362 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 363 | - `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 364 | - PRIMARY KEY (`id`) USING BTREE | ||
| 365 | -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 413 | +CREATE TABLE `platform_catalog` |
| 414 | +( | ||
| 415 | + `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 416 | + `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 417 | + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 418 | + `parentId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 419 | + `civilCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 420 | + `businessGroupId` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 421 | + PRIMARY KEY (`id`) USING BTREE | ||
| 422 | +) ENGINE = InnoDB | ||
| 423 | + DEFAULT CHARSET = utf8mb4 | ||
| 424 | + COLLATE = utf8mb4_general_ci | ||
| 425 | + ROW_FORMAT = DYNAMIC; | ||
| 366 | /*!40101 SET character_set_client = @saved_cs_client */; | 426 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 367 | 427 | ||
| 368 | -- | 428 | -- |
| @@ -370,8 +430,10 @@ CREATE TABLE `platform_catalog` ( | @@ -370,8 +430,10 @@ CREATE TABLE `platform_catalog` ( | ||
| 370 | -- | 430 | -- |
| 371 | 431 | ||
| 372 | LOCK TABLES `platform_catalog` WRITE; | 432 | LOCK TABLES `platform_catalog` WRITE; |
| 373 | -/*!40000 ALTER TABLE `platform_catalog` DISABLE KEYS */; | ||
| 374 | -/*!40000 ALTER TABLE `platform_catalog` ENABLE KEYS */; | 433 | +/*!40000 ALTER TABLE `platform_catalog` |
| 434 | + DISABLE KEYS */; | ||
| 435 | +/*!40000 ALTER TABLE `platform_catalog` | ||
| 436 | + ENABLE KEYS */; | ||
| 375 | UNLOCK TABLES; | 437 | UNLOCK TABLES; |
| 376 | 438 | ||
| 377 | -- | 439 | -- |
| @@ -379,15 +441,20 @@ UNLOCK TABLES; | @@ -379,15 +441,20 @@ UNLOCK TABLES; | ||
| 379 | -- | 441 | -- |
| 380 | 442 | ||
| 381 | DROP TABLE IF EXISTS `platform_gb_channel`; | 443 | DROP TABLE IF EXISTS `platform_gb_channel`; |
| 382 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 444 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 383 | /*!50503 SET character_set_client = utf8mb4 */; | 445 | /*!50503 SET character_set_client = utf8mb4 */; |
| 384 | -CREATE TABLE `platform_gb_channel` ( | ||
| 385 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 386 | - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 387 | - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 388 | - `deviceChannelId` int NOT NULL, | ||
| 389 | - PRIMARY KEY (`id`) USING BTREE | ||
| 390 | -) ENGINE=InnoDB AUTO_INCREMENT=4889 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 446 | +CREATE TABLE `platform_gb_channel` |
| 447 | +( | ||
| 448 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 449 | + `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 450 | + `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 451 | + `deviceChannelId` int NOT NULL, | ||
| 452 | + PRIMARY KEY (`id`) USING BTREE | ||
| 453 | +) ENGINE = InnoDB | ||
| 454 | + AUTO_INCREMENT = 4915 | ||
| 455 | + DEFAULT CHARSET = utf8mb4 | ||
| 456 | + COLLATE = utf8mb4_general_ci | ||
| 457 | + ROW_FORMAT = DYNAMIC; | ||
| 391 | /*!40101 SET character_set_client = @saved_cs_client */; | 458 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 392 | 459 | ||
| 393 | -- | 460 | -- |
| @@ -395,8 +462,10 @@ CREATE TABLE `platform_gb_channel` ( | @@ -395,8 +462,10 @@ CREATE TABLE `platform_gb_channel` ( | ||
| 395 | -- | 462 | -- |
| 396 | 463 | ||
| 397 | LOCK TABLES `platform_gb_channel` WRITE; | 464 | LOCK TABLES `platform_gb_channel` WRITE; |
| 398 | -/*!40000 ALTER TABLE `platform_gb_channel` DISABLE KEYS */; | ||
| 399 | -/*!40000 ALTER TABLE `platform_gb_channel` ENABLE KEYS */; | 465 | +/*!40000 ALTER TABLE `platform_gb_channel` |
| 466 | + DISABLE KEYS */; | ||
| 467 | +/*!40000 ALTER TABLE `platform_gb_channel` | ||
| 468 | + ENABLE KEYS */; | ||
| 400 | UNLOCK TABLES; | 469 | UNLOCK TABLES; |
| 401 | 470 | ||
| 402 | -- | 471 | -- |
| @@ -404,16 +473,21 @@ UNLOCK TABLES; | @@ -404,16 +473,21 @@ UNLOCK TABLES; | ||
| 404 | -- | 473 | -- |
| 405 | 474 | ||
| 406 | DROP TABLE IF EXISTS `platform_gb_stream`; | 475 | DROP TABLE IF EXISTS `platform_gb_stream`; |
| 407 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 476 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 408 | /*!50503 SET character_set_client = utf8mb4 */; | 477 | /*!50503 SET character_set_client = utf8mb4 */; |
| 409 | -CREATE TABLE `platform_gb_stream` ( | ||
| 410 | - `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 411 | - `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 412 | - `gbStreamId` int NOT NULL, | ||
| 413 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 414 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 415 | - UNIQUE KEY `platform_gb_stream_pk` (`platformId`,`catalogId`,`gbStreamId`) USING BTREE | ||
| 416 | -) ENGINE=InnoDB AUTO_INCREMENT=302077 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 478 | +CREATE TABLE `platform_gb_stream` |
| 479 | +( | ||
| 480 | + `platformId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 481 | + `catalogId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 482 | + `gbStreamId` int NOT NULL, | ||
| 483 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 484 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 485 | + UNIQUE KEY `platform_gb_stream_pk` (`platformId`, `catalogId`, `gbStreamId`) USING BTREE | ||
| 486 | +) ENGINE = InnoDB | ||
| 487 | + AUTO_INCREMENT = 302149 | ||
| 488 | + DEFAULT CHARSET = utf8mb4 | ||
| 489 | + COLLATE = utf8mb4_general_ci | ||
| 490 | + ROW_FORMAT = DYNAMIC; | ||
| 417 | /*!40101 SET character_set_client = @saved_cs_client */; | 491 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 418 | 492 | ||
| 419 | -- | 493 | -- |
| @@ -421,8 +495,10 @@ CREATE TABLE `platform_gb_stream` ( | @@ -421,8 +495,10 @@ CREATE TABLE `platform_gb_stream` ( | ||
| 421 | -- | 495 | -- |
| 422 | 496 | ||
| 423 | LOCK TABLES `platform_gb_stream` WRITE; | 497 | LOCK TABLES `platform_gb_stream` WRITE; |
| 424 | -/*!40000 ALTER TABLE `platform_gb_stream` DISABLE KEYS */; | ||
| 425 | -/*!40000 ALTER TABLE `platform_gb_stream` ENABLE KEYS */; | 498 | +/*!40000 ALTER TABLE `platform_gb_stream` |
| 499 | + DISABLE KEYS */; | ||
| 500 | +/*!40000 ALTER TABLE `platform_gb_stream` | ||
| 501 | + ENABLE KEYS */; | ||
| 426 | UNLOCK TABLES; | 502 | UNLOCK TABLES; |
| 427 | 503 | ||
| 428 | -- | 504 | -- |
| @@ -430,31 +506,36 @@ UNLOCK TABLES; | @@ -430,31 +506,36 @@ UNLOCK TABLES; | ||
| 430 | -- | 506 | -- |
| 431 | 507 | ||
| 432 | DROP TABLE IF EXISTS `stream_proxy`; | 508 | DROP TABLE IF EXISTS `stream_proxy`; |
| 433 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 509 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 434 | /*!50503 SET character_set_client = utf8mb4 */; | 510 | /*!50503 SET character_set_client = utf8mb4 */; |
| 435 | -CREATE TABLE `stream_proxy` ( | ||
| 436 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 437 | - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 438 | - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 439 | - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 440 | - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 441 | - `src_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 442 | - `dst_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 443 | - `timeout_ms` int DEFAULT NULL, | ||
| 444 | - `ffmpeg_cmd_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 445 | - `rtp_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 446 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 447 | - `enable_hls` bit(1) DEFAULT NULL, | ||
| 448 | - `enable_mp4` bit(1) DEFAULT NULL, | ||
| 449 | - `enable` bit(1) NOT NULL, | ||
| 450 | - `status` bit(1) NOT NULL, | ||
| 451 | - `enable_remove_none_reader` bit(1) NOT NULL, | ||
| 452 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 453 | - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 454 | - `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 455 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 456 | - UNIQUE KEY `stream_proxy_pk` (`app`,`stream`) USING BTREE | ||
| 457 | -) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 511 | +CREATE TABLE `stream_proxy` |
| 512 | +( | ||
| 513 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 514 | + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 515 | + `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 516 | + `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 517 | + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 518 | + `src_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 519 | + `dst_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 520 | + `timeout_ms` int DEFAULT NULL, | ||
| 521 | + `ffmpeg_cmd_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 522 | + `rtp_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 523 | + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 524 | + `enable_hls` bit(1) DEFAULT NULL, | ||
| 525 | + `enable_mp4` bit(1) DEFAULT NULL, | ||
| 526 | + `enable` bit(1) NOT NULL, | ||
| 527 | + `status` bit(1) NOT NULL, | ||
| 528 | + `enable_remove_none_reader` bit(1) NOT NULL, | ||
| 529 | + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 530 | + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 531 | + `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 532 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 533 | + UNIQUE KEY `stream_proxy_pk` (`app`, `stream`) USING BTREE | ||
| 534 | +) ENGINE = InnoDB | ||
| 535 | + AUTO_INCREMENT = 66 | ||
| 536 | + DEFAULT CHARSET = utf8mb4 | ||
| 537 | + COLLATE = utf8mb4_general_ci | ||
| 538 | + ROW_FORMAT = DYNAMIC; | ||
| 458 | /*!40101 SET character_set_client = @saved_cs_client */; | 539 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 459 | 540 | ||
| 460 | -- | 541 | -- |
| @@ -462,8 +543,10 @@ CREATE TABLE `stream_proxy` ( | @@ -462,8 +543,10 @@ CREATE TABLE `stream_proxy` ( | ||
| 462 | -- | 543 | -- |
| 463 | 544 | ||
| 464 | LOCK TABLES `stream_proxy` WRITE; | 545 | LOCK TABLES `stream_proxy` WRITE; |
| 465 | -/*!40000 ALTER TABLE `stream_proxy` DISABLE KEYS */; | ||
| 466 | -/*!40000 ALTER TABLE `stream_proxy` ENABLE KEYS */; | 546 | +/*!40000 ALTER TABLE `stream_proxy` |
| 547 | + DISABLE KEYS */; | ||
| 548 | +/*!40000 ALTER TABLE `stream_proxy` | ||
| 549 | + ENABLE KEYS */; | ||
| 467 | UNLOCK TABLES; | 550 | UNLOCK TABLES; |
| 468 | 551 | ||
| 469 | -- | 552 | -- |
| @@ -471,25 +554,32 @@ UNLOCK TABLES; | @@ -471,25 +554,32 @@ UNLOCK TABLES; | ||
| 471 | -- | 554 | -- |
| 472 | 555 | ||
| 473 | DROP TABLE IF EXISTS `stream_push`; | 556 | DROP TABLE IF EXISTS `stream_push`; |
| 474 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 557 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 475 | /*!50503 SET character_set_client = utf8mb4 */; | 558 | /*!50503 SET character_set_client = utf8mb4 */; |
| 476 | -CREATE TABLE `stream_push` ( | ||
| 477 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 478 | - `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 479 | - `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 480 | - `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 481 | - `originType` int DEFAULT NULL, | ||
| 482 | - `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 483 | - `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 484 | - `aliveSecond` int DEFAULT NULL, | ||
| 485 | - `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 486 | - `serverId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 487 | - `pushTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 488 | - `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 489 | - `status` int DEFAULT NULL, | ||
| 490 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 491 | - UNIQUE KEY `stream_push_pk` (`app`,`stream`) USING BTREE | ||
| 492 | -) ENGINE=InnoDB AUTO_INCREMENT=305315 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 559 | +CREATE TABLE `stream_push` |
| 560 | +( | ||
| 561 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 562 | + `app` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 563 | + `stream` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 564 | + `totalReaderCount` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 565 | + `originType` int DEFAULT NULL, | ||
| 566 | + `originTypeStr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 567 | + `createTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 568 | + `aliveSecond` int DEFAULT NULL, | ||
| 569 | + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 570 | + `serverId` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, | ||
| 571 | + `pushTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 572 | + `updateTime` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 573 | + `status` int DEFAULT NULL, | ||
| 574 | + `pushIng` int DEFAULT NULL, | ||
| 575 | + `self` int DEFAULT NULL, | ||
| 576 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 577 | + UNIQUE KEY `stream_push_pk` (`app`, `stream`) USING BTREE | ||
| 578 | +) ENGINE = InnoDB | ||
| 579 | + AUTO_INCREMENT = 305415 | ||
| 580 | + DEFAULT CHARSET = utf8mb4 | ||
| 581 | + COLLATE = utf8mb4_general_ci | ||
| 582 | + ROW_FORMAT = DYNAMIC; | ||
| 493 | /*!40101 SET character_set_client = @saved_cs_client */; | 583 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 494 | 584 | ||
| 495 | -- | 585 | -- |
| @@ -497,8 +587,10 @@ CREATE TABLE `stream_push` ( | @@ -497,8 +587,10 @@ CREATE TABLE `stream_push` ( | ||
| 497 | -- | 587 | -- |
| 498 | 588 | ||
| 499 | LOCK TABLES `stream_push` WRITE; | 589 | LOCK TABLES `stream_push` WRITE; |
| 500 | -/*!40000 ALTER TABLE `stream_push` DISABLE KEYS */; | ||
| 501 | -/*!40000 ALTER TABLE `stream_push` ENABLE KEYS */; | 590 | +/*!40000 ALTER TABLE `stream_push` |
| 591 | + DISABLE KEYS */; | ||
| 592 | +/*!40000 ALTER TABLE `stream_push` | ||
| 593 | + ENABLE KEYS */; | ||
| 502 | UNLOCK TABLES; | 594 | UNLOCK TABLES; |
| 503 | 595 | ||
| 504 | -- | 596 | -- |
| @@ -506,19 +598,24 @@ UNLOCK TABLES; | @@ -506,19 +598,24 @@ UNLOCK TABLES; | ||
| 506 | -- | 598 | -- |
| 507 | 599 | ||
| 508 | DROP TABLE IF EXISTS `user`; | 600 | DROP TABLE IF EXISTS `user`; |
| 509 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 601 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 510 | /*!50503 SET character_set_client = utf8mb4 */; | 602 | /*!50503 SET character_set_client = utf8mb4 */; |
| 511 | -CREATE TABLE `user` ( | ||
| 512 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 513 | - `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 514 | - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 515 | - `roleId` int NOT NULL, | ||
| 516 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 517 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 518 | - `pushKey` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 519 | - PRIMARY KEY (`id`) USING BTREE, | ||
| 520 | - UNIQUE KEY `user_username_uindex` (`username`) USING BTREE | ||
| 521 | -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 603 | +CREATE TABLE `user` |
| 604 | +( | ||
| 605 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 606 | + `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 607 | + `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 608 | + `roleId` int NOT NULL, | ||
| 609 | + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 610 | + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 611 | + `pushKey` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL, | ||
| 612 | + PRIMARY KEY (`id`) USING BTREE, | ||
| 613 | + UNIQUE KEY `user_username_uindex` (`username`) USING BTREE | ||
| 614 | +) ENGINE = InnoDB | ||
| 615 | + AUTO_INCREMENT = 2 | ||
| 616 | + DEFAULT CHARSET = utf8mb4 | ||
| 617 | + COLLATE = utf8mb4_general_ci | ||
| 618 | + ROW_FORMAT = DYNAMIC; | ||
| 522 | /*!40101 SET character_set_client = @saved_cs_client */; | 619 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 523 | 620 | ||
| 524 | -- | 621 | -- |
| @@ -526,9 +623,13 @@ CREATE TABLE `user` ( | @@ -526,9 +623,13 @@ CREATE TABLE `user` ( | ||
| 526 | -- | 623 | -- |
| 527 | 624 | ||
| 528 | LOCK TABLES `user` WRITE; | 625 | LOCK TABLES `user` WRITE; |
| 529 | -/*!40000 ALTER TABLE `user` DISABLE KEYS */; | ||
| 530 | -INSERT INTO `user` VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021 - 04 - 13 14:14:57','2021 - 04 - 13 14:14:57','453df297a57a5a7438934sda801fc3'); | ||
| 531 | -/*!40000 ALTER TABLE `user` ENABLE KEYS */; | 626 | +/*!40000 ALTER TABLE `user` |
| 627 | + DISABLE KEYS */; | ||
| 628 | +INSERT INTO `user` | ||
| 629 | +VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 1, '2021 - 04 - 13 14:14:57', '2021 - 04 - 13 14:14:57', | ||
| 630 | + '01685cb9573ae25ec6c52142402da7c5'); | ||
| 631 | +/*!40000 ALTER TABLE `user` | ||
| 632 | + ENABLE KEYS */; | ||
| 532 | UNLOCK TABLES; | 633 | UNLOCK TABLES; |
| 533 | 634 | ||
| 534 | -- | 635 | -- |
| @@ -536,16 +637,21 @@ UNLOCK TABLES; | @@ -536,16 +637,21 @@ UNLOCK TABLES; | ||
| 536 | -- | 637 | -- |
| 537 | 638 | ||
| 538 | DROP TABLE IF EXISTS `user_role`; | 639 | DROP TABLE IF EXISTS `user_role`; |
| 539 | -/*!40101 SET @saved_cs_client = @@character_set_client */; | 640 | +/*!40101 SET @saved_cs_client = @@character_set_client */; |
| 540 | /*!50503 SET character_set_client = utf8mb4 */; | 641 | /*!50503 SET character_set_client = utf8mb4 */; |
| 541 | -CREATE TABLE `user_role` ( | ||
| 542 | - `id` int NOT NULL AUTO_INCREMENT, | ||
| 543 | - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 544 | - `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 545 | - `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 546 | - `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 547 | - PRIMARY KEY (`id`) USING BTREE | ||
| 548 | -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; | 642 | +CREATE TABLE `user_role` |
| 643 | +( | ||
| 644 | + `id` int NOT NULL AUTO_INCREMENT, | ||
| 645 | + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 646 | + `authority` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 647 | + `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 648 | + `updateTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, | ||
| 649 | + PRIMARY KEY (`id`) USING BTREE | ||
| 650 | +) ENGINE = InnoDB | ||
| 651 | + AUTO_INCREMENT = 2 | ||
| 652 | + DEFAULT CHARSET = utf8mb4 | ||
| 653 | + COLLATE = utf8mb4_general_ci | ||
| 654 | + ROW_FORMAT = DYNAMIC; | ||
| 549 | /*!40101 SET character_set_client = @saved_cs_client */; | 655 | /*!40101 SET character_set_client = @saved_cs_client */; |
| 550 | 656 | ||
| 551 | -- | 657 | -- |
| @@ -553,18 +659,21 @@ CREATE TABLE `user_role` ( | @@ -553,18 +659,21 @@ CREATE TABLE `user_role` ( | ||
| 553 | -- | 659 | -- |
| 554 | 660 | ||
| 555 | LOCK TABLES `user_role` WRITE; | 661 | LOCK TABLES `user_role` WRITE; |
| 556 | -/*!40000 ALTER TABLE `user_role` DISABLE KEYS */; | ||
| 557 | -INSERT INTO `user_role` VALUES (1,'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57'); | ||
| 558 | -/*!40000 ALTER TABLE `user_role` ENABLE KEYS */; | 662 | +/*!40000 ALTER TABLE `user_role` |
| 663 | + DISABLE KEYS */; | ||
| 664 | +INSERT INTO `user_role` | ||
| 665 | +VALUES (1, 'admin', '0 ', '2021 - 04 - 13 14:14:57', '2021 - 04 - 13 14:14:57'); | ||
| 666 | +/*!40000 ALTER TABLE `user_role` | ||
| 667 | + ENABLE KEYS */; | ||
| 559 | UNLOCK TABLES; | 668 | UNLOCK TABLES; |
| 560 | -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; | 669 | +/*!40103 SET TIME_ZONE = @OLD_TIME_ZONE */; |
| 561 | 670 | ||
| 562 | -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; | ||
| 563 | -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; | ||
| 564 | -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; | ||
| 565 | -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; | ||
| 566 | -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; | ||
| 567 | -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; | ||
| 568 | -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; | 671 | +/*!40101 SET SQL_MODE = @OLD_SQL_MODE */; |
| 672 | +/*!40014 SET FOREIGN_KEY_CHECKS = @OLD_FOREIGN_KEY_CHECKS */; | ||
| 673 | +/*!40014 SET UNIQUE_CHECKS = @OLD_UNIQUE_CHECKS */; | ||
| 674 | +/*!40101 SET CHARACTER_SET_CLIENT = @OLD_CHARACTER_SET_CLIENT */; | ||
| 675 | +/*!40101 SET CHARACTER_SET_RESULTS = @OLD_CHARACTER_SET_RESULTS */; | ||
| 676 | +/*!40101 SET COLLATION_CONNECTION = @OLD_COLLATION_CONNECTION */; | ||
| 677 | +/*!40111 SET SQL_NOTES = @OLD_SQL_NOTES */; | ||
| 569 | 678 | ||
| 570 | --- Dump completed on 2022-07-11 17:32:51 | 679 | +-- Dump completed on 2022-07-27 14:51:08 |
sql/update.sql
| @@ -71,6 +71,8 @@ alter table stream_push | @@ -71,6 +71,8 @@ alter table stream_push | ||
| 71 | alter table stream_push | 71 | alter table stream_push |
| 72 | add updateTime varchar(50) default null; | 72 | add updateTime varchar(50) default null; |
| 73 | alter table stream_push | 73 | alter table stream_push |
| 74 | + add pushIng int DEFAULT NULL; | ||
| 75 | +alter table stream_push | ||
| 74 | change createStamp createTime varchar(50) default null; | 76 | change createStamp createTime varchar(50) default null; |
| 75 | 77 | ||
| 76 | alter table gb_stream | 78 | alter table gb_stream |
| @@ -78,4 +80,20 @@ alter table gb_stream | @@ -78,4 +80,20 @@ alter table gb_stream | ||
| 78 | 80 | ||
| 79 | alter table user | 81 | alter table user |
| 80 | add pushKey varchar(50) default null; | 82 | add pushKey varchar(50) default null; |
| 83 | +update user set pushKey='453df297a57a5a7438934sda801fc3' where id=1; | ||
| 84 | + | ||
| 85 | +alter table parent_platform | ||
| 86 | + add treeType varchar(50) not null; | ||
| 87 | +update parent_platform set parent_platform.treeType='BusinessGroup'; | ||
| 88 | +alter table parent_platform drop shareAllLiveStream; | ||
| 89 | + | ||
| 90 | +alter table platform_catalog | ||
| 91 | + add civilCode varchar(50) default null; | ||
| 92 | +alter table platform_catalog | ||
| 93 | + add businessGroupId varchar(50) default null; | ||
| 94 | + | ||
| 95 | +/********************* ADD ***************************/ | ||
| 96 | +alter table stream_push | ||
| 97 | + add self int DEFAULT NULL; | ||
| 98 | + | ||
| 81 | 99 |
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
| @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; | @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; | ||
| 11 | import springfox.documentation.oas.annotations.EnableOpenApi; | 11 | import springfox.documentation.oas.annotations.EnableOpenApi; |
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | - * | 14 | + * 启动类 |
| 15 | */ | 15 | */ |
| 16 | @ServletComponentScan("com.genersoft.iot.vmp.conf") | 16 | @ServletComponentScan("com.genersoft.iot.vmp.conf") |
| 17 | @SpringBootApplication | 17 | @SpringBootApplication |
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
| @@ -104,6 +104,10 @@ public class VideoManagerConstants { | @@ -104,6 +104,10 @@ public class VideoManagerConstants { | ||
| 104 | // 设备状态订阅的通知 | 104 | // 设备状态订阅的通知 |
| 105 | public static final String VM_MSG_SUBSCRIBE_DEVICE_STATUS = "device"; | 105 | public static final String VM_MSG_SUBSCRIBE_DEVICE_STATUS = "device"; |
| 106 | 106 | ||
| 107 | + | ||
| 108 | + | ||
| 109 | + | ||
| 110 | + | ||
| 107 | //************************** 第三方 **************************************** | 111 | //************************** 第三方 **************************************** |
| 108 | public static final String WVP_STREAM_GB_ID_PREFIX = "memberNo_"; | 112 | public static final String WVP_STREAM_GB_ID_PREFIX = "memberNo_"; |
| 109 | public static final String WVP_STREAM_GPS_MSG_PREFIX = "WVP_STREAM_GPS_MSG_"; | 113 | public static final String WVP_STREAM_GPS_MSG_PREFIX = "WVP_STREAM_GPS_MSG_"; |
src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
| 1 | package com.genersoft.iot.vmp.conf; | 1 | package com.genersoft.iot.vmp.conf; |
| 2 | 2 | ||
| 3 | import com.genersoft.iot.vmp.common.VideoManagerConstants; | 3 | import com.genersoft.iot.vmp.common.VideoManagerConstants; |
| 4 | -import com.genersoft.iot.vmp.service.impl.RedisAlarmMsgListener; | ||
| 5 | -import com.genersoft.iot.vmp.service.impl.RedisGpsMsgListener; | ||
| 6 | -import com.genersoft.iot.vmp.service.impl.RedisGbPlayMsgListener; | ||
| 7 | -import com.genersoft.iot.vmp.service.impl.RedisStreamMsgListener; | 4 | +import com.genersoft.iot.vmp.service.impl.*; |
| 8 | import org.apache.commons.lang3.StringUtils; | 5 | import org.apache.commons.lang3.StringUtils; |
| 9 | import org.springframework.beans.factory.annotation.Autowired; | 6 | import org.springframework.beans.factory.annotation.Autowired; |
| 10 | import org.springframework.beans.factory.annotation.Value; | 7 | import org.springframework.beans.factory.annotation.Value; |
| @@ -60,6 +57,9 @@ public class RedisConfig extends CachingConfigurerSupport { | @@ -60,6 +57,9 @@ public class RedisConfig extends CachingConfigurerSupport { | ||
| 60 | @Autowired | 57 | @Autowired |
| 61 | private RedisGbPlayMsgListener redisGbPlayMsgListener; | 58 | private RedisGbPlayMsgListener redisGbPlayMsgListener; |
| 62 | 59 | ||
| 60 | + @Autowired | ||
| 61 | + private RedisPushStreamStatusMsgListener redisPushStreamStatusMsgListener; | ||
| 62 | + | ||
| 63 | @Bean | 63 | @Bean |
| 64 | public JedisPool jedisPool() { | 64 | public JedisPool jedisPool() { |
| 65 | if (StringUtils.isBlank(password)) { | 65 | if (StringUtils.isBlank(password)) { |
| @@ -108,6 +108,7 @@ public class RedisConfig extends CachingConfigurerSupport { | @@ -108,6 +108,7 @@ public class RedisConfig extends CachingConfigurerSupport { | ||
| 108 | container.addMessageListener(redisAlarmMsgListener, new PatternTopic(VideoManagerConstants.VM_MSG_SUBSCRIBE_ALARM_RECEIVE)); | 108 | container.addMessageListener(redisAlarmMsgListener, new PatternTopic(VideoManagerConstants.VM_MSG_SUBSCRIBE_ALARM_RECEIVE)); |
| 109 | container.addMessageListener(redisStreamMsgListener, new PatternTopic(VideoManagerConstants.WVP_MSG_STREAM_CHANGE_PREFIX + "PUSH")); | 109 | container.addMessageListener(redisStreamMsgListener, new PatternTopic(VideoManagerConstants.WVP_MSG_STREAM_CHANGE_PREFIX + "PUSH")); |
| 110 | container.addMessageListener(redisGbPlayMsgListener, new PatternTopic(RedisGbPlayMsgListener.WVP_PUSH_STREAM_KEY)); | 110 | container.addMessageListener(redisGbPlayMsgListener, new PatternTopic(RedisGbPlayMsgListener.WVP_PUSH_STREAM_KEY)); |
| 111 | + container.addMessageListener(redisPushStreamStatusMsgListener, new PatternTopic(VideoManagerConstants.VM_MSG_PUSH_STREAM_STATUS_CHANGE)); | ||
| 111 | return container; | 112 | return container; |
| 112 | } | 113 | } |
| 113 | 114 |
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
| 1 | package com.genersoft.iot.vmp.conf; | 1 | package com.genersoft.iot.vmp.conf; |
| 2 | 2 | ||
| 3 | -import io.swagger.models.auth.In; | ||
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 3 | import org.springframework.boot.context.properties.ConfigurationProperties; |
| 5 | import org.springframework.stereotype.Component; | 4 | import org.springframework.stereotype.Component; |
| 6 | 5 |
src/main/java/com/genersoft/iot/vmp/conf/security/DefaultUserDetailsServiceImpl.java
| 1 | package com.genersoft.iot.vmp.conf.security; | 1 | package com.genersoft.iot.vmp.conf.security; |
| 2 | 2 | ||
| 3 | -import com.genersoft.iot.vmp.conf.security.dto.LoginUser; | ||
| 4 | -import com.genersoft.iot.vmp.service.IUserService; | ||
| 5 | -import com.genersoft.iot.vmp.storager.dao.dto.User; | ||
| 6 | -import com.github.xiaoymin.knife4j.core.util.StrUtil; | 3 | +import java.time.LocalDateTime; |
| 4 | + | ||
| 7 | import org.slf4j.Logger; | 5 | import org.slf4j.Logger; |
| 8 | import org.slf4j.LoggerFactory; | 6 | import org.slf4j.LoggerFactory; |
| 9 | import org.springframework.beans.factory.annotation.Autowired; | 7 | import org.springframework.beans.factory.annotation.Autowired; |
| @@ -12,7 +10,10 @@ import org.springframework.security.core.userdetails.UserDetailsService; | @@ -12,7 +10,10 @@ import org.springframework.security.core.userdetails.UserDetailsService; | ||
| 12 | import org.springframework.security.core.userdetails.UsernameNotFoundException; | 10 | import org.springframework.security.core.userdetails.UsernameNotFoundException; |
| 13 | import org.springframework.stereotype.Component; | 11 | import org.springframework.stereotype.Component; |
| 14 | 12 | ||
| 15 | -import java.time.LocalDateTime; | 13 | +import com.alibaba.excel.util.StringUtils; |
| 14 | +import com.genersoft.iot.vmp.conf.security.dto.LoginUser; | ||
| 15 | +import com.genersoft.iot.vmp.service.IUserService; | ||
| 16 | +import com.genersoft.iot.vmp.storager.dao.dto.User; | ||
| 16 | 17 | ||
| 17 | /** | 18 | /** |
| 18 | * 用户登录认证逻辑 | 19 | * 用户登录认证逻辑 |
| @@ -27,7 +28,7 @@ public class DefaultUserDetailsServiceImpl implements UserDetailsService { | @@ -27,7 +28,7 @@ public class DefaultUserDetailsServiceImpl implements UserDetailsService { | ||
| 27 | 28 | ||
| 28 | @Override | 29 | @Override |
| 29 | public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { | 30 | public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { |
| 30 | - if (StrUtil.isBlank(username)) { | 31 | + if (StringUtils.isBlank(username)) { |
| 31 | logger.info("登录用户：{} 不存在", username); | 32 | logger.info("登录用户：{} 不存在", username); |
| 32 | throw new UsernameNotFoundException("登录用户：" + username + " 不存在"); | 33 | throw new UsernameNotFoundException("登录用户：" + username + " 不存在"); |
| 33 | } | 34 | } |
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
| @@ -3,8 +3,14 @@ package com.genersoft.iot.vmp.gb28181.bean; | @@ -3,8 +3,14 @@ package com.genersoft.iot.vmp.gb28181.bean; | ||
| 3 | import java.time.Instant; | 3 | import java.time.Instant; |
| 4 | import java.util.List; | 4 | import java.util.List; |
| 5 | 5 | ||
| 6 | +/** | ||
| 7 | + * @author lin | ||
| 8 | + */ | ||
| 6 | public class CatalogData { | 9 | public class CatalogData { |
| 7 | - private int sn; // 命令序列号 | 10 | + /** |
| 11 | + * 命令序列号 | ||
| 12 | + */ | ||
| 13 | + private int sn; | ||
| 8 | private int total; | 14 | private int total; |
| 9 | private List<DeviceChannel> channelList; | 15 | private List<DeviceChannel> channelList; |
| 10 | private Instant lastTime; | 16 | private Instant lastTime; |
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
| @@ -105,11 +105,6 @@ public class ParentPlatform { | @@ -105,11 +105,6 @@ public class ParentPlatform { | ||
| 105 | private int channelCount; | 105 | private int channelCount; |
| 106 | 106 | ||
| 107 | /** | 107 | /** |
| 108 | - * 共享所有的直播流 | ||
| 109 | - */ | ||
| 110 | - private boolean shareAllLiveStream; | ||
| 111 | - | ||
| 112 | - /** | ||
| 113 | * 默认目录Id,自动添加的通道多放在这个目录下 | 108 | * 默认目录Id,自动添加的通道多放在这个目录下 |
| 114 | */ | 109 | */ |
| 115 | private String catalogId; | 110 | private String catalogId; |
| @@ -154,6 +149,11 @@ public class ParentPlatform { | @@ -154,6 +149,11 @@ public class ParentPlatform { | ||
| 154 | */ | 149 | */ |
| 155 | private String createTime; | 150 | private String createTime; |
| 156 | 151 | ||
| 152 | + /** | ||
| 153 | + * 树类型 国标规定了两种树的展现方式 行政区划 CivilCode 和业务分组:BusinessGroup | ||
| 154 | + */ | ||
| 155 | + private String treeType; | ||
| 156 | + | ||
| 157 | public Integer getId() { | 157 | public Integer getId() { |
| 158 | return id; | 158 | return id; |
| 159 | } | 159 | } |
| @@ -314,15 +314,6 @@ public class ParentPlatform { | @@ -314,15 +314,6 @@ public class ParentPlatform { | ||
| 314 | this.channelCount = channelCount; | 314 | this.channelCount = channelCount; |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | - | ||
| 318 | - public boolean isShareAllLiveStream() { | ||
| 319 | - return shareAllLiveStream; | ||
| 320 | - } | ||
| 321 | - | ||
| 322 | - public void setShareAllLiveStream(boolean shareAllLiveStream) { | ||
| 323 | - this.shareAllLiveStream = shareAllLiveStream; | ||
| 324 | - } | ||
| 325 | - | ||
| 326 | public String getCatalogId() { | 317 | public String getCatalogId() { |
| 327 | return catalogId; | 318 | return catalogId; |
| 328 | } | 319 | } |
| @@ -394,4 +385,12 @@ public class ParentPlatform { | @@ -394,4 +385,12 @@ public class ParentPlatform { | ||
| 394 | public void setCreateTime(String createTime) { | 385 | public void setCreateTime(String createTime) { |
| 395 | this.createTime = createTime; | 386 | this.createTime = createTime; |
| 396 | } | 387 | } |
| 388 | + | ||
| 389 | + public String getTreeType() { | ||
| 390 | + return treeType; | ||
| 391 | + } | ||
| 392 | + | ||
| 393 | + public void setTreeType(String treeType) { | ||
| 394 | + this.treeType = treeType; | ||
| 395 | + } | ||
| 397 | } | 396 | } |
src/main/java/com/genersoft/iot/vmp/gb28181/bean/PlatformCatalog.java
| 1 | package com.genersoft.iot.vmp.gb28181.bean; | 1 | package com.genersoft.iot.vmp.gb28181.bean; |
| 2 | 2 | ||
| 3 | +/** | ||
| 4 | + * 国标级联-目录 | ||
| 5 | + * @author lin | ||
| 6 | + */ | ||
| 3 | public class PlatformCatalog { | 7 | public class PlatformCatalog { |
| 4 | private String id; | 8 | private String id; |
| 5 | private String name; | 9 | private String name; |
| 6 | private String platformId; | 10 | private String platformId; |
| 7 | private String parentId; | 11 | private String parentId; |
| 8 | - private int childrenCount; // 子节点数 | ||
| 9 | - private int type; // 0 目录, 1 国标通道, 2 直播流 | 12 | + |
| 13 | + private String civilCode; | ||
| 14 | + | ||
| 15 | + private String businessGroupId; | ||
| 16 | + | ||
| 17 | + /** | ||
| 18 | + * 子节点数 | ||
| 19 | + */ | ||
| 20 | + private int childrenCount; | ||
| 21 | + | ||
| 22 | + /** | ||
| 23 | + * 0 目录, 1 国标通道, 2 直播流 | ||
| 24 | + */ | ||
| 25 | + private int type; | ||
| 10 | 26 | ||
| 11 | public String getId() { | 27 | public String getId() { |
| 12 | return id; | 28 | return id; |
| @@ -68,4 +84,19 @@ public class PlatformCatalog { | @@ -68,4 +84,19 @@ public class PlatformCatalog { | ||
| 68 | this.type = 2; | 84 | this.type = 2; |
| 69 | } | 85 | } |
| 70 | 86 | ||
| 87 | + public String getCivilCode() { | ||
| 88 | + return civilCode; | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + public void setCivilCode(String civilCode) { | ||
| 92 | + this.civilCode = civilCode; | ||
| 93 | + } | ||
| 94 | + | ||
| 95 | + public String getBusinessGroupId() { | ||
| 96 | + return businessGroupId; | ||
| 97 | + } | ||
| 98 | + | ||
| 99 | + public void setBusinessGroupId(String businessGroupId) { | ||
| 100 | + this.businessGroupId = businessGroupId; | ||
| 101 | + } | ||
| 71 | } | 102 | } |
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SyncStatus.java
| @@ -2,12 +2,15 @@ package com.genersoft.iot.vmp.gb28181.bean; | @@ -2,12 +2,15 @@ package com.genersoft.iot.vmp.gb28181.bean; | ||
| 2 | 2 | ||
| 3 | /** | 3 | /** |
| 4 | * 摄像机同步状态 | 4 | * 摄像机同步状态 |
| 5 | + * @author lin | ||
| 5 | */ | 6 | */ |
| 6 | public class SyncStatus { | 7 | public class SyncStatus { |
| 7 | private int total; | 8 | private int total; |
| 8 | private int current; | 9 | private int current; |
| 9 | private String errorMsg; | 10 | private String errorMsg; |
| 10 | 11 | ||
| 12 | + private boolean syncIng; | ||
| 13 | + | ||
| 11 | public int getTotal() { | 14 | public int getTotal() { |
| 12 | return total; | 15 | return total; |
| 13 | } | 16 | } |
| @@ -31,4 +34,12 @@ public class SyncStatus { | @@ -31,4 +34,12 @@ public class SyncStatus { | ||
| 31 | public void setErrorMsg(String errorMsg) { | 34 | public void setErrorMsg(String errorMsg) { |
| 32 | this.errorMsg = errorMsg; | 35 | this.errorMsg = errorMsg; |
| 33 | } | 36 | } |
| 37 | + | ||
| 38 | + public boolean isSyncIng() { | ||
| 39 | + return syncIng; | ||
| 40 | + } | ||
| 41 | + | ||
| 42 | + public void setSyncIng(boolean syncIng) { | ||
| 43 | + this.syncIng = syncIng; | ||
| 44 | + } | ||
| 34 | } | 45 | } |