修改预警

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

@@ -13,6 +13,7 @@ import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepEndVo;
 import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -38,6 +39,8 @@ public class VehicleActiveService {
 
     @Autowired
     VehicleUpkeepItemMapper vehicleUpkeepItemMapper;
+    @Value("${vehicle.mileage}")
+    private Integer Mileage;
 
     /**
      * 出车
@@ -183,9 +186,9 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getCode());
         }
-
-        int result = vehicleMapper.updateStatusByIdAndStatus(vehicleUpkeepVo.getVehicleId(), VehicleStatus.UPKEEP.getCode(),
-                VehicleStatus.NORMAL.getCode());
+        Integer lastMileage=vehicleUpkeepVo.getMileage();
+        int result = vehicleMapper.upMileageByIdAndStatus(vehicleUpkeepVo.getVehicleId(), VehicleStatus.UPKEEP.getCode(),
+                VehicleStatus.NORMAL.getCode(),lastMileage);
         if (result == 0) {
             // 车辆状态异常
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -236,8 +239,9 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getCode());
         }
-
-        int result = vehicleMapper.updateStatusByIdAndStatus(vehicleId, VehicleStatus.NORMAL.getCode(), VehicleStatus.UPKEEP.getCode());
+        Integer mileageLastUpdate=vehicle.getMileageLastUpdate()==null?0:vehicle.getMileageLastUpdate();
+        Integer maintenance_mileage=Mileage+mileageLastUpdate;
+        int result = vehicleMapper.updateMileageStatusByIdAndStatus(vehicleId, VehicleStatus.NORMAL.getCode(), VehicleStatus.UPKEEP.getCode(),maintenance_mileage);
         if (result == 0) {
             throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getCode());

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

@@ -74,6 +74,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
     @Value("${vehicle.baseUploadPath}")
     private String baseUploadPath ;
+    @Value("${vehicle.fristMileage}")
+    private Integer fristMileage ;
 
     /**
      * 每批次最大更、插入车辆最大条目数
@@ -185,6 +187,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
             vehicle.setId(UUID.randomUUID().toString());
             vehicle.setParkBranchCompanyId(vehicle.getSubordinateBranch());
+            vehicle.setMaintenanceMileage(fristMileage);
 //            检查车牌或者编码是否已存在，已存在则返回失败
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){

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

@@ -88,7 +88,7 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
      */
     public PageDataVo<VehicleWarningMsg> getByPage(QueryVehicleWarningMsgVo queryVehicleWarningMsgVo){
         PageHelper.startPage(queryVehicleWarningMsgVo.getPage(),queryVehicleWarningMsgVo.getLimit());
-        List<VehicleWarningMsg> vehicleWarningMsgs = mapper.getByPage(queryVehicleWarningMsgVo);
+        List<VehicleWarningMsg> vehicleWarningMsgs = mapper.getByPages(queryVehicleWarningMsgVo);
         PageInfo<VehicleWarningMsg> vehicleWarningMsgPageInfo = new PageInfo<>(vehicleWarningMsgs);
         return PageDataVo.pageInfo(vehicleWarningMsgPageInfo);
     }

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

@@ -27,4 +27,10 @@ public interface VehicleMapper extends Mapper<Vehicle> {
                                   @Param("lastStatus") Integer lastStatus);
 
     Vehicle selectByNumberPlate(String numberPlate);
+     //保养结束
+    int updateMileageStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
+                                  @Param("lastStatus") Integer lastStatus,@Param("mileage") Integer mileage);
+   //开始保养
+    int upMileageByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
+                                  @Param("lastStatus") Integer lastStatus,@Param("mileage") Integer mileage);
 }
\ No newline at end of file

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

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

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

@@ -56,11 +56,15 @@ public class VehicleWarningMsgQueryVo {
      */
     private Integer vehicleCode;
 
+    private Integer subordinateBranch;
+
     /**
      * 对应车牌号
      */
     private String numberPlate;
 
+    private Integer mileageLastUpdate;
+
 
     private Date createTime;
 

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

@@ -266,4 +266,15 @@
         where id = #{vehicleId} and status = #{lastStatus}
     </update>
 
+    <update id="updateMileageStatusByIdAndStatus">
+        update vehicle
+        set status = #{status},maintenance_mileage=#{mileage}
+        where id = #{vehicleId} and status = #{lastStatus}
+    </update>
+    <update id="upMileageByIdAndStatus">
+        update vehicle
+        set status = #{status},mileage_last_update=#{mileage}
+        where id = #{vehicleId} and status = #{lastStatus}
+    </update>
+
 </mapper>
\ No newline at end of file

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

@@ -24,5 +24,21 @@
         select id, type, status, msg, rule_id, msg_key, vehicle_id, create_time, update_time, remark from vehicle_warning_msg where vehicle_id = #{_parameter}
     </select>
 
+    <select id="getByPages" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleWarningMsgQueryVo"
+            parameterType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleWarningMsgVo">
+
+        SELECT id as vehicleId,code as vehicleCode,number_plate as numberPlate,mileage_last_update as mileageLastUpdate,status,
+        IFNULL(park_branch_company_id,expect_destination_branch_company_id) AS subordinateBranch,
+        CONCAT('当前公里数为：',mileage_last_update,' 保养公里数:',maintenance_mileage,' 请尽快保养!') as msg
+        ,1 as type,update_time as createTime  FROM  vehicle
+        WHERE mileage_last_update>=maintenance_mileage
+        <if test="vehicleCode != null">
+            and vcode = #{vehicleCode}
+        </if>
+        <if test="numberPlate != null and numberPlate != '' ">
+            and number_plate = #{numberPlate}
+        </if>
+    </select>
+
 
 </mapper>
\ No newline at end of file