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 @@ dragon-common-log + + com.dragon + dragon-common-core + 3.6.4 + + com.dragon 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> listCar(@RequestBody ReqCar reqCar){ - return carService.listCar(reqCar); + public Result> listCar(@RequestBody ReqCar reqCar){ + Result> 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> listCar(ReqCar reqCar); + Result> 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> listCar(ReqCar reqCar) { + public Result> listCar(ReqCar reqCar) { Page resCarPage = new Page<>(reqCar.getPageNum(), reqCar.getPageSize()); List resCars = carMapper.selectJoinPage(resCarPage, ResCar.class, new MPJLambdaWrapper() .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); } /**