From 2aec012fc26e56841415c3ea8a90f56cc8487047 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sun, 5 Apr 2026 13:28:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A1=98=E5=8F=A3=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=88=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/intc/fishery/controller/PondController.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java
index 2b208d7..8fd9827 100644
--- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java
+++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java
@@ -217,7 +217,7 @@ public class PondController extends BaseController {
             new LambdaQueryWrapper<Device>()
                 .eq(Device::getPondId, pondId)
                 .orderByAsc(Device::getDeviceType)
-                .orderByDesc(Device::getCreateTime)
+                .orderByAsc(Device::getCreateTime)
         );
 
         // 3. 查询塘口下的所有开关（switch.pondId == pondId），包含开关未挂塘口的控制器也能被找到
@@ -601,12 +601,12 @@ public class PondController extends BaseController {
                     com.intc.fishery.domain.bo.MessageWarnBo query = new com.intc.fishery.domain.bo.MessageWarnBo();
                     query.setDeviceId(deviceId);
                     List<com.intc.fishery.domain.vo.MessageWarnVo> messageWarns = messageWarnService.queryList(query);
-                            
+
                     if (!messageWarns.isEmpty()) {
                         List<Long> messageWarnIds = messageWarns.stream()
                             .map(com.intc.fishery.domain.vo.MessageWarnVo::getId)
                             .collect(Collectors.toList());
-                                
+
                         // 删除告警消息
                         messageWarnService.deleteWithValidByIds(messageWarnIds, false);
                         log.info("清除设备 {} 的 {} 条告警消息", deviceId, messageWarnIds.size());
@@ -719,7 +719,7 @@ public class PondController extends BaseController {
         List<Pond> ponds = pondMapper.selectList(
             new LambdaQueryWrapper<Pond>()
                 .eq(Pond::getUserId, rootUserId)
-                .orderByDesc(Pond::getCreateTime)
+                .orderByAsc(Pond::getCreateTime)
         );
 
         List<PublicPondMode1Vo> listData = new ArrayList<>();
@@ -946,7 +946,7 @@ public class PondController extends BaseController {
             new LambdaQueryWrapper<Pond>()
                 .eq(Pond::getUserId, rootUserId)
                 .select(Pond::getId, Pond::getPondName)
-                .orderByDesc(Pond::getCreateTime)
+                .orderByAsc(Pond::getCreateTime)
         );
 
         // 转换为VO列表