aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-23 05:37:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1815 from xiaoQQya/fix/pg

Browse Source 
fix: 修复使用 postgres 数据库时设备列表和通道列表可能乱序的问题
This commit is contained in:
648540858 2025-04-12 21:37:15 +08:00 committed by GitHub
commit 6ccccb1bbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
View File

@ -381,7 +381,7 @@ public interface DeviceMapper {
" OR device_id LIKE concat('%',#{query},'%') escape '/' " + " OR device_id LIKE concat('%',#{query},'%') escape '/' " +
" OR ip LIKE concat('%',#{query},'%') escape '/')" + " OR ip LIKE concat('%',#{query},'%') escape '/')" +
"</if> " + "</if> " +
" order by create_time desc "+ " order by create_time desc, device_id " +
" </script>") " </script>")
List<Device> getDeviceList(@Param("dataType") Integer dataType, @Param("query") String query, @Param("status") Boolean status); List<Device> getDeviceList(@Param("dataType") Integer dataType, @Param("query") String query, @Param("status") Boolean status);

1
src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/DeviceChannelProvider.java
View File

@ -101,6 +101,7 @@ public class DeviceChannelProvider {
} }
sqlBuild.append(" )"); sqlBuild.append(" )");
} }
sqlBuild.append("ORDER BY device_id");
return sqlBuild.toString(); return sqlBuild.toString();
} }