车辆保养项目管理

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleUpkeepService.java

@@ -26,6 +26,11 @@ public class VehicleUpkeepService {
         return vehicleUpkeepItemMapper.selectAll();
     }
 
+    public PageInfo<VehicleUpkeepItem> pageItem(Integer page, Integer limit) {
+        PageHelper.startPage(page, limit);
+        return new PageInfo<>(vehicleUpkeepItemMapper.selectAll());
+    }
+
     public void addItem(String itemName) {
         VehicleUpkeepItem item = new VehicleUpkeepItem();
         item.setName(itemName);

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleActiveController.java

@@ -39,6 +39,11 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+    /**
+     * 还车
+     * @param arrivalVo
+     * @return
+     */
     @PostMapping("arrival")
     public RestResponse arrival(@RequestBody VehicleArrivalVo arrivalVo) {
         if (arrivalVo == null || arrivalVo.getVehicleId() == null
@@ -50,6 +55,11 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+    /**
+     * 保养
+     * @param vehicleUpkeepVo
+     * @return
+     */
     @PostMapping("upkeep")
     public RestResponse upkeep(@RequestBody VehicleUpkeepVo vehicleUpkeepVo) {
         if (vehicleUpkeepVo.getVehicleId() == null || vehicleUpkeepVo.getOperator() == null || vehicleUpkeepVo.getAmount() == null ||
@@ -65,6 +75,11 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+    /**
+     * 保养结束
+     * @param vehicleUpkeepEndVo
+     * @return
+     */
     @PostMapping("upkeepEnd")
     public RestResponse upkeepEnd(@RequestBody VehicleUpkeepEndVo vehicleUpkeepEndVo) {
         if (vehicleUpkeepEndVo.getVehicleId() == null) {
@@ -75,4 +90,20 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+    /**
+     * 维修
+     * @return
+     */
+    public RestResponse fix() {
+        return RestResponse.suc();
+    }
+
+    /**
+     * 维修结束
+     * @return
+     */
+    public RestResponse fixEnd() {
+        return RestResponse.suc();
+    }
+
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleUpkeepController.java

@@ -20,13 +20,22 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.getAllItem());
     }
 
+    @GetMapping("item/page")
+    public RestResponse pageItem(Integer page, Integer limit) {
+        if (page == null || limit == null) {
+            page = 1;
+            limit = 10;
+        }
+        return RestResponse.suc(vehicleUpkeepService.pageItem(page, limit));
+    }
+
     @PostMapping("item")
-    public RestResponse addItem(String itemName) {
-        if (itemName == null || itemName.trim().equals("")) {
+    public RestResponse addItem(String name) {
+        if (name == null || name.trim().equals("")) {
             return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
                     ResCode.INVALID_REST_REQ_PARAM.getDesc());
         }
-        vehicleUpkeepService.addItem(itemName);
+        vehicleUpkeepService.addItem(name);
         return RestResponse.suc();
     }