Merge remote-tracking branch 'origin/dev' into dev

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

@@ -148,7 +148,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     public static void main(String[] args) throws Exception{
         int b = 16744448;
-        Integer a = b | 0;
+        Integer a = b | 48;
         System.out.println(a);
     }
 

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

@@ -7,20 +7,19 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.xxfc.platform.universal.utils.DateUtil;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.BookType;
 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.entity.BookRecordAccItem;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
 import com.xxfc.platform.vehicle.pojo.*;
@@ -57,6 +56,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     public static final String TB_ACC_ITEM_NAME_REAL = "book_record_acc_item";//实际表名
     public static final DateTimeFormatter YEAR_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy");
     public static final DateTimeFormatter YEARMONTH_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM");
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final Integer DEL_BATCH_SIZE = 1000;
     public static final Integer COPY_BATCH_SIZE = 100;
 
@@ -73,6 +73,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     VehicleUpkeepService vehicleUpkeepService;
 
+    @Autowired
+    VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -340,6 +343,45 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return rs;
     }
 
+    /**
+     * 检验数据库预定记录日期是否和时间，日期表中的二进制数据一致
+     * @return
+     */
+    public ObjectRestResponse checkDateInvalide(){
+        List<VehicleBookRecord> list = mapper.selectAll();
+        List<VehicleBookRecord> unRightList = new ArrayList<>();
+        if(list != null && list.size() > 0) {
+            for(VehicleBookRecord vehicleBookRecord : list) {
+                log.info("vehicleBookRecord = {}", vehicleBookRecord);
+                Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), DateUtil.dateToStr(vehicleBookRecord.getBookStartDate(), "yyyy-MM-dd HH:mm:ss"), Boolean.TRUE);
+                log.info("转换为时间二进制：map = {}", map);
+                //检验数据有效性
+                for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+                    vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+                    List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
+                    log.info("预定时间信息：vehicleBookHourInfos = {}", vehicleBookHourInfos);
+                    if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
+                        //检验数据是否存在
+                        if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
+                            log.info("时间正确，已经存在");
+                        } else {
+                            log.info("时间不正确");
+                            vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() | entry.getValue()));
+                            log.info("更新预定时间数据：vehicleBookHourInfos = {}", vehicleBookHourInfos);
+                            vehicleBookHourInfoBiz.updateSelectiveByIdRe(vehicleBookHourInfos.get(0));
+                            unRightList.add(vehicleBookRecord);
+                        }
+                    }
+                }
+
+            }
+
+        }
+        return ObjectRestResponse.succ(unRightList);
+    }
+
 
     /**
      * 迁移数据到历史表

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

@@ -497,4 +497,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         vehicleJobHandler.execute(month);
         return RestResponse.suc();
     }
+
+    @GetMapping("/app/unauth/checkHourInfo")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse checkHourInfo() {
+        return vehicleBookRecordBiz.checkDateInvalide();
+    }
 }