|
|
|
@ -676,6 +676,7 @@ public class BasLaancService {
|
|
|
|
|
|
|
|
|
|
comConfirmBasRepository.save(comConfirmBas); |
|
|
|
|
|
|
|
|
|
log.info(">>> confirmKey [GENERATED] ", confirmKey); |
|
|
|
|
return BasLaancQrcodeRs.builder() |
|
|
|
|
.qrcode(qr) |
|
|
|
|
.confirmKey(confirmKey) |
|
|
|
@ -685,7 +686,7 @@ public class BasLaancService {
|
|
|
|
|
|
|
|
|
|
// QR code 확인
|
|
|
|
|
public PilotValidRs checkQrcode(String confirmKey) { |
|
|
|
|
|
|
|
|
|
log.info(">>> confirmKey : {}", confirmKey); |
|
|
|
|
String userIdByToken = jwtTokenUtil.getUserIdByToken(); |
|
|
|
|
ComConfirmBas entity = comConfirmBasRepository.findFirstByConfirmKeyOrderByCreateDtDesc(confirmKey); |
|
|
|
|
if(entity == null) throw new CustomException(ErrorCode.DATA_NOTFIND, "QR코드 조회 실패"); |
|
|
|
@ -697,13 +698,13 @@ public class BasLaancService {
|
|
|
|
|
|
|
|
|
|
// TODO 일자 검증 - 3분 초과
|
|
|
|
|
Instant createDt = entity.getCreateDt().plus(3, ChronoUnit.MINUTES); |
|
|
|
|
boolean flag = !createDt.isAfter(Instant.now()); |
|
|
|
|
boolean flag = !createDt.isBefore(Instant.now()); |
|
|
|
|
if (!flag) { |
|
|
|
|
entity.setStatus("EXPIRED"); |
|
|
|
|
entity.setUpdateUserId(userIdByToken); |
|
|
|
|
comConfirmBasRepository.save(entity); |
|
|
|
|
comConfirmBasRepository.flush(); |
|
|
|
|
throw new CustomException(ErrorCode.FAIL, "QR 기간 만료"); |
|
|
|
|
throw new CustomException(ErrorCode.QR_EXPIRED, "QR 기간 만료"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
PilotValidRs rs = null; |
|
|
|
|