From 40a95c70e8011df2e1554037412921e9a2247360 Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Thu, 10 Apr 2025 14:11:04 +0800 Subject: [PATCH 1/2] =?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/2] =?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(); }