修改合并

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleWarningMsgMapper.java

@@ -11,6 +11,8 @@ public interface VehicleWarningMsgMapper extends Mapper<VehicleWarningMsg> {
 
     public List<VehicleWarningMsg> getByPage(QueryVehicleWarningMsgVo queryVehicleWarningMsgVo);
 
+    public List<VehicleWarningMsg> getByPages(QueryVehicleWarningMsgVo queryVehicleWarningMsgVo);
+
     public List<VehicleWarningMsg> getMsgByVehicle(String vehicleId);
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleActiveController.java

 package com.xxfc.platform.vehicle.rest;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.xxfc.platform.vehicle.biz.VehicleActiveService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
@@ -37,6 +38,25 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+    /**
+     * 发车
+     *
+     * @return
+     */
+    @PostMapping("small/departure")
+    @IgnoreUserToken
+    public RestResponse departureBySmall(@RequestBody VehicleDepartureVo departureVo) {
+
+        if (departureVo == null || departureVo.getVehicleId() == null
+                || departureVo.getMileage() == null || departureVo.getDepartureBranchCompanyId() == null
+                || departureVo.getExpectArrivalBranchCompanyId() == null) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleActiveService.departure(departureVo);
+        return RestResponse.suc();
+    }
+
     /**
      * 还车
      *

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -116,6 +116,28 @@ public class VehicleController extends BaseController<VehicleBiz> {
         }
     }
 
+//    @RequestMapping(value = "/small/page", method = RequestMethod.GET)
+//    @IgnoreUserToken
+//    public RestResponse<PageDataVO<QueryVehicleVo>> getByPageBySmall(@RequestParam String vehiclePageQueryVoJson,@RequestParam Integer uid) throws Exception {
+//        VehiclePageQueryVo vehiclePageQueryVo = null;
+//        try {
+//            vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
+//            UserDTO userDTO = userFeign.userinfoByUid(uid).getData();
+//            if (userDTO != null) {
+//                if (userDTO.getDataAll() == 2) {
+//                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+//                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
+//                }
+//            }
+//
+//            return RestResponse.data(baseBiz.getByPage(vehiclePageQueryVo));
+//        } catch (JSONException ex) {
+//            return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
+//        } catch (CustomIllegalParamException ex) {
+//            return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
+//        }
+//    }
+
     @RequestMapping(value = "/upload/drivingLicense", method = RequestMethod.POST)
     public RestResponse uploadDrivingLicense(@RequestParam("file") MultipartFile file)
             throws Exception {