Commit Graph

252 Commits

Author SHA1 Message Date
648540858
7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
panlinlin
a1671c3c3e 临时提交 2024-08-08 23:44:03 +08:00
648540858
8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
panlinlin
3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858
d97accee4a 临时提交 2024-08-06 16:55:33 +08:00
648540858
ce0f0c4ac8 临时提交 2024-08-05 17:59:20 +08:00
panlinlin
18c51919a3 临时提交 2024-08-02 23:47:44 +08:00
648540858
55c534ac90 临时提交 2024-08-02 14:46:20 +08:00
648540858
3f2c9f6451 临时提交 2024-08-01 17:50:34 +08:00
648540858
f7c98301ac 临时提交 2024-08-01 15:29:51 +08:00
648540858
7ee3cdb801 完善行政区划管理 2024-07-31 15:07:54 +08:00
648540858
b246fd6a20 临时提交 2024-07-26 17:53:10 +08:00
648540858
a2b00a4f4e 临时提交 2024-07-25 18:02:22 +08:00
648540858
5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00
648540858
05fabc87a2 临时提交 2024-07-22 18:00:01 +08:00
648540858
1dcb912910 调整推流导入的数据格式 2024-07-15 17:52:27 +08:00
648540858
d9c0d0637c 增加通道编辑以及通道重置功能 2024-07-15 17:39:47 +08:00
648540858
cb403689b4 添加通道编号构建页面 2024-07-12 17:52:05 +08:00
648540858
6619c5c53d 临时提交 2024-07-11 18:25:16 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
648540858
7936194718 调整数据库字段 2024-07-04 16:55:42 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858
10c852c00d 优化目录信息内容构建 2024-07-02 16:35:03 +08:00
648540858
324fef2908 临时提交 2024-07-01 17:59:14 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
1616a2a731 Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构 2024-06-26 18:41:37 +08:00
648540858
f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858
68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
panlinlin
397ac956de 调整通用通道的位置 2024-06-21 16:05:13 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
246c01b1c8 重命名通道信息 2024-06-20 20:49:17 +08:00
648540858
40bf2d6642 添加通道信息 2024-06-20 20:24:15 +08:00
648540858
5c40608458 临时提交 2024-06-20 20:04:29 +08:00
648540858
2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858
f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
648540858
619a86e0ed 修复循环引用 2024-06-06 19:59:48 +08:00
648540858
2127cbeca3 调整收到移动位置订阅后开启定时任务 2024-06-05 22:45:13 +08:00
648540858
b89af9a693 Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2024-04-24 20:51:28 +08:00
648540858
c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	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/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-04-23 20:59:20 +08:00
648540858
b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00
648540858
6c0087db88 优化代码调用 2024-04-10 20:56:45 +08:00
648540858
b1b6fae22c Merge branch 'master' into dev/zlm
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
2024-04-09 10:35:11 +08:00
648540858
48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00