Commit Graph

36 Commits

Author SHA1 Message Date
lin
775376b327 重新定义移动位置事件处理流程 2026-04-17 18:07:21 +08:00
lin
842647674a 升级spring boot版本。默认jdk版本升级至21 2025-09-24 10:24:42 +08:00
lin
44ed06bcbe [1078] 支持无人观看自动停流 2025-07-15 18:11:23 +08:00
lin
1bfb51c90e Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
#	src/main/resources/application.yml
2025-07-03 15:29:13 +08:00
lin
bab5534134 Merge branch 'master' into dev/abl支持
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/resources/application.yml
2025-07-03 14:58:24 +08:00
lin
465e03d15d Merge branch 'master' into 重构/1078
# Conflicts:
#	web/src/router/index.js
#	web/src/views/common/channelPlayer/chooseChannelForJt.vue
#	web/src/views/common/channelPlayer/jtDeviceEdit.vue
#	web/src/views/common/channelPlayer/jtDevicePlayer.vue
#	web_src/src/layout/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
2025-07-03 09:41:55 +08:00
lin
60e9fb3daa 修复推流列表和拉流代理的云端录像跳转错误 2025-06-05 09:40:43 +08:00
lin
0c29c90d3b Merge branch 'master' into 重构/1078 2025-05-26 15:07:58 +08:00
yosixiaohu
83f603238a 修复开始时间和结束时间写反问题 2025-05-22 13:50:06 +08:00
lin
0329c8f5d1 Merge remote-tracking branch 'origin/master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	数据库/2.7.3/初始化-mysql-2.7.3.sql
#	数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
2025-03-18 15:30:35 +08:00
lin
676e2d7ea9 message消息适配新的回调模式 2025-02-18 17:04:13 +08:00
648540858
62ae1ee978 调整录像下载 2024-05-31 22:54:08 +08:00
648540858
37b79633f0 Merge branch 'refs/heads/master' into 1078 2024-05-28 18:40:44 +08:00
648540858
c6e3df685a 1078-上报驾驶员身份信息请求+驾驶员身份信息采集上报 2024-05-08 22:51:29 +08:00
648540858
186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +08:00
648540858
2112fffc26 1078-查询区域或线路数据应答... 2024-05-06 18:00:26 +08:00
648540858
984d8743be 1078-优化录像回放开始和停止 2024-04-06 00:42:54 +08:00
648540858
26bbeac6c7 1078-添加录像回放开始和停止 2024-04-06 00:06:40 +08:00
leesam
00bb8d914a [bugfix]修复云端录像查询时间转换错误的问题 2024-03-15 09:42:25 +08:00
648540858
debfac58b0 时间解析兼容iso861带毫秒 2024-03-14 16:22:24 +08:00
wendy512
268869c6a1 bugfix:修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00,兼容多种不同日期格式 2024-02-29 21:10:56 +08:00
648540858
ad36354ef4 优化国标录像服务端,使用zlm新接口实现功能 2023-12-05 11:29:05 +08:00
648540858
16c056e338 优化云端录像转化 2023-10-23 17:59:27 +08:00
648540858
e4d37864d1 开始重构云端录像继续 2023-10-13 15:26:51 +08:00
648540858
91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858
988dc36fa5 重构点播,回放,下载时ssrc不一致以及TCP主动播放的逻辑 2023-08-04 15:47:56 +08:00
648540858
59d8f2f915 支持录像回放使用固定流地址以及自动点播录像回放 2023-07-25 11:14:43 +08:00
648540858
5a152791c0 添加获取截图接口 2023-05-29 23:28:06 +08:00
648540858
3b1516afe5 优化录像配置。不再使用zlm默认的http服务器 2023-03-25 18:40:29 +08:00
648540858
9f680a2e9e 修复bug以及日志按照,错误/sip/数据库 分割 2022-08-26 18:03:09 +08:00
648540858
19a52a20f3 固定时区为Asia/Shanghai 2022-06-03 18:52:40 +08:00
648540858
2a5404c68f 兼容海康信令问题 #493 2022-05-26 13:45:57 +08:00
648540858
dc6769664e 兼容不规范的时间格式iso8601格式;升级fastjson版本 2022-05-26 12:10:46 +08:00
648540858
4d3f0a8d79 优化海康国标录像播放的控制 2022-05-13 15:41:50 +08:00
648540858
1757203202 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
648540858
f6893cf95b 优化设备在线状态 2022-05-11 18:37:24 +08:00