车辆出车相关修改

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

@@ -121,6 +121,7 @@ public class VehicleActiveService {
         departureLog.setMileageEnd(arrivalVo.getMileage());
         departureLog.setRecycleMan(arrivalVo.getRecycleMan());
         departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());
+        departureLog.setArrivalBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
         departureLog.setUpdateTime(new Date());
         departureLog.setArrivalTime(new Date());
         departureLog.setState(VehicleDepartureState.END.getCode());

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

@@ -2,8 +2,14 @@ package com.xinxincaravan.caravan.vehicle.biz;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
+import com.xinxincaravan.caravan.vehicle.entity.Vehicle;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleDepartureLog;
 import com.xinxincaravan.caravan.vehicle.mapper.VehicleDepartureLogMapper;
+import com.xinxincaravan.caravan.vehicle.mapper.VehicleMapper;
 import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureStatisticDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,6 +19,9 @@ public class VehicleDepartureService {
     @Autowired
     VehicleDepartureLogMapper vehicleDepartureLogMapper;
 
+    @Autowired
+    VehicleMapper vehicleMapper;
+
     public PageInfo<VehicleDepartureLogVo> page(String numberPlate, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
         return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate));
@@ -22,4 +31,23 @@ public class VehicleDepartureService {
         PageHelper.startPage(page, limit);
         return new PageInfo<>(vehicleDepartureLogMapper.selectByVehicleId(vehicleId));
     }
+
+    public VehicleDepartureStatisticDataVo statistic(String numberPlate) {
+        Vehicle vehicle = vehicleMapper.selectByNumberPlate(numberPlate);
+        if (vehicle == null) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
+        }
+
+        VehicleDepartureStatisticDataVo statisticData = new VehicleDepartureStatisticDataVo();
+        // 出行次数
+        VehicleDepartureLog departureLog = new VehicleDepartureLog();
+        departureLog.setVehicleId(vehicle.getId());
+        statisticData.setDepartureCount(vehicleDepartureLogMapper.selectCount(departureLog));
+        // 出行天数
+        statisticData.setDepartureDay(vehicleDepartureLogMapper.selectDayByVehicleId(vehicle.getId()));
+        // 出行公里数
+        statisticData.setDepartureMileage(vehicleDepartureLogMapper.selectMileageByVehicleId(vehicle.getId()));
+        return statisticData;
+    }
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/entity/VehicleDepartureLog.java

@@ -65,7 +65,18 @@ public class VehicleDepartureLog {
      * 出车结束的公里数
      */
     Integer mileageEnd;
-
+    /**
+     * 出车分公司
+     */
+    Integer departureBranchCompanyId;
+    /**
+     * 预计还车分公司
+     */
+    Integer expectArrivalBranchCompanyId;
+    /**
+     * 还车分公司
+     */
+    Integer arrivalBranchCompanyId;
     Date createTime;
     Date updateTime;
 

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -14,4 +14,8 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
 
     List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
+
+    Integer selectMileageByVehicleId(String vehicleId);
+
+    Integer selectDayByVehicleId(String vehicleId);
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleMapper.java

@@ -24,4 +24,6 @@ public interface VehicleMapper extends Mapper<Vehicle> {
 
     int updateStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
                                   @Param("lastStatus") Integer lastStatus);
+
+    Vehicle selectByNumberPlate(String numberPlate);
 }
\ No newline at end of file

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

@@ -3,10 +3,7 @@ package com.xinxincaravan.caravan.vehicle.rest;
 import com.xinxincaravan.caravan.vehicle.biz.VehicleActiveService;
 import com.xinxincaravan.caravan.vehicle.common.RestResponse;
 import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
-import com.xinxincaravan.caravan.vehicle.vo.VehicleArrivalVo;
-import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureVo;
-import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepEndVo;
-import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepVo;
+import com.xinxincaravan.caravan.vehicle.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,7 +28,8 @@ public class VehicleActiveController {
     @PostMapping("departure")
     public RestResponse departure(@RequestBody VehicleDepartureVo departureVo) {
         if (departureVo == null || departureVo.getVehicleId() == null
-                || departureVo.getMileage() == 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());
         }
@@ -41,6 +39,7 @@ public class VehicleActiveController {
 
     /**
      * 还车
+     *
      * @param arrivalVo
      * @return
      */
@@ -57,6 +56,7 @@ public class VehicleActiveController {
 
     /**
      * 保养
+     *
      * @param vehicleUpkeepVo
      * @return
      */
@@ -77,6 +77,7 @@ public class VehicleActiveController {
 
     /**
      * 保养结束
+     *
      * @param vehicleUpkeepEndVo
      * @return
      */
@@ -92,17 +93,20 @@ public class VehicleActiveController {
 
     /**
      * 维修
+     *
      * @return
      */
-    public RestResponse fix() {
+    public RestResponse repair(@RequestBody VehicleRepairVo vehicleRepairVo) {
+
         return RestResponse.suc();
     }
 
     /**
      * 维修结束
+     *
      * @return
      */
-    public RestResponse fixEnd() {
+    public RestResponse repairEnd() {
         return RestResponse.suc();
     }
 

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

@@ -39,5 +39,14 @@ public class VehicleDepartureController {
         return RestResponse.suc(vehicleDepartureService.findByVehicle(vehicleId, page, limit));
     }
 
+    @GetMapping("statistic")
+    public RestResponse statistic(String numberPlate) {
+        if (numberPlate == null) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        return RestResponse.suc(vehicleDepartureService.statistic(numberPlate));
+    }
+
 
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleArrivalVo.java

@@ -22,5 +22,9 @@ public class VehicleArrivalVo {
      * 公里数
      */
     Integer mileage;
+    /**
+     * 还车分公司id
+     */
+    Integer arrivalBranchCompanyId;
 
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleDepartureStatisticDataVo.java

+package com.xinxincaravan.caravan.vehicle.vo;
+
+import lombok.Data;
+
+/**
+ * 车辆出车统计数据
+ */
+@Data
+public class VehicleDepartureStatisticDataVo {
+    /**
+     * 出车次数
+     */
+    Integer departureCount;
+    /**
+     * 出车天数
+     */
+    Integer departureDay;
+    /**
+     * 出车公里数
+     */
+    Integer departureMileage;
+}

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleDepartureVo.java

@@ -12,6 +12,10 @@ public class VehicleDepartureVo {
      * 车辆ID
      */
     String vehicleId;
+    /**
+     * 出车分公司id
+     */
+    Integer departureBranchCompanyId;
     /**
      * 用途
      */
@@ -36,5 +40,9 @@ public class VehicleDepartureVo {
      * 公里数
      */
     Integer mileage;
+    /**
+     * 预计还车分公司id
+     */
+    Integer expectArrivalBranchCompanyId;
 
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleRepairVo.java

+package com.xinxincaravan.caravan.vehicle.vo;
+
+import lombok.Data;
+
+/**
+ * 车辆维修
+ */
+@Data
+public class VehicleRepairVo {
+
+    Integer branchCompanyId;
+    String branchCompanyName;
+    String operator;
+    String repairContent;
+
+}

vehicle/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -21,11 +21,21 @@
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
         <trim prefix="where">
-            <if test="numberPlate != null">
+            <if test="numberPlate != null and numberPlate != ''">
                 vehicle.number_plate = #{numberPlate}
             </if>
         </trim>
         order by create_time desc
     </select>
+    <select id="selectMileageByVehicleId" resultType="int">
+        select sum(mileage_end - mileage_start)
+        from vehicle_departure_log
+        where vehicle_id = #{vehicleId};
+    </select>
+    <select id="selectDayByVehicleId" resultType="int">
+        select sum(to_days(arrival_time) - to_days(departure_time))
+        from vehicle_departure_log
+        where vehicle_id = #{vehicleId};
+    </select>
 
 </mapper>
\ No newline at end of file

vehicle/src/main/resources/mapper/VehicleMapper.xml

@@ -111,6 +111,10 @@
             `code` = #{code}
         for update
     </select>
+    <select id="selectByNumberPlate" resultType="com.xinxincaravan.caravan.vehicle.entity.Vehicle">
+        select * from vehicle
+        where number_plate = #{numberPlate}
+    </select>
 
     <update id="updateStatusByIdAndStatus">
         update vehicle