Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,263 Commits
17 Branches
1 Tag
55 MiB
Commit Graph

769 Commits (009f1cb0f368d4833525a99118ac584d7c036fe8)

Author SHA1 Message Date
648540858 33abdb1db6 Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	web_src/src/components/DeviceList.vue
 2025-03-10 21:36:52 +08:00
lin 85ecc4c201 修复国标通道编辑页面 2025-03-05 09:57:31 +08:00
Jerry Yan 11170fad7a 实现h265web功能 2025-02-21 18:25:05 +08:00
lin 924de556b8 优化网页表格使用统一高度 2025-02-21 15:20:14 +08:00
lin 73560d9e7e 优化编码信息刷新， 优化语音对讲选择按钮 2025-02-19 10:53:02 +08:00
lin b68e5423db 编码信息增加定时刷新 2025-02-19 10:40:13 +08:00
lin 158fbaac9c Merge branch 'master' into dev/数据库统合 2025-02-19 09:48:26 +08:00
程序员小墨 310fbe0a01 修复 [ h265web.vue] 文件名开头包含空格导致前端启动报错问题 2025-02-15 02:12:27 +08:00
lin b6c3f42a1f Merge branch 'refs/heads/master' into dev/数据库统合2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	src/main/resources/配置详情.yml
 2025-02-11 19:30:20 +08:00
lin d08248aae9 调整心跳间隔的设置机制以及状态的判断 2025-02-11 18:16:05 +08:00
648540858 b0b3f32e03 [集群] 支持国标级联更新 2025-01-02 18:34:22 +08:00
648540858 d4f9d51aee [集群-自动切换过国标级联] 平台列表增加区分本平台标识 2025-01-02 16:59:14 +08:00
648540858 4426180eba [集群-自动切换过国标级联] 平台列表增加区分本平台标识 2025-01-02 16:49:50 +08:00
648540858 319073ca89 临时提交 2024-12-31 15:41:26 +08:00
648540858 874733fa2c [RPC 云端录像] 修复服务ID 获取 2024-12-31 15:36:48 +08:00
648540858 32e90b2537 [RPC 云端录像] 修复时长显示 2024-12-31 15:13:56 +08:00
648540858 08a75d38a8 [RPC 云端录像] 增加云端录像播放 2024-12-31 14:54:11 +08:00
648540858 89651dd894 [RPC] 拉流代理页面调整 2024-12-31 11:24:29 +08:00
648540858 26ee38aebe Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
 2024-12-31 10:33:12 +08:00
648540858 f078c6f7a0 [拉流代理] 修复 #1718 2024-12-31 10:31:03 +08:00
648540858 8f7016878d [拉流代理] 增加单独的字段管理每次拉流需要的节点 2024-12-31 10:17:49 +08:00
648540858 785da6d5ef 调整前端获取服务ID方式 2024-12-30 16:32:37 +08:00
648540858 317f771fa2 Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
#	web_src/src/components/DeviceList.vue
 2024-12-30 16:00:58 +08:00
648540858 0dd2826b9e 优化设备订阅的操作方式 2024-12-30 15:59:15 +08:00
648540858 e05d988755 Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
 2024-12-27 10:57:42 +08:00
648540858 081bb6de18 完善通道数据类型的保存与展示 2024-12-24 23:35:01 +08:00
648540858 e82213b466 临时提交 2024-12-24 08:00:56 +08:00
648540858 28961f51f7 完善数据库结构调用 2024-12-23 23:49:54 +08:00
648540858 1b9799eb1f Merge branch 'master' into dev/数据库统合 2024-12-20 10:24:53 +08:00
Li Keqing f265bc9d59 修复设备历史录像页面文本提示 2024-12-19 15:18:28 +08:00
648540858 381d92e047 修复前端发送的错误请求 2024-12-13 15:23:28 +08:00
648540858 0a06ae9475 优化RPC调用 2024-12-12 12:42:57 +08:00
648540858 9d96658696 支持国标级联点播其他wvp的国标设备 2024-12-12 10:15:04 +08:00
648540858 79627201f5 修复历史日志文件下载 2024-12-10 22:55:02 +08:00
648540858 8495cd0f23 为行政区划树以及业务分组树添加通道增加提示以及添加业务分组支持选择行政区划 2024-12-10 22:45:08 +08:00
648540858 ad07fa5eb7 为行政区划树以及业务分组树添加操作提示 2024-12-10 22:21:45 +08:00
648540858 f616cc7da2 添加行政区划树以及业务分组树的操作提示 2024-12-10 22:02:47 +08:00
648540858 b2469e131c 优化录制计划关联全部通道提示 2024-12-10 21:59:40 +08:00
648540858 bcb54fa148 Merge remote-tracking branch 'origin/dev/录制计划' 2024-12-09 15:23:48 +08:00
648540858 7e9af0bee8 [播放弹窗] 移除无效代码 2024-11-29 17:26:28 +08:00
648540858 8a06562a88 [录制计划] 增加录制计划执行 2024-11-28 18:00:52 +08:00
648540858 a739701621 Merge branch 'master' into dev/录制计划 2024-11-28 14:38:51 +08:00
648540858 21cf05861b [录制计划] 修复计划选择与回显 2024-11-28 10:15:03 +08:00
648540858 cc56ed3355 临时提交 2024-11-27 22:44:22 +08:00
648540858 24c3c45565 [录制计划] 修复关联通道 2024-11-27 17:59:54 +08:00
648540858 3b24a6c8ca 修复云端录像列表排序 2024-11-27 15:29:00 +08:00
648540858 a753f80177 调整云端录像的控件大小 2024-11-27 15:00:47 +08:00
648540858 d3f53db160 Merge branch 'master' into dev/录制计划 2024-11-27 14:20:59 +08:00
648540858 e9a53b766e 调整目录查询的结果展示逻辑 2024-11-27 11:04:26 +08:00
648540858 57e1934f02 Merge branch 'master' into dev/录制计划 2024-11-26 20:59:27 +08:00