|
@@ -474,12 +474,19 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
|
|
|
//计算停车时间
|
|
|
long parkingTimeLong = DateUtil.between(parkingRecord0.getInParkingTime(), outParkingTime, DateUnit.MINUTE);
|
|
|
//add by hbjzws 2023-06-28 增加对出场跟入场匹配过长的问题(修改未7天内)
|
|
|
- int maxTTime =24*60*7;
|
|
|
+ //int maxTTime =24*60*7;
|
|
|
+ Integer maxInToOutTime =parkingInfo.getMaxInToOutTime();
|
|
|
+ if(maxInToOutTime==null){
|
|
|
+ maxInToOutTime =48;
|
|
|
+ }
|
|
|
+ int maxTTime =maxInToOutTime*60;
|
|
|
if(Convert.toInt(parkingTimeLong)>maxTTime){
|
|
|
Date orgInTime =parkingRecord0.getInParkingTime();
|
|
|
parkingRecord0.setInParkingTime(DateUtil.offsetMinute(outParkingTime,-maxTTime));
|
|
|
log.warn(StrUtil.format("停车记录时间过长,存在进场与出场记录不匹配的问题,原先进场时间为:{},修改后的进场时间为{}",DateUtil.format(orgInTime,"yyyy-MM-dd HH:mm:ss"),DateUtil.format(parkingRecord0.getInParkingTime(),"yyyy-MM-dd HH:mm:ss")));
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
parkingRecord0.setOutPlateId(plateId);
|
|
|
parkingRecord0.setParkingTime(Convert.toInt(parkingTimeLong));
|
|
|
parkingRecord0.setOutChannelId(parkingChannel.getId());
|