修改车辆排班时间粒度

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -29,6 +29,7 @@ public enum ResCode {
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
 
     VEHICLE_BOOK_RECORD_IS_NOT_EXIST(104004, "预约记录不存在"),
+    VEHICLE_UNBOOK_FAIL(104005, "取消预定失败！"),
 
     BRANCH_COMPANY_UNEXIST(105001, "分公司信息不存在"),
     BRANCH_COMPANY_STOCK_EXISTED(105002, "分公司股权信息已存在"),

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

@@ -56,7 +56,7 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
         if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
         Integer MileageLift=vehicle.getMileageLastUpdate();
@@ -75,8 +75,8 @@ public class VehicleActiveService {
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
 
-            if (result == 0) {
-                throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
+            if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+                throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
             }
             //修改预约记录状态
@@ -117,10 +117,35 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
+    }
 
-
-
-
+    public String getVehicleStatus(Integer status, String vehicleId) {
+        StringBuilder stringBuilder = new StringBuilder();
+        switch (status) {
+            case 1:
+                stringBuilder.append("正常运行");
+                break;
+            case 2:
+                stringBuilder.append("维修");
+                break;
+            case 3:
+                stringBuilder.append("报废");
+                break;
+            case 4:
+                stringBuilder.append("出车");
+                break;
+            case 5:
+                stringBuilder.append("保养");
+                break;
+        }
+            List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
+            if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+                stringBuilder.append("中，使用人：");
+                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+                stringBuilder.append(" 使用人电话：");
+                stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+            }
+        return stringBuilder.toString();
     }
 
     @Transactional
@@ -131,7 +156,7 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
         if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
         }
         Integer Mileagerest = vehicle.getMileageLastUpdate();

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

@@ -24,10 +24,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.constant.VehicleStatus;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
@@ -343,8 +340,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
+        //检查车辆是否可以预定
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
-            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
+            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
             if(Boolean.FALSE.equals(rsEach)){
                 throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
             }
@@ -429,9 +428,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
         //检查车辆是否可以预定
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
-            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
+            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
             if(Boolean.FALSE.equals(rsEach)){
                 throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
             }
@@ -457,7 +457,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
 //        //添加预定时间记录
             VehicleBookRecord newValue = vehicleBookRecordBiz.selectOne(vehicleBookRecord);
-            Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
             for(Map.Entry<String, Integer> entry : map.entrySet()) {
                 VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
                 vehicleBookHourInfoDto.setVehicleId(bookVehicleVo.getVehicleId());
@@ -502,19 +501,19 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         log.info("预定车辆参数：userId = {}, bookVehicleVo = {},username = {}", userId, bookVehicleVo, userName);
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicleId());
+
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
         DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(),DATE_TIME_FORMATTER);
         DateTime endDay =DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
-
-
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
-            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
+            Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
             if(Boolean.FALSE.equals(rsEach)){
                 throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
             }
@@ -539,14 +538,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         }
 
 //        //添加预定时间记录
-        VehicleBookRecord newValue = vehicleBookRecordBiz.selectOne(vehicleBookRecord);
-        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
         for(Map.Entry<String, Integer> entry : map.entrySet()) {
             VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
             vehicleBookHourInfoDto.setVehicleId(bookVehicleVo.getVehicleId());
             vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
             vehicleBookHourInfoDto.setBookedHour(entry.getValue());
-            vehicleBookHourInfoDto.setBookRecordId(newValue.getId());
             vehicleBookHourInfoBiz.save(vehicleBookHourInfoDto);
         }
 
@@ -574,7 +570,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
 
     @Transactional
-    public Boolean applyVehicle4EmployeePerMonth(String vehicleId, List<String> bookedDates, String yearMonth){
+    public Boolean applyVehicle4EmployeePerMonth(String vehicleId, List<String> bookedDates, String yearMonth, Map<String, Integer> hourInfo){
         //检查车辆是否有空档
         //获得当月预定记录
         VehicleBookInfo vehicleBookInfo = getByVehicleIdAndYearMonth(vehicleId,yearMonth);
@@ -587,14 +583,31 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Map<String,Integer> andOpratorParam  = yearMonthAndParam.get(yearMonth);
         Integer andOperationFactor = andOpratorParam.get("andOperationFactor");
         Integer andOperationRs = andOpratorParam.get("andOperationRs");
-        if(vehicleBookInfo!=null&&vehicleBookInfo.getBookedDate()!=null &&
+        if(vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null &&
                 ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){
-            return Boolean.FALSE;
+            //当天已经被预定检查小时是否也被预定
+            return filterHourInfoBooked(vehicleId, hourInfo);
         }
         return Boolean.TRUE;
     }
 
 
+    public boolean filterHourInfoBooked(String vehicleId, Map<String, Integer> hourInfo) {
+        for(Map.Entry<String, Integer> entry : hourInfo.entrySet()) {
+            VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+            vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+            vehicleBookHourInfoDto.setVehicleId(vehicleId);
+            List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
+            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() >0) {
+                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) { // 已经被预定
+                    log.info(entry.getKey() + "预定的时间段已经被预约！");
+                    return Boolean.FALSE;
+                }
+            }
+        }
+        return Boolean.TRUE;
+    }
+
     /**
      * 批准预定车辆预定
      * @param operatorId
@@ -616,24 +629,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         //转换为相应预定参数
         BookVehicleVO bookVehicleVo = new BookVehicleVO();
         BeanUtils.copyProperties(bookVehicleVo,vehicleBookRecord);
-        bookVehicleVo.setBookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        bookVehicleVo.setBookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-//        //审核通过的话，需要修改相关车辆预定记录
-//        if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
-//            Boolean hasSuc = bookedVehicle(bookVehicleVo);
-//            if(!hasSuc){
-//                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
-//            }
-//        }
-//        //如果拒绝预定，删除预定时间记录
-//        if(VehicleBookRecordStatus.APPLY.getCode().equals(vehicleBookRecord.getStatus())) {
-//            //删除预定时间记录
-//            List<String> list = null;
-//            for( DateTime curDate = new DateTime(vehicleBookRecord.getBookStartDate());curDate.compareTo(new DateTime(vehicleBookRecord.getBookEndDate()))<=0;curDate=curDate.plusDays(1)) {
-//                list.add(curDate.toString(DEFAULT_DATE_TIME_FORMATTER));
-//            }
-//            vehicleBookHourInfoBiz.delete(vehicleBookRecord.getVehicleId(),list);
-//        }
+        bookVehicleVo.setBookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
+        bookVehicleVo.setBookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
+
             //成功后修改预定记录状态
             Map<String,Object> updateParam = Maps.newHashMap();
             updateParam.put("id",bookRecordId);
@@ -682,12 +680,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         BeanUtils.copyProperties(bookVehicleVo,vehicleBookRecord);
         bookVehicleVo.setBookStartDate(null);
         bookVehicleVo.setBookEndDate(null);
-        bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
+        bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
+        bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
         //取消预定
         Boolean hasSuc = unbookVehicle(bookVehicleVo);
         if(!hasSuc){
-            return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
+            return RestResponse.codeAndMessage(ResCode.VEHICLE_UNBOOK_FAIL.getCode(), ResCode.VEHICLE_UNBOOK_FAIL.getDesc());
         }
         //修改预定状态，写入取消人
         Map<String,Object> updateParam = Maps.newHashMap();
@@ -753,7 +751,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public Boolean bookedVehicle( BookVehicleVO bookVehicleVo) throws Exception{
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
-
         DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(), DATE_TIME_FORMATTER);
         DateTime endDay =DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
@@ -785,11 +782,18 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         vehicleBookInfo.setVehicle(vehicleId);
         vehicleBookInfo.setYearMonth(yearMonth);
         //检查是否存在相关车辆
-        Vehicle param = new Vehicle();
-        param.setId(vehicleId);
         checkIfVehicleExists(vehicleId);
         Integer orRsOperationFactor = getBitOpratorFactor4Booked(bookedDates);//预定的相关或运算因子，当前月份没有预定记录时同时也是结果
         vehicleBookInfo.setBookedDate(orRsOperationFactor);
+        Map<String,Object> map = new HashMap<>();
+        map.put("vehicle", vehicleId);
+        map.put("yearMonth", yearMonth);
+        List<VehicleBookInfo> vehicleBookInfos = vehicleBookInfoMapper.getByVehicleIdAndYearMonth(map);
+        if(vehicleBookInfos != null && vehicleBookInfos.size() > 0) {
+            if((vehicleBookInfos.get(0).getBookedDate() & orRsOperationFactor) == orRsOperationFactor) {
+                return Boolean.TRUE;
+            }
+        }
         Integer effected = vehicleBookInfoMapper.insertIgnore(vehicleBookInfo);
         if(effected == 0){//已存在则需要更新
             Map<String,Object> params = Maps.newHashMap();
@@ -881,17 +885,17 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         //提取日期参数，改为每月一份
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
-        DateTime startDay =DateTime.parse(bookVehicleVo.getUnbookStartDate(), DEFAULT_DATE_TIME_FORMATTER);
-        DateTime endDay =DateTime.parse(bookVehicleVo.getUnbookEndDate(), DEFAULT_DATE_TIME_FORMATTER);
+        DateTime startDay =DateTime.parse(bookVehicleVo.getUnbookStartDate(), DATE_TIME_FORMATTER);
+        DateTime endDay =DateTime.parse(bookVehicleVo.getUnbookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         uinbookDateList4DatePeriod(yearMonthAndDate,startDay,endDay);
-
+        Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getUnbookStartDate(), bookVehicleVo.getUnbookEndDate());
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_UNBOOK_TWO_MONTH);
         }
         Boolean rs = Boolean.TRUE;
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
-            Boolean rsEach = unbookVehiclePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
+            Boolean rsEach = unbookVehiclePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
             if(Boolean.FALSE.equals(rsEach)){
                 rs = Boolean.FALSE;
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚
@@ -900,8 +904,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return rs;
     }
 
+
     @Transactional
-    public Boolean unbookVehiclePerMonth(String vehicleId, List<String> unbookDates, String yearMonth){
+    public Boolean unbookVehiclePerMonth(String vehicleId, List<String> unbookDates, String yearMonth, Map<String, Integer> hourInfo){
         checkIfVehicleExists(vehicleId);
         Map<String,Object> params = Maps.newHashMap();
         params.put("vehicleId",vehicleId);
@@ -921,10 +926,34 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Integer andRsOperationFactor = getBitOpratorFactor4UnBooked(unbookDates);//预定的相关或运算因子，当前月份没有预定记录时同时也是结果
         params.put("andRsOperationFactor",
                 andRsOperationFactor);
+        if(hourInfo.size() == 1) { //取消当天的小时，不取消当天的预定
+            return unbookHourInfo(vehicleId, hourInfo);
+        } else {
             Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
-        return effected>0?Boolean.TRUE:Boolean.FALSE;
+                return unbookHourInfo(vehicleId, hourInfo);
+        }
     }
 
+    public boolean unbookHourInfo(String vehicleId, Map<String, Integer> hourInfo) {
+        for (Map.Entry<String, Integer> entry : hourInfo.entrySet()) {
+            VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+            vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+            vehicleBookHourInfoDto.setVehicleId(vehicleId);
+            List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
+            if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
+                vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
+                int effect = vehicleBookHourInfoBiz.updateByIdRe(vehicleBookHourInfos.get(0));
+                if (effect < 1) {
+                    return Boolean.FALSE;
+                } else {
+                    continue;
+                }
+            } else {
+                return Boolean.FALSE;
+            }
+        }
+        return Boolean.TRUE;
+    }
 
     /**
      * 获取某月份相应预定日期查询条件

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

@@ -31,7 +31,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     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");
 
-    public static  Map<String, Integer>  getPredictableHours(String bookStartDate, String bookEndDate) {
+    public  Map<String, Integer>  getPredictableHours(String bookStartDate, String bookEndDate) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
         Date endDate = null;
@@ -68,12 +68,14 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
                 endPredictableHour |= 1 << (curentHour);
             }
         }
-
+        if(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER).equals(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER))) {//同一天预定
+            predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour & endPredictableHour);
+        } 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){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
@@ -143,18 +145,9 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
     public static void main(String[] args) throws Exception{
-        String result = Integer.toBinaryString(16777200);
-        String newString = new StringBuilder(result).reverse().toString();
-        int i=newString.length()-result.replace("1", "").length();
-       System.out.println(i);
-
-        Map<String, Integer> map = getPredictableHours("2019-07-28 00:00:00","2019-07-29 00:00:00");
-        for (Map.Entry<String, Integer> entry : map.entrySet()) {
-            log.info(entry.getKey());
-            log.info(entry.getValue() + "");
-        }
-
-
+        int b = 16744448;
+        Integer a = b | 31;
+        System.out.println(a);
     }
 
 }

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

@@ -299,7 +299,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return PageDataVO.pageInfo(vehiclePageInfo);
     }
 
-
+    public List<VehicleBookRecordVo> selectByVehicleId(String vehicleId) {
+        return mapper.selectByVehicleId(vehicleId);
+    }
 
 
     /**

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

@@ -30,7 +30,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
 
     public List<VehicleRecordInfoVo> getByParam(Map<String, Object> params);
 
-    public List<VehicleBookRecord> getByVehicleId(String vehicleId);
+    public List<VehicleBookRecordVo> selectByVehicleId(String vehicleId);
 
     public List<VehicleBookRecordVo> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);