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 0cc1465..c919675 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 @@ -85,50 +85,71 @@ public class ComparisonServiceImpl extends EgovAbstractServiceImpl implements Co return null; } + // ========== Step 1: 자동차기본정보 조회 (차대번호 + 검사일) - 한번만 호출 ========== + String step0vin = step0Response.getRecord().get(0).getVin(); + String inspYmd = existingData.getInspYmd().replace("-", ""); + log.info("[공통] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); + NewBasicResponse step1Response = null; + try { + NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); + step1Response = apiService.getBasicInfo(step1Request); + bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); + + if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { + log.warn("[공통] Step 1 응답 없음 - 차대번호: {}", step0vin); + log.info("========== 비교 로직 종료 (Step 1 응답 없음): {} ==========", vhclno); + return null; + } + } catch (Exception e) { + log.error("[공통] Step 1 호출 중 오류 발생 - 차대번호: {}", step0vin, e); + log.info("========== 비교 로직 종료 (Step 1 오류): {} ==========", vhclno); + return null; + } + // ========== 1. 상품용 체크 - api-1번호출.소유자명.contains("상품용") ========== - String productUseResult = productUseChecker.check(existingData, userOrgCd, step0Response); + String productUseResult = productUseChecker.check(existingData, userOrgCd, step0Response, step1Response); if (productUseResult != null) { log.info("========== 비교 로직 종료 (상품용): {} ==========", vhclno); return productUseResult; } // ========== 2. 상품용 체크 - api-1번호출.소유자명.contains("상품용-변경등록") ========== - String productUseChangeResult = productUseChnageChecker.check(existingData, userOrgCd, step0Response); + String productUseChangeResult = productUseChnageChecker.check(existingData, userOrgCd, step0Response, step1Response); if (productUseChangeResult != null) { log.info("========== 비교 로직 종료 (상품용-변경등록): {} ==========", vhclno); return productUseChangeResult; } // ========== 3. 내사종결 체크 - 명의이전 이전소유자 상품용, 31일 이내 ========== - String investigationClosedByProductResult = productCloseWithin31Checker.check(existingData, userOrgCd, step0Response); + String investigationClosedByProductResult = productCloseWithin31Checker.check(existingData, userOrgCd, step0Response, step1Response); if (investigationClosedByProductResult != null) { log.info("========== 비교 로직 종료 (내사종결 - 명의이전 이전소유자 상품용, 31일 이내): {} ==========", vhclno); return investigationClosedByProductResult; } // ========== 4. 내사종결 체크 - 명의이전, 31일 이내 ========== - String investigationClosedByOwnerChangeResult = ownerCloseWithin31Checker.check(existingData, userOrgCd, step0Response); + String investigationClosedByOwnerChangeResult = ownerCloseWithin31Checker.check(existingData, userOrgCd, step0Response, step1Response); if (investigationClosedByOwnerChangeResult != null) { log.info("========== 비교 로직 종료 (내사종결 - 명의이전, 31일 이내): {} ==========", vhclno); return investigationClosedByOwnerChangeResult; } // ========== 5. 이첩 체크 ========== - String transferResult = transferCase115DayChecker.check(existingData, userOrgCd, step0Response); + String transferResult = transferCase115DayChecker.check(existingData, userOrgCd, step0Response, step1Response); if (transferResult != null) { log.info("========== 비교 로직 종료 (이첩): {} ==========", vhclno); return transferResult; } // ========== 6. 날짜 수정 후 부과 체크 - 명의이전 이전소유자 상품용, 31일 초과 ========== - String dateModifiedLevyByProductResult = productLevyOver31Checker.check(existingData, userOrgCd, step0Response); + String dateModifiedLevyByProductResult = productLevyOver31Checker.check(existingData, userOrgCd, step0Response, step1Response); if (dateModifiedLevyByProductResult != null) { log.info("========== 비교 로직 종료 (날짜 수정 후 부과 - 명의이전 이전소유자, 31일 초과): {} ==========", vhclno); return dateModifiedLevyByProductResult; } // ========== 7. 날짜 수정 후 부과 체크 - 명의이전, 31일 초과 ========== - String dateModifiedLevyByOwnerChangeOverResult = ownerLevyOver31Checker.check(existingData, userOrgCd, step0Response); + String dateModifiedLevyByOwnerChangeOverResult = ownerLevyOver31Checker.check(existingData, userOrgCd, step0Response, step1Response); if (dateModifiedLevyByOwnerChangeOverResult != null) { log.info("========== 비교 로직 종료 (날짜 수정 후 부과 - 명의이전, 31일 초과): {} ==========", vhclno); return dateModifiedLevyByOwnerChangeOverResult; 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 a9bdb21..eb0cd16 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 @@ -16,7 +16,8 @@ public interface ComparisonChecker { * @param existingData 과태료 대상 데이터 * @param userOrgCd 사용자 조직코드 * @param step0Response Step 0 API 응답 (차량번호 + 오늘일자로 조회한 기본정보) + * @param step1Response Step 1 API 응답 (차대번호 + 검사일로 조회한 기본정보) * @return 처리상태코드 또는 null (미적용) */ - String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response); + String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response); } 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 aa3810e..c19d908 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -53,13 +53,7 @@ public class OwnerCloseWithin31Checker extends AbstractComparisonChecker { NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); String step0vin = step0Record.getVin(); // 차대번호 - // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== - log.info("[내사종결-명의이전] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); - - NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); - NewBasicResponse step1Response = apiService.getBasicInfo(step1Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); - + // Step 1: 공통으로 이미 호출됨 - step1Response 사용 if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { log.warn("[내사종결-명의이전] Step 1 응답 없음 - 차량번호: {}", 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 68620b9..19f314f 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -53,13 +53,7 @@ public class OwnerLevyOver31Checker extends AbstractComparisonChecker { NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); String step0vin = step0Record.getVin(); // 차대번호 - // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== - log.info("[날짜수정후부과-명의이전] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); - - NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); - NewBasicResponse step1Response = apiService.getBasicInfo(step1Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); - + // Step 1: 공통으로 이미 호출됨 - step1Response 사용 if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { log.warn("[날짜수정후부과-명의이전] Step 1 응답 없음 - 차량번호: {}", 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 198bdc3..fa6b4d1 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -53,13 +53,7 @@ public class ProductCloseWithin31Checker extends AbstractComparisonChecker { NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); String step0vin = step0Record.getVin(); // 차대번호 - // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== - log.info("[내사종결-명의이전 상품용] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); - - NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); - NewBasicResponse step1Response = apiService.getBasicInfo(step1Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); - + // Step 1: 공통으로 이미 호출됨 - step1Response 사용 if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { log.warn("[내사종결-명의이전 상품용] Step 1 응답 없음 - 차량번호: {}", 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 314cda9..79072da 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -53,13 +53,7 @@ public class ProductLevyOver31Checker extends AbstractComparisonChecker { NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); String step0vin = step0Record.getVin(); // 차대번호 - // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== - log.info("[날짜수정후부과-명의이전 상품용] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); - - NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); - NewBasicResponse step1Response = apiService.getBasicInfo(step1Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); - + // Step 1: 공통으로 이미 호출됨 - step1Response 사용 if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { log.warn("[날짜수정후부과-명의이전 상품용] Step 1 응답 없음 - 차량번호: {}", 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 69cfd0b..14972bf 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -53,13 +53,7 @@ public class ProductUseChecker extends AbstractComparisonChecker { NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); String step0vin = step0Record.getVin(); // 차대번호 - // ========== Step 1: 자동차기본정보 조회 (차대번호, 부과일자=검사일) ========== - log.info("[상품용] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); - - NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); - NewBasicResponse step1Response = apiService.getBasicInfo(step1Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); - + // Step 1: 공통으로 이미 호출됨 - step1Response 사용 if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { log.warn("[상품용] Step 1 응답 없음 - 차량번호: {}", vhclno); return null; 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 7072ae9..2165949 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); String inspYmd = existingData.getInspYmd().replace("-", ""); String vldPrdExpryYmd = existingData.getVldPrdExpryYmd().replace("-", ""); @@ -53,13 +53,7 @@ public class ProductUseChnageChecker extends AbstractComparisonChecker { NewBasicResponse.Record step0Record = step0Response.getRecord().get(0); String step0vin = step0Record.getVin(); // 차대번호 - // ========== Step 1: 자동차기본정보 조회 (차량번호, 부과일자=검사일) ========== - log.info("[상품용-변경등록] Step 1: 자동차기본정보 조회 - 차대번호: {}, 검사일: {}", step0vin, inspYmd); - - NewBasicRequest step1Request = createBasicRequest(null, step0vin, inspYmd); - NewBasicResponse step1Response = apiService.getBasicInfo(step1Request); - bassMatterLogService.updateCarFfnlgTrgtIdByTxIdNewTx(step1Response, existingData.getCarFfnlgTrgtId()); - + // Step 1: 공통으로 이미 호출됨 - step1Response 사용 if (step1Response == null || step1Response.getRecord() == null || step1Response.getRecord().isEmpty()) { log.warn("[상품용-변경등록] Step 1 응답 없음 - 차량번호: {}", vhclno); return null; 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 9eae454..f49645b 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, NewBasicResponse step0Response) { + public String check(CarFfnlgTrgtVO existingData, String userOrgCd, NewBasicResponse step0Response, NewBasicResponse step1Response) { String vhclno = existingData.getVhclno(); try { diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registrationOm/service/impl/ComparisonOmServiceImpl.java b/src/main/java/go/kr/project/carInspectionPenalty/registrationOm/service/impl/ComparisonOmServiceImpl.java index 1be8ab5..e5fba52 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registrationOm/service/impl/ComparisonOmServiceImpl.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registrationOm/service/impl/ComparisonOmServiceImpl.java @@ -47,20 +47,20 @@ public class ComparisonOmServiceImpl extends EgovAbstractServiceImpl implements return productUseResult; } - // ========== 2. 명의이전 소유자 확인 (검사유효기간 종료일 이후 명의이전) ========== - String ownerTransferResult = ownerTransferOmChecker.check(existingData, userOrgCd); - if (ownerTransferResult != null) { - log.info("========== 미필 비교 로직 종료 (명의이전 소유자 확인): {} ==========", vhclno); - return ownerTransferResult; - } - - // ========== 3. 이첩 체크 ========== + // ========== 2. 이첩 체크 ========== String transferResult = transferOmChecker.check(existingData, userOrgCd); if (transferResult != null) { log.info("========== 미필 비교 로직 종료 (이첩): {} ==========", vhclno); return transferResult; } + // ========== 3. 명의이전 소유자 확인 (검사유효기간 종료일 이후 명의이전) ========== + String ownerTransferResult = ownerTransferOmChecker.check(existingData, userOrgCd); + if (ownerTransferResult != null) { + log.info("========== 미필 비교 로직 종료 (명의이전 소유자 확인): {} ==========", vhclno); + return ownerTransferResult; + } + log.info("========== 미필 비교 로직 종료 (미적용): {} ==========", vhclno); return null; }