From 6ad6dd9fb55513980e670d601f20d696c4235895 Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Wed, 28 Oct 2026 14:37:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B1=87=E8=81=9Aagg=5Fstation?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Eorder=5Fnum=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/inspect/agg/entity/AggStation.java   | 2 ++
 .../src/main/resources/mapper/AggStationMapper.xml         | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/inspect-main/inspect-main-agg/src/main/java/com/inspect/agg/entity/AggStation.java b/inspect-main/inspect-main-agg/src/main/java/com/inspect/agg/entity/AggStation.java
index 5b292ee..b293c39 100644
--- a/inspect-main/inspect-main-agg/src/main/java/com/inspect/agg/entity/AggStation.java
+++ b/inspect-main/inspect-main-agg/src/main/java/com/inspect/agg/entity/AggStation.java
@@ -28,4 +28,6 @@ public class AggStation {
     private String password;
     /** 1启用 0停用 */
     private String enabled;
+    /** 汇聚自定义显示顺序（数据库手工维护） */
+    private Integer orderNum;
 }
\ No newline at end of file
diff --git a/inspect-main/inspect-main-agg/src/main/resources/mapper/AggStationMapper.xml b/inspect-main/inspect-main-agg/src/main/resources/mapper/AggStationMapper.xml
index ff1c60f..0b2d9eb 100644
--- a/inspect-main/inspect-main-agg/src/main/resources/mapper/AggStationMapper.xml
+++ b/inspect-main/inspect-main-agg/src/main/resources/mapper/AggStationMapper.xml
@@ -10,15 +10,16 @@
         <result column="username" property="username"/>
         <result column="password" property="password"/>
         <result column="enabled" property="enabled"/>
+        <result column="order_num" property="orderNum"/>
     </resultMap>
 
 
     <select id="selectEnabled" resultMap="BaseResultMap">
-        SELECT * FROM agg_station WHERE enabled = 1 ORDER BY id
+        SELECT * FROM agg_station WHERE enabled = 1 ORDER BY order_num, id
     </select>
 
     <select id="selectAllOrdered" resultMap="BaseResultMap">
-        SELECT * FROM agg_station ORDER BY id
+        SELECT * FROM agg_station ORDER BY order_num, id
     </select>
     <select id="selectByCode" resultMap="BaseResultMap">
         SELECT * FROM agg_station WHERE station_code = #{stationCode} LIMIT 1
@@ -29,6 +30,6 @@
         <where>
             <if test="enabled != null">enabled = #{enabled}</if>
         </where>
-        ORDER BY id
+        ORDER BY order_num, id
     </select>
 </mapper>
\ No newline at end of file