From 60c5e0381918f1d471ba6e4bfde0c30d73209998 Mon Sep 17 00:00:00 2001
From: tangwenkang <2720983602@qq.com>
Date: Wed, 29 Nov 2023 20:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vehicle-history-server/pom.xml                             | 6 ++++++
 .../vehicle/history/server/controller/CarController.java   | 6 ++++--
 .../dragon/vehicle/history/server/service/CarService.java  | 3 ++-
 .../history/server/service/impl/CarServiceImpl.java        | 7 ++++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/vehicle-history-server/pom.xml b/vehicle-history-server/pom.xml
index bdf4f6a..8d289ef 100644
--- a/vehicle-history-server/pom.xml
+++ b/vehicle-history-server/pom.xml
@@ -77,6 +77,12 @@
             <artifactId>dragon-common-log</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dragon</groupId>
+            <artifactId>dragon-common-core</artifactId>
+            <version>3.6.4</version>
+        </dependency>
+
         <!-- Dragon Common Swagger -->
         <dependency>
             <groupId>com.dragon</groupId>
diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java
index b2a6473..d3ee823 100644
--- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java
+++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/controller/CarController.java
@@ -1,6 +1,7 @@
 package com.dragon.vehicle.history.server.controller;
 
 import com.dragon.common.core.domain.Result;
+import com.dragon.common.core.domain.PageResult;
 import com.dragon.vehicle.history.common.domain.Car;
 import com.dragon.vehicle.history.common.domain.CarType;
 import com.dragon.vehicle.history.common.domain.Fence;
@@ -29,8 +30,9 @@ public class    CarController {
      * @return
      */
     @PostMapping("/listCar")
-    public Result<List<ResCar>> listCar(@RequestBody ReqCar reqCar){
-        return carService.listCar(reqCar);
+    public Result<PageResult<ResCar>> listCar(@RequestBody ReqCar reqCar){
+        Result<PageResult<ResCar>> result = carService.listCar(reqCar);
+        return result;
     }
 
     /**
diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java
index 7be4ac0..395528d 100644
--- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java
+++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/CarService.java
@@ -1,6 +1,7 @@
 package com.dragon.vehicle.history.server.service;
 
 
+import com.dragon.common.core.domain.PageResult;
 import com.dragon.common.core.domain.Result;
 import com.dragon.vehicle.history.common.domain.Car;
 import com.dragon.vehicle.history.common.domain.CarType;
@@ -21,7 +22,7 @@ public interface CarService {
      * @param reqCar 分页参数
      * @return
      */
-    Result<List<ResCar>> listCar(ReqCar reqCar);
+    Result<PageResult<ResCar>> listCar(ReqCar reqCar);
 
     /**
      * 查询车辆类型列表
diff --git a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java
index 57a6066..fb5c97e 100644
--- a/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java
+++ b/vehicle-history-server/src/main/java/com/dragon/vehicle/history/server/service/impl/CarServiceImpl.java
@@ -2,6 +2,7 @@ package com.dragon.vehicle.history.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dragon.common.core.domain.PageResult;
 import com.dragon.common.core.domain.Result;
 import com.dragon.vehicle.history.common.domain.Car;
 import com.dragon.vehicle.history.common.domain.CarType;
@@ -40,7 +41,7 @@ public class CarServiceImpl implements CarService {
      * @return
      */
     @Override
-    public Result<List<ResCar>> listCar(ReqCar reqCar) {
+    public Result<PageResult<ResCar>> listCar(ReqCar reqCar) {
         Page<ResCar> resCarPage = new Page<>(reqCar.getPageNum(), reqCar.getPageSize());
         List<ResCar> resCars = carMapper.selectJoinPage(resCarPage, ResCar.class, new MPJLambdaWrapper<Car>()
                 .selectAll(Car.class)
@@ -55,8 +56,8 @@ public class CarServiceImpl implements CarService {
                 .eq(reqCar.getCarTypeId() != null, CarType::getCarTypeId, reqCar.getCarTypeId())
                 .like(reqCar.getFenceName() != null, Fence::getFenceName, reqCar.getFenceName())
         ).getRecords();
-
-        return Result.success(resCars,"查询成功！");
+        int size = resCars.size();
+        return PageResult.toResult(size,resCars);
     }
 
     /**