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() .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 messageWarns = messageWarnService.queryList(query); - + if (!messageWarns.isEmpty()) { List 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 ponds = pondMapper.selectList( new LambdaQueryWrapper() .eq(Pond::getUserId, rootUserId) - .orderByDesc(Pond::getCreateTime) + .orderByAsc(Pond::getCreateTime) ); List listData = new ArrayList<>(); @@ -946,7 +946,7 @@ public class PondController extends BaseController { new LambdaQueryWrapper() .eq(Pond::getUserId, rootUserId) .select(Pond::getId, Pond::getPondName) - .orderByDesc(Pond::getCreateTime) + .orderByAsc(Pond::getCreateTime) ); // 转换为VO列表