|
@@ -114,7 +114,7 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
|
|
|
//传递的时间参数
|
|
|
String dataStr = StringUtils.getAlarmInfoPlateTimeStr(alarmInfoPlate.getResult().getPlateResult().getTimeStamp().getTimeval());
|
|
|
log.warn(dataStr);
|
|
|
- //比较时间与当前时间,如果相差30S则不处理
|
|
|
+ //比较时间与当前时间,如果相差30S则不处理-----调试时下面这几句话要屏蔽掉
|
|
|
if (DateUtil.parse(dataStr).compareTo(DateUtil.offsetSecond(new Date(), -30)) < 0) {
|
|
|
throw new Exception(StrUtil.format("记录时间与创建时间相差超过30s,记录:{}", alarmInfoPlate.getResult().getPlateResult().getLicense()));
|
|
|
}
|
|
@@ -400,9 +400,9 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
|
|
|
parkingRecordQueryWrapper1.eq("park_id", parkingChannel.getParkId());
|
|
|
parkingRecordQueryWrapper1.eq("car_num", license);
|
|
|
parkingRecordQueryWrapper1.eq("release_status", "1");
|
|
|
- parkingRecordQueryWrapper1.gt("in_parking_time",DateUtil.offsetHour(new Date(),-4));
|
|
|
+ // parkingRecordQueryWrapper1.gt("in_parking_time",DateUtil.offsetHour(new Date(),-4));
|
|
|
+ parkingRecordQueryWrapper1.gt("in_parking_time",DateUtil.offsetDay(new Date(),-30));
|
|
|
parkingRecordQueryWrapper1.orderByDesc("create_time");
|
|
|
-
|
|
|
parkingRecordQueryWrapper1.last("LIMIT 1");
|
|
|
ParkingRecord parkingRecord1 = getOne(parkingRecordQueryWrapper1);
|
|
|
if (parkingRecord1 != null) {
|
|
@@ -410,7 +410,7 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
|
|
|
parkingRecord.setParkId(parkingRecord1.getParkId());
|
|
|
parkingRecord.setCarNum(license);
|
|
|
parkingRecord.setOutPlateId(plateId);
|
|
|
- parkingRecord.setInParkingTime(parkingRecord1.getInParkingTime());
|
|
|
+ parkingRecord.setInParkingTime(parkingRecord1.getOutParkingTime());
|
|
|
parkingRecord.setProductTheme("停车费");
|
|
|
parkingRecord.setCarType(parkingRecord1.getCarType());
|
|
|
parkingRecord.setCType(parkingRecord1.getCType());
|