预订时间处理bug

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

@@ -9,17 +9,21 @@ 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 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 +32,9 @@ import java.util.Map;
 @Service
 public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, VehicleBookHourInfo> {
 
+    @Autowired
+    private VehicleBookRecordBiz vehicleBookRecordBiz;
+
     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");
 
@@ -155,6 +162,32 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
          return ObjectRestResponse.succ();
     }
 
+    public  ObjectRestResponse checkBookHourInfo() {
+        List<VehicleBookHourInfo> vehicleBookHourInfos = new ArrayList<>();
+        List<VehicleBookRecord> list = vehicleBookRecordBiz.selectListAll();
+        if(CollectionUtils.isNotEmpty(list)) {
+            for(VehicleBookRecord vehicleBookRecord : list) {
+                Map<String, Integer> map = getPredictableHours(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER), new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER), Boolean.FALSE);
+                for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+                    vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+                    List<VehicleBookHourInfo> vehicleBookHourInfoList = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
+                    if(CollectionUtils.isNotEmpty(vehicleBookHourInfoList)) {
+                        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);
+                        } else {
+                            vehicleBookHourInfos.add(vehicleBookHourInfoList.get(0));
+                        }
+                    }
+                }
+            }
+        }
+        return ObjectRestResponse.succ(vehicleBookHourInfos);
+    }
+
+
     public static void main(String[] args) throws Exception{
 
         Integer a = 7936 & 2047;

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

@@ -72,6 +72,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
 
     @Autowired
     BranchCompanyBiz branchCompanyBiz;
+    @Autowired
+    VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+
     public UserFeign getUserFeign() {
         return userFeign;
     }
@@ -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();
+    }
 }