diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java index 3f18832..0cc1465 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java @@ -1,6 +1,10 @@ package go.kr.project.carInspectionPenalty.registration.service.impl; import egovframework.util.SessionUtil; +import go.kr.project.api.model.request.NewBasicRequest; +import go.kr.project.api.model.response.NewBasicResponse; +import go.kr.project.api.service.ExternalVehicleApiService; +import go.kr.project.api.service.VmisCarBassMatterInqireLogService; import go.kr.project.carInspectionPenalty.registration.model.CarFfnlgTrgtVO; import go.kr.project.carInspectionPenalty.registration.service.ComparisonService; import go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker.*; @@ -10,6 +14,9 @@ import lombok.extern.slf4j.Slf4j; import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; import org.springframework.stereotype.Service; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + /** * 과태료 대상 비교 서비스 구현체 * @@ -28,6 +35,11 @@ public class ComparisonServiceImpl extends EgovAbstractServiceImpl implements Co private final OwnerLevyOver31Checker ownerLevyOver31Checker; private final TransferCase115DayChecker transferCase115DayChecker; + private final ExternalVehicleApiService apiService; + private final VmisCarBassMatterInqireLogService bassMatterLogService; + + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + /** * 비교 로직 메인 메서드 * @@ -54,50 +66,69 @@ public class ComparisonServiceImpl extends EgovAbstractServiceImpl implements Co // 사용자 조직코드 추출 String userOrgCd = userInfo != null ? userInfo.getOrgCd() : null; + // ========== Step 0: 자동차기본정보 조회 (차량번호 + 오늘일자) - 한번만 호출 ========== + log.info("[공통] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); + NewBasicResponse step0Response = null; + try { + NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); + step0Response = apiService.getBasicInfo(step0Request); + bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); + + if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { + log.warn("[공통] Step 0 응답 없음 - 차량번호: {}", vhclno); + log.info("========== 비교 로직 종료 (Step 0 응답 없음): {} ==========", vhclno); + return null; + } + } catch (Exception e) { + log.error("[공통] Step 0 호출 중 오류 발생 - 차량번호: {}", vhclno, e); + log.info("========== 비교 로직 종료 (Step 0 오류): {} ==========", vhclno); + return null; + } + // ========== 1. 상품용 체크 - api-1번호출.소유자명.contains("상품용") ========== - String productUseResult = productUseChecker.check(existingData, userOrgCd); + String productUseResult = productUseChecker.check(existingData, userOrgCd, step0Response); if (productUseResult != null) { log.info("========== 비교 로직 종료 (상품용): {} ==========", vhclno); return productUseResult; } // ========== 2. 상품용 체크 - api-1번호출.소유자명.contains("상품용-변경등록") ========== - String productUseChangeResult = productUseChnageChecker.check(existingData, userOrgCd); + String productUseChangeResult = productUseChnageChecker.check(existingData, userOrgCd, step0Response); if (productUseChangeResult != null) { log.info("========== 비교 로직 종료 (상품용-변경등록): {} ==========", vhclno); return productUseChangeResult; } // ========== 3. 내사종결 체크 - 명의이전 이전소유자 상품용, 31일 이내 ========== - String investigationClosedByProductResult = productCloseWithin31Checker.check(existingData, userOrgCd); + String investigationClosedByProductResult = productCloseWithin31Checker.check(existingData, userOrgCd, step0Response); if (investigationClosedByProductResult != null) { log.info("========== 비교 로직 종료 (내사종결 - 명의이전 이전소유자 상품용, 31일 이내): {} ==========", vhclno); return investigationClosedByProductResult; } // ========== 4. 내사종결 체크 - 명의이전, 31일 이내 ========== - String investigationClosedByOwnerChangeResult = ownerCloseWithin31Checker.check(existingData, userOrgCd); + String investigationClosedByOwnerChangeResult = ownerCloseWithin31Checker.check(existingData, userOrgCd, step0Response); if (investigationClosedByOwnerChangeResult != null) { log.info("========== 비교 로직 종료 (내사종결 - 명의이전, 31일 이내): {} ==========", vhclno); return investigationClosedByOwnerChangeResult; } // ========== 5. 이첩 체크 ========== - String transferResult = transferCase115DayChecker.check(existingData, userOrgCd); + String transferResult = transferCase115DayChecker.check(existingData, userOrgCd, step0Response); if (transferResult != null) { log.info("========== 비교 로직 종료 (이첩): {} ==========", vhclno); return transferResult; } // ========== 6. 날짜 수정 후 부과 체크 - 명의이전 이전소유자 상품용, 31일 초과 ========== - String dateModifiedLevyByProductResult = productLevyOver31Checker.check(existingData, userOrgCd); + String dateModifiedLevyByProductResult = productLevyOver31Checker.check(existingData, userOrgCd, step0Response); if (dateModifiedLevyByProductResult != null) { log.info("========== 비교 로직 종료 (날짜 수정 후 부과 - 명의이전 이전소유자, 31일 초과): {} ==========", vhclno); return dateModifiedLevyByProductResult; } // ========== 7. 날짜 수정 후 부과 체크 - 명의이전, 31일 초과 ========== - String dateModifiedLevyByOwnerChangeOverResult = ownerLevyOver31Checker.check(existingData, userOrgCd); + String dateModifiedLevyByOwnerChangeOverResult = ownerLevyOver31Checker.check(existingData, userOrgCd, step0Response); if (dateModifiedLevyByOwnerChangeOverResult != null) { log.info("========== 비교 로직 종료 (날짜 수정 후 부과 - 명의이전, 31일 초과): {} ==========", vhclno); return dateModifiedLevyByOwnerChangeOverResult; @@ -108,4 +139,27 @@ public class ComparisonServiceImpl extends EgovAbstractServiceImpl implements Co log.info("========== 비교 로직 종료 (미적용): {} ==========", vhclno); return null; } + + /** + * 자동차기본정보 요청 객체 생성 + */ + private NewBasicRequest createBasicRequest(String vhrno, String vin, String levyCrtrYmd) { + NewBasicRequest request = new NewBasicRequest(); + + NewBasicRequest.Record record = new NewBasicRequest.Record(); + record.setLevyCrtrYmd(levyCrtrYmd); + + if (vhrno != null) { + // API 호출 시 '*' 특수문자 제거 (전출차량 표시용) + String cleanVhrno = vhrno.replace("*", ""); + record.setVhrno(cleanVhrno); + record.setInqSeCd("3"); // 3: 자동차번호 + } else if (vin != null) { + record.setVin(vin); + record.setInqSeCd("2"); // 2: 차대번호 + } + + request.setRecord(java.util.Arrays.asList(record)); + return request; + } } diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java index dcd15a9..a9bdb21 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java @@ -1,5 +1,6 @@ package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; +import go.kr.project.api.model.response.NewBasicResponse; import go.kr.project.carInspectionPenalty.registration.model.CarFfnlgTrgtVO; /** @@ -14,7 +15,8 @@ public interface ComparisonChecker { * * @param existingData 과태료 대상 데이터 * @param userOrgCd 사용자 조직코드 + * @param step0Response Step 0 API 응답 (차량번호 + 오늘일자로 조회한 기본정보) * @return 처리상태코드 또는 null (미적용) */ - String check(CarFfnlgTrgtVO existingData, String userOrgCd); + String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response); } diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java index 21c142b..aa3810e 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java @@ -36,7 +36,7 @@ public class OwnerCloseWithin31Checker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -44,11 +44,7 @@ public class OwnerCloseWithin31Checker extends AbstractComparisonChecker { try { - log.info("[내사종결-명의이전] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { log.warn("[내사종결-명의이전] Step 0 응답 없음 - 차량번호: {}", vhclno); return null; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java index cd588f1..68620b9 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java @@ -36,7 +36,7 @@ public class OwnerLevyOver31Checker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -44,11 +44,7 @@ public class OwnerLevyOver31Checker extends AbstractComparisonChecker { try { - log.info("[날짜수정후부과-명의이전] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { log.warn("[날짜수정후부과-명의이전] Step 0 응답 없음 - 차량번호: {}", vhclno); return null; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java index 0452c66..198bdc3 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java @@ -36,7 +36,7 @@ public class ProductCloseWithin31Checker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -44,11 +44,7 @@ public class ProductCloseWithin31Checker extends AbstractComparisonChecker { try { - log.info("[내사종결-명의이전 상품용] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { log.warn("[내사종결-명의이전 상품용] Step 0 응답 없음 - 차량번호: {}", vhclno); return null; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java index 1311684..314cda9 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java @@ -36,7 +36,7 @@ public class ProductLevyOver31Checker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -44,11 +44,7 @@ public class ProductLevyOver31Checker extends AbstractComparisonChecker { try { - log.info("[날짜수정후부과-명의이전 상품용] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { log.warn("[날짜수정후부과-명의이전 상품용] Step 0 응답 없음 - 차량번호: {}", vhclno); return null; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java index 4b51517..69cfd0b 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java @@ -36,7 +36,7 @@ public class ProductUseChecker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -44,18 +44,14 @@ public class ProductUseChecker extends AbstractComparisonChecker { try { - log.info("[상품용] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - - if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { - log.warn("[상품용] Step 0 응답 없음 - 차량번호: {}", vhclno); - return null; - } + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 + if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { + log.warn("[상품용] Step 0 응답 없음 - 차량번호: {}", vhclno); + return null; + } - NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); - String step0vin = step0Record.getVin(); // 차대번호 + NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); + String step0vin = step0Record.getVin(); // 차대번호 // ========== Step 1: 자동차기본정보 조회 (차대번호, 부과일자=검사일) ========== log.info("[상품용] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java index d1785dc..7072ae9 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java @@ -36,7 +36,7 @@ public class ProductUseChnageChecker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -44,18 +44,14 @@ public class ProductUseChnageChecker extends AbstractComparisonChecker { try { - log.info("[상품용] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - - if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { - log.warn("[상품용] Step 0 응답 없음 - 차량번호: {}", vhclno); - return null; - } + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 + if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { + log.warn("[상품용-변경등록] Step 0 응답 없음 - 차량번호: {}", vhclno); + return null; + } - NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); - String step0vin = step0Record.getVin(); // 차대번호 + NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); + String step0vin = step0Record.getVin(); // 차대번호 // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== log.info("[상품용-변경등록] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java index 950fc6e..9eae454 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java @@ -33,7 +33,7 @@ public class TransferCase115DayChecker extends AbstractComparisonChecker { } @Override - public String check(CarFfnlgTrgtVO existingData, String userOrgCd) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response) { String vhclno = existingData.getVhclno(); try { @@ -66,18 +66,14 @@ public class TransferCase115DayChecker extends AbstractComparisonChecker { log.info("[이첩-1] 부과기준일 = 검사일자 = {}", levyCrtrYmd); } - log.info("[이첩] Step 0: 자동차기본정보 조회 - 차량번호: {}, 현재일", vhclno); - NewBasicRequest step0Request = createBasicRequest(vhclno, null, LocalDate.now().format(DATE_FORMATTER)); - NewBasicResponse step0Response = apiService.getBasicInfo(step0Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step0Response, existingData.getCarFfnlgTrgtId()); - - if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { - log.warn("[이첩] Step 0 응답 없음 - 차량번호: {}", vhclno); - return null; - } + // Step 0: 공통으로 이미 호출됨 - step0Response 사용 + if (step0Response == null || step0Response.getRecord() == null || step0Response.getRecord().isEmpty()) { + log.warn("[이첩] Step 0 응답 없음 - 차량번호: {}", vhclno); + return null; + } - NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); - String step0vin = step0Record.getVin(); // 차대번호 + NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); + String step0vin = step0Record.getVin(); // 차대번호 // 자동차기본정보 API 호출 (부과기준일 기준) log.info("[{}] 자동차기본정보 조회 - 차대번호: {}, 부과기준일: {}", transferType, step0vin, levyCrtrYmd);