Merge branch 'master-bug' into 'master'

Master-bug-master-merge

See merge request !12

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -82,7 +82,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if(MileageLift==null||MileageLift1>=MileageLift){
+        if(MileageLift==null||MileageLift1 >= MileageLift){
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
@@ -231,6 +231,26 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
+            DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
+            DateTime actualArrivalDate = new DateTime(new Date());
+            //提前还车处理
+            if(actualArrivalDate.compareTo(arrivalDate) < 0) { //实际还车时间小于预计还车时间，需要释放后面的时间
+                BookVehicleVO bookVehicleVo = new BookVehicleVO();
+                BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
+                bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
+                bookVehicleVo.setBookStartDate(null);
+                bookVehicleVo.setBookEndDate(null);
+                bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
+                bookVehicleVo.setUnbookEndDate(arrivalDate.toString(DATE_TIME_FORMATTER));
+                try {
+                    Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
+                    if(!hasSuc){
+                        throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
+                    }
+                } catch ( Exception e) {
+                    e.printStackTrace();
+                }
+            }
             departureLog.setMileageEnd(arrivalVo.getMileage());
             departureLog.setRecycleMan(arrivalVo.getRecycleMan());
             departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -531,7 +531,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
             //当天已经被预定检查小时是否也被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
-        } else if ((vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
+        } else if (vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null && (vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
         }
         return Boolean.TRUE;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java

@@ -9,17 +9,22 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleBookHourInfo;
+import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.mapper.VehicleBookHourInfoMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleBookHourInfoDto;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +33,11 @@ import java.util.Map;
 @Service
 public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, VehicleBookHourInfo> {
 
+    @Autowired
+    private VehicleBookRecordBiz vehicleBookRecordBiz;
+    @Autowired
+    VehicleDepartureService vehicleDepartureService;
+
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
@@ -48,41 +58,37 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
                 throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
             }
         }
-        if (bookStartDate.compareTo(bookEndDate) > 0) {
-            throw new BaseException(ResultCode.END_TIME_FROM_TODAY);
-        }
+//        if (bookStartDate.compareTo(bookEndDate) >= 0) {
+//            throw new BaseException(ResultCode.END_TIME_FROM_TODAY);
+//        }
         Map<String, Integer> predictableHours = Maps.newHashMap();
         //预定开始小时
         int hour = new DateTime(startDate).hourOfDay().get();
         int endHour = new DateTime(endDate).hourOfDay().get();
         //获取开始天的预定小时
         int startPredictableHour = 0;
-        if(hour > 0 ) {
-            for (int curentHour = hour; curentHour <= 24; curentHour++) {
-                startPredictableHour |= 1 << (curentHour - 1);
-            }
+        for (int curentHour = hour; curentHour <= 23; curentHour++) {
+            startPredictableHour |= 1 << (curentHour);
         }
 
         //获取结束天的预定小时
         int endPredictableHour = 0;
-        if(endHour > 0) {
-            for (int curentHour = 0; curentHour < endHour; curentHour++) {
+        for (int curentHour = 0; curentHour <= endHour; curentHour++) {
             endPredictableHour |= 1 << (curentHour);
         }
+        DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
+        DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
+        if(startPredictableHour == 0) { //如果是0点就直接预订全天
+            startPredictableHour = 16777215;
         }
         if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
-            if(startPredictableHour == 0 || endPredictableHour == 0) {
-                predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour | endPredictableHour);
-            } else {
+            //如果开始时间是0点开始
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
-            }
-        } else {
+        } else { //非同一天开始
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
             predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
         }
-        DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
-        DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
-        if(endDay.getDayOfMonth() - startDay.getDayOfMonth() >1){ //
+        if(endDay.getDayOfMonth() - startDay.getDayOfMonth() > 1){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
                 //全天预定
@@ -150,9 +156,62 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         return ObjectRestResponse.succ();
     }
 
-    public static void main(String[] args) throws Exception{
+    public  ObjectRestResponse checkBookHourInfo() {
+        List<VehicleBookHourInfoDto> vehicleBookHourInfos = new ArrayList<>();
+        List<VehicleBookRecord> list = vehicleBookRecordBiz.selectListAll();
+        if(CollectionUtils.isNotEmpty(list)) {
+            for(VehicleBookRecord vehicleBookRecord : list) {
+                VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+                if((vehicleDepartureLog == null || vehicleDepartureLog.getState() != 1) && (vehicleBookRecord.getStatus() == 2 || vehicleBookRecord.getStatus() == 1)) { //未出车或未还车
+                    Map<String, Integer> map = getPredictableHours(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER), new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER), Boolean.TRUE);
+                    for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                        VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+                        vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+                        vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+                        vehicleBookHourInfoDto.setBookedHour(entry.getValue());
+                        save(vehicleBookHourInfoDto);
+                        vehicleBookHourInfos.add(vehicleBookHourInfoDto);
+//                        vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+//                        vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+//                        List<VehicleBookHourInfo> vehicleBookHourInfoList = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
+//                        log.info("获取到的小时信息： vehicleBookHourInfoList = {}", vehicleBookHourInfoList);
+//                        if(CollectionUtils.isNotEmpty(vehicleBookHourInfoList)) {
+//                            if(entry.getValue() == 0){ //0点
+//                                vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() | 1);
+//                                updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
+//                            } else {
+//                                if((vehicleBookHourInfoList.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
+//                                    log.info("已经预订时间正确，右移一位，原数据为：{}， 修改后的数据为： {}", vehicleBookHourInfoList.get(0).getBookedHour(), vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
+//                                    vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
+//                                    updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
+//                                } else {
+//                                    vehicleBookHourInfos.add(vehicleBookRecord);
+//                                }
+//                            }
+//                        } else { //如果数据不存在就补充进去
+//                            VehicleBookHourInfoDto vehicleBookHourInfoDto1 = new VehicleBookHourInfoDto();
+//                            vehicleBookHourInfoDto1.setVehicleId(vehicleBookRecord.getVehicleId());
+//                            vehicleBookHourInfoDto1.setYearMonthDay(entry.getKey());
+//                            vehicleBookHourInfoDto1.setBookedHour(entry.getValue());
+//                            vehicleBookHourInfoDto1.setBookRecordId(vehicleBookRecord.getId());
+//                            save(vehicleBookHourInfoDto1);
+//                        }
+                    }
+                }
+            }
+        }
+        return ObjectRestResponse.succ(vehicleBookHourInfos);
+    }
 
-        Integer a = 7936 & 2047;
+
+    public static void main(String[] args) throws Exception{
+        VehicleBookHourInfoBiz vehicleBookHourInfoBiz = new VehicleBookHourInfoBiz();
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours("2019-08-26 10:00:00", "2019-08-27 10:00:00", Boolean.TRUE);
+        for(Map.Entry<String, Integer> entry : map.entrySet()) {
+            System.out.println(entry.getKey());
+            System.out.println(entry.getValue());
+        }
+        Integer a = 215712192 & 33554432;
         System.out.println(a);
     }
 

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

@@ -70,6 +70,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     private VehicleJobHandler vehicleJobHandler;
 
+    @Autowired
+    private VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+
     @Autowired
     BranchCompanyBiz branchCompanyBiz;
     public UserFeign getUserFeign() {
@@ -506,4 +509,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public ObjectRestResponse checkHourInfo() {
         return vehicleBookRecordBiz.checkDateInvalide();
     }
+
+    @GetMapping("/app/unauth/checkBookHourInfo")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse checkBookHourInfo() {
+        return vehicleBookHourInfoBiz.checkBookHourInfo();
+    }
 }