用户扫码记录

ebike-feign/src/main/java/com/ebike/feign/clients/OrdersFeignClient.java

@@ -3,6 +3,7 @@ package com.ebike.feign.clients;
 import com.cdzy.common.model.EbikeUserFaultreportDto;
 import com.cdzy.common.model.EbikeUserFaultreportQueryDto;
 import com.cdzy.common.model.JsonResult;
+import com.cdzy.common.model.PageParam;
 import com.ebike.feign.component.FeignTokenInterceptor;
 import com.ebike.feign.config.ExampleFeignConfiguration;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
@@ -96,6 +97,6 @@ public interface OrdersFeignClient {
      * @return @ {@code 200} 成功，{@code 500} 失败
      */
     @GetMapping("userOrders/getRideRecord")
-    JsonResult<List<FeignRideRecord>> getRideRecord(@RequestParam("bikeId")String bikeId);
+    JsonResult<List<FeignRideRecord>> getRideRecord(@RequestParam("bikeId")String bikeId,@RequestParam("pageParam") PageParam pageParam);
 
 }

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java

@@ -3,6 +3,7 @@ package com.cdzy.ebikemaintenance.controller;
 import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.model.EcuSnDto;
 import com.cdzy.common.model.JsonResult;
+import com.cdzy.common.model.PageParam;
 import com.cdzy.common.model.ResGPSDto;
 import com.cdzy.common.utils.ConvertUtil;
 import com.cdzy.ebikemaintenance.model.dto.request.*;
@@ -935,14 +936,14 @@ public class EbikeBikeInfoController {
 
 
     /**
-     * 根据车辆id将车辆设置为待使用状态
+     * 车辆扫码记录
      *
      * @param bikeId 车辆id
      * @return 结果
      */
     @GetMapping("getRideRecord")
-    JsonResult<?> getRideRecord(@RequestParam("bikeId") String bikeId) {
+    JsonResult<?> getRideRecord(@RequestParam("bikeId") String bikeId, PageParam pageParam) {
-        JsonResult<List<FeignRideRecord>> rideRecord = ordersFeignClient.getRideRecord(bikeId);
+        JsonResult<List<FeignRideRecord>> rideRecord = ordersFeignClient.getRideRecord(bikeId,pageParam);
         return JsonResult.success(rideRecord.getData());
     }
 }

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/PageParamDto.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class PageParam {
+public class PageParamDto {
     /**
      * 当前页码
      */

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderListDto.java

@@ -28,5 +28,5 @@ public class ReqWorkOrderListDto {
     /**
      * 分页参数
      */
-    private PageParam pageParam;
+    private PageParamDto pageParam;
 }

ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java

@@ -29,7 +29,6 @@ import com.ebike.feign.model.rsp.StaffFeign;
 import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryColumn;
-import com.mybatisflex.core.query.QueryMethods;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
@@ -1458,7 +1457,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             // 获取当前用户ID
             String userId = staffFeign.getStaffId().toString();
             // 获取分页参数
-            com.cdzy.ebikemaintenance.model.dto.request.PageParam pageParam = param.getPageParam();
+            PageParamDto pageParam = param.getPageParam();
             int pageNum = pageParam.getPageNum();
             int pageSize = pageParam.getPageSize();
             String orderType = param.getOrderType();

ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java

@@ -302,8 +302,8 @@ public class EbikeUserOrdersController {
      * @return 结果
      */
     @GetMapping("getRideRecord")
-    public JsonResult<?> getRideRecord(@RequestParam("bikeId") String bikeId) {
+    public JsonResult<?> getRideRecord(@RequestParam("bikeId") String bikeId,PageParam pageParam) {
-        List<FeignRideRecord> record = userOrdersService.getRideRecord(bikeId);
+        Page<FeignRideRecord> record = userOrdersService.getRideRecord(bikeId,pageParam);
         return JsonResult.success(record);
     }
 }

ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java

@@ -1,6 +1,7 @@
 package com.cdzy.orders.service;
 
 import com.cdzy.common.model.JsonResult;
+import com.cdzy.common.model.PageParam;
 import com.cdzy.orders.model.dto.req.ReqBikeDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
@@ -11,6 +12,7 @@ import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList;
 import com.cdzy.orders.model.entity.EbikeUserOrders;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.ebike.feign.model.rsp.FeignRideRecord;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
 import java.math.BigDecimal;
@@ -151,5 +153,5 @@ public interface UserOrdersService extends IService<EbikeUserOrders> {
      * @param bikeId 车辆id
      * @return 扫码记录
      */
-    List<FeignRideRecord> getRideRecord(String bikeId);
+    Page<FeignRideRecord> getRideRecord(String bikeId, PageParam pageParam);
 }

ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java

@@ -36,6 +36,7 @@ import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetWeekDto;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.ebike.feign.model.rsp.*;
 import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
@@ -751,7 +752,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
     }
 
     @Override
-    public List<FeignRideRecord> getRideRecord(String bikeId) {
+    public Page<FeignRideRecord> getRideRecord(String bikeId, com.cdzy.common.model.PageParam pageParam) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(
                         EBIKE_USER_ORDERS.START_TIME.as(FeignRideRecord::getRideTime),
@@ -763,8 +764,8 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
                 .where(EBIKE_USER_ORDERS.BIKE_ID.eq(bikeId))
                 .leftJoin(EBIKE_USER).on(EBIKE_USER.USER_ID.eq(EBIKE_USER_ORDERS.USER_ID))
                 .leftJoin(EBIKE_USER_REALINFO).on(EBIKE_USER_REALINFO.USER_ID.eq(EBIKE_USER_ORDERS.USER_ID));
-        List<FeignRideRecord> records = userOrdersMapper.selectListByQueryAs(queryWrapper, FeignRideRecord.class);
+        Page<FeignRideRecord> records = userOrdersMapper.paginateAs(pageParam.getPage(),queryWrapper, FeignRideRecord.class);
-       for (FeignRideRecord record : records) {
+       for (FeignRideRecord record : records.getRecords()) {
            try {
                String realName = verifyUtil.decryptRealName(record.getUserName());
                record.setUserName(maskString(realName,'*'));