From 8cb37d0e8a9bca9e8af1251d713722ed2227d1aa Mon Sep 17 00:00:00 2001 From: chenxiky <2868613334@qq.com> Date: Sat, 26 Jul 2025 15:53:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8C=89=E7=85=A7ID=E9=99=8D=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E8=A1=A5=E5=85=85=E5=88=86=E9=A1=B5=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft/modules/order/biz/OrderBiz.java | 21 ++++++++++++++++--- .../order/controller/OrderMainController.java | 10 ++++----- .../service/impl/OrderMainServiceImpl.java | 1 + .../mapper/order/OrderMainMapper.xml | 1 + 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java index 1f37c2a..8de2515 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java @@ -35,6 +35,8 @@ import com.aircraft.modules.system.service.IAttachmentMaterialService; import com.aircraft.utils.RedisUtils; import com.aircraft.utils.SecurityUtils; import com.aircraft.utils.enums.UserTypeEnum; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -83,7 +85,7 @@ public class OrderBiz { @Resource private AircraftDeviceService aircraftDeviceService; - public List queryAll(OrderMainPageQueryDTO pageQueryDTO) { + public IPage queryAll(OrderMainPageQueryDTO pageQueryDTO, Page page) { // 根据不同的客户端获取数据 UserTypeEnum currentUserType = SecurityUtils.getCurrentUserType(); @@ -106,7 +108,7 @@ public class OrderBiz { break; } if (CollectionUtil.isEmpty(orderMainList)) { - return new ArrayList<>(); + return new Page<>(); } // 查询发起人信息 @@ -143,7 +145,20 @@ public class OrderBiz { pageQueryVO.setCustomerPhone(orderMain.getPhone()); orderMainPageList.add(pageQueryVO); } - return orderMainPageList; + // 内存分页 + Page pageResult = new Page<>(page.getCurrent(), page.getSize()); + pageResult.setTotal(orderMainPageList.size()); + // 计算分页起始和结束位置 + long start = (page.getCurrent() - 1) * page.getSize(); + long end = Math.min(start + page.getSize(), orderMainPageList.size()); + // 如果起始位置超出了数据总量，则返回空列表 + if (start >= orderMainPageList.size()) { + pageResult.setRecords(new ArrayList<>()); + } else { + // 截取当前页数据 + pageResult.setRecords(orderMainPageList.subList((int) start, (int) end)); + } + return pageResult; } /** diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java index 36afcd2..edd73bb 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java @@ -8,8 +8,8 @@ import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO; import com.aircraft.modules.order.domain.dto.UpdateOrderDTO; import com.aircraft.modules.order.domain.vo.OrderAllDetailVO; import com.aircraft.modules.order.domain.vo.OrderMainPageQueryVO; -import com.aircraft.utils.PageResult; -import com.aircraft.utils.PageUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -19,7 +19,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; /** *

@@ -39,9 +38,8 @@ public class OrderMainController { @ApiOperation("查询订单列表-多端查询") @GetMapping("/allOrder") - public ResponseEntity> queryOrderList(OrderMainPageQueryDTO pageQueryDTO) { - List orderList = orderBiz.queryAll(pageQueryDTO); - return new ResponseEntity<>(PageUtil.toPage(orderList),HttpStatus.OK); + public ResponseEntity>queryOrderList(OrderMainPageQueryDTO pageQueryDTO, Page page) { + return new ResponseEntity<>(orderBiz.queryAll(pageQueryDTO, page), HttpStatus.OK); } @ApiOperation("新增订单") diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java index 54959d8..6309c54 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java @@ -42,6 +42,7 @@ public class OrderMainServiceImpl extends ServiceImpl and attraction_id = #{attractionId} + order by id desc