From 40a95c70e8011df2e1554037412921e9a2247360 Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Thu, 10 Apr 2025 14:11:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20postgres=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=B9=B1=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java index 06a534821..ffb8e683b 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java @@ -381,7 +381,7 @@ public interface DeviceMapper { " OR device_id LIKE concat('%',#{query},'%') escape '/' " + " OR ip LIKE concat('%',#{query},'%') escape '/')" + " " + - " order by create_time desc "+ + " order by create_time desc, device_id " + " ") List getDeviceList(@Param("dataType") Integer dataType, @Param("query") String query, @Param("status") Boolean status); From 63100f3b90dade64d6cc18760aaa82c11c010a4e Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Thu, 10 Apr 2025 14:12:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20postgres=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=E9=80=9A?= =?UTF-8?q?=E9=81=93=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B9=B1=E5=BA=8F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java index eece8399e..9578682be 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java @@ -101,6 +101,7 @@ public class DeviceChannelProvider { } sqlBuild.append(" )"); } + sqlBuild.append("ORDER BY device_id"); return sqlBuild.toString(); } From a5c455ca1007079d91be55304d976955d1304c2f Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Fri, 11 Apr 2025 14:37:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20postgres=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC=20sql=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql index 762a9ccf4..3423d0a49 100644 --- a/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql +++ b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql @@ -159,11 +159,12 @@ create table IF NOT EXISTS wvp_device_channel gps_speed double precision, gps_altitude double precision, gps_direction double precision, - index (data_type), - index (data_device_id), constraint uk_wvp_unique_channel unique (gb_device_id) ); +CREATE INDEX idx_data_type ON wvp_device_channel (data_type); +CREATE INDEX idx_data_device_id ON wvp_device_channel (data_device_id); + drop table IF EXISTS wvp_media_server; create table IF NOT EXISTS wvp_media_server ( From 2c494bcc7dacd59c96aeb56b1a58e555d571f1d6 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Mon, 14 Apr 2025 11:22:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=A4=B1=E8=B4=A5=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StreamPushServiceImpl.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java index 7f772e309..4c8b8552b 100755 --- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java @@ -124,25 +124,21 @@ public class StreamPushServiceImpl implements IStreamPushService { public void onApplicationEvent(MediaDepartureEvent event) { // 兼容流注销时类型从redis记录获取 - MediaInfo mediaInfo = redisCatchStorage.getStreamInfo( - event.getApp(), event.getStream(), event.getMediaServer().getId()); + MediaInfo mediaInfo = redisCatchStorage.getPushListItem(event.getApp(), event.getStream()); + if (mediaInfo != null) { + log.info("[推流信息] 查询到redis存在推流缓存， 开始清理，{}/{}", event.getApp(), event.getStream()); String type = OriginType.values()[mediaInfo.getOriginType()].getType(); - redisCatchStorage.removeStream(event.getMediaServer().getId(), type, event.getApp(), event.getStream()); - if ("PUSH".equalsIgnoreCase(type)) { - // 冗余数据，自己系统中自用 - redisCatchStorage.removePushListItem(event.getApp(), event.getStream(), event.getMediaServer().getId()); - } - if (type != null) { - // 发送流变化redis消息 - JSONObject jsonObject = new JSONObject(); - jsonObject.put("serverId", userSetting.getServerId()); - jsonObject.put("app", event.getApp()); - jsonObject.put("stream", event.getStream()); - jsonObject.put("register", false); - jsonObject.put("mediaServerId", event.getMediaServer().getId()); - redisCatchStorage.sendStreamChangeMsg(type, jsonObject); - } + // 冗余数据，自己系统中自用 + redisCatchStorage.removePushListItem(event.getApp(), event.getStream(), event.getMediaServer().getId()); + // 发送流变化redis消息 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("serverId", userSetting.getServerId()); + jsonObject.put("app", event.getApp()); + jsonObject.put("stream", event.getStream()); + jsonObject.put("register", false); + jsonObject.put("mediaServerId", event.getMediaServer().getId()); + redisCatchStorage.sendStreamChangeMsg(type, jsonObject); } StreamPush streamPush = getPush(event.getApp(), event.getStream()); if (streamPush == null) { From c3b66fc475e72b5e4128ae35c118d337651ee863 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Mon, 14 Apr 2025 11:30:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=88=E5=B9=B6PR=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 数据库/2.7.3/更新-postgresql-kingbase-2.7.1升级到2.7.3.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/数据库/2.7.3/更新-postgresql-kingbase-2.7.1升级到2.7.3.sql b/数据库/2.7.3/更新-postgresql-kingbase-2.7.1升级到2.7.3.sql index e7ca6887f..289990058 100644 --- a/数据库/2.7.3/更新-postgresql-kingbase-2.7.1升级到2.7.3.sql +++ b/数据库/2.7.3/更新-postgresql-kingbase-2.7.1升级到2.7.3.sql @@ -137,11 +137,12 @@ create table IF NOT EXISTS wvp_device_channel gps_speed double precision, gps_altitude double precision, gps_direction double precision, - index (data_type), - index (data_device_id), constraint uk_wvp_unique_channel unique (gb_device_id) ); +create index if not exists data_type on wvp_device_channel (data_type); +create index if not exists data_device_id on wvp_device_channel (data_device_id); + create table IF NOT EXISTS wvp_device_mobile_position ( id serial primary key,