From eb61cd9817f72a720df759f66ad68ab5683140ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= Date: Thu, 6 Nov 2025 21:06:22 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20VMIS=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=20=ED=81=B4=EB=9E=98=EC=8A=A4=EC=97=90=20Vmis=20prefix=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(Bean=20=EC=B6=A9=EB=8F=8C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VO, Service, Mapper 클래스 이름 충돌 문제 해결 ## 문제 - history 패키지와 vmis 패키지에 동일한 이름의 VO 클래스 존재 - CarBassMatterInqireVO, CarLedgerFrmbkVO, CarLedgerFrmbkDtlVO 충돌 - Bean 생성 오류 발생 ## 해결 모든 VMIS 패키지 클래스에 Vmis prefix 추가: ### VO 클래스 (충돌 해결) - CarBassMatterInqireVO → VmisCarBassMatterInqireVO - CarLedgerFrmbkVO → VmisCarLedgerFrmbkVO - CarLedgerFrmbkDtlVO → VmisCarLedgerFrmbkDtlVO ### Service 클래스 - CarBassMatterInqireService → VmisCarBassMatterInqireService - CarBassMatterInqireLogService → VmisCarBassMatterInqireLogService - CarLedgerFrmbkService → VmisCarLedgerFrmbkService - CarLedgerFrmbkLogService → VmisCarLedgerFrmbkLogService - RequestEnricher → VmisRequestEnricher ### Mapper 클래스 - CarBassMatterInqireMapper → VmisCarBassMatterInqireMapper - CarLedgerFrmbkMapper → VmisCarLedgerFrmbkMapper ### MyBatis XML 업데이트 - mapper namespace 및 resultType 변경 - CarBassMatterInqireMapper_maria.xml - CarLedgerFrmbkMapper_maria.xml ## 빌드 성공 확인 ✅ - Bean 충돌 완전 해결 - 전체 컴파일 성공 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .../controller/VehicleInterfaceController.java | 8 ++++---- ...java => VmisCarBassMatterInqireMapper.java} | 10 +++++----- ...pper.java => VmisCarLedgerFrmbkMapper.java} | 14 +++++++------- ...eVO.java => VmisCarBassMatterInqireVO.java} | 12 ++++++------ ...DtlVO.java => VmisCarLedgerFrmbkDtlVO.java} | 8 ++++---- ...rFrmbkVO.java => VmisCarLedgerFrmbkVO.java} | 10 +++++----- .../InternalVehicleInfoServiceImpl.java | 12 ++++++------ ... => VmisCarBassMatterInqireLogService.java} | 12 ++++++------ ...ava => VmisCarBassMatterInqireService.java} | 14 +++++++------- ....java => VmisCarLedgerFrmbkLogService.java} | 18 +++++++++--------- ...ice.java => VmisCarLedgerFrmbkService.java} | 18 +++++++++--------- ...tEnricher.java => VmisRequestEnricher.java} | 4 ++-- .../vmis/CarBassMatterInqireMapper_maria.xml | 8 ++++---- .../mapper/vmis/CarLedgerFrmbkMapper_maria.xml | 10 +++++----- 14 files changed, 79 insertions(+), 79 deletions(-) rename src/main/java/go/kr/project/vmis/mapper/{CarBassMatterInqireMapper.java => VmisCarBassMatterInqireMapper.java} (78%) rename src/main/java/go/kr/project/vmis/mapper/{CarLedgerFrmbkMapper.java => VmisCarLedgerFrmbkMapper.java} (52%) rename src/main/java/go/kr/project/vmis/model/basic/{CarBassMatterInqireVO.java => VmisCarBassMatterInqireVO.java} (96%) rename src/main/java/go/kr/project/vmis/model/ledger/{CarLedgerFrmbkDtlVO.java => VmisCarLedgerFrmbkDtlVO.java} (88%) rename src/main/java/go/kr/project/vmis/model/ledger/{CarLedgerFrmbkVO.java => VmisCarLedgerFrmbkVO.java} (95%) rename src/main/java/go/kr/project/vmis/service/{CarBassMatterInqireLogService.java => VmisCarBassMatterInqireLogService.java} (83%) rename src/main/java/go/kr/project/vmis/service/{CarBassMatterInqireService.java => VmisCarBassMatterInqireService.java} (85%) rename src/main/java/go/kr/project/vmis/service/{CarLedgerFrmbkLogService.java => VmisCarLedgerFrmbkLogService.java} (79%) rename src/main/java/go/kr/project/vmis/service/{CarLedgerFrmbkService.java => VmisCarLedgerFrmbkService.java} (82%) rename src/main/java/go/kr/project/vmis/service/{RequestEnricher.java => VmisRequestEnricher.java} (96%) diff --git a/src/main/java/go/kr/project/vmis/controller/VehicleInterfaceController.java b/src/main/java/go/kr/project/vmis/controller/VehicleInterfaceController.java index aae9853..43a1cb3 100644 --- a/src/main/java/go/kr/project/vmis/controller/VehicleInterfaceController.java +++ b/src/main/java/go/kr/project/vmis/controller/VehicleInterfaceController.java @@ -5,8 +5,8 @@ import go.kr.project.vmis.model.basic.BasicResponse; import go.kr.project.vmis.model.common.Envelope; import go.kr.project.vmis.model.ledger.LedgerRequest; import go.kr.project.vmis.model.ledger.LedgerResponse; -import go.kr.project.vmis.service.CarBassMatterInqireService; -import go.kr.project.vmis.service.CarLedgerFrmbkService; +import go.kr.project.vmis.service.VmisCarBassMatterInqireService; +import go.kr.project.vmis.service.VmisCarLedgerFrmbkService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.ExampleObject; @@ -55,8 +55,8 @@ import org.springframework.web.bind.annotation.*; @Tag(name = "Vehicle Interfaces", description = "시군구연계 자동차 정보 연계 API") public class VehicleInterfaceController { - private final CarBassMatterInqireService carBassMatterInqireService; - private final CarLedgerFrmbkService carLedgerFrmbkService; + private final VmisCarBassMatterInqireService carBassMatterInqireService; + private final VmisCarLedgerFrmbkService carLedgerFrmbkService; /** diff --git a/src/main/java/go/kr/project/vmis/mapper/CarBassMatterInqireMapper.java b/src/main/java/go/kr/project/vmis/mapper/VmisCarBassMatterInqireMapper.java similarity index 78% rename from src/main/java/go/kr/project/vmis/mapper/CarBassMatterInqireMapper.java rename to src/main/java/go/kr/project/vmis/mapper/VmisCarBassMatterInqireMapper.java index 9be1bb4..253a17a 100644 --- a/src/main/java/go/kr/project/vmis/mapper/CarBassMatterInqireMapper.java +++ b/src/main/java/go/kr/project/vmis/mapper/VmisCarBassMatterInqireMapper.java @@ -1,6 +1,6 @@ package go.kr.project.vmis.mapper; -import go.kr.project.vmis.model.basic.CarBassMatterInqireVO; +import go.kr.project.vmis.model.basic.VmisCarBassMatterInqireVO; import org.apache.ibatis.annotations.Mapper; /** @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * */ @Mapper -public interface CarBassMatterInqireMapper { +public interface VmisCarBassMatterInqireMapper { /** * 시퀀스로 새로운 자동차 기본 사항 조회 ID를 생성합니다. @@ -32,7 +32,7 @@ public interface CarBassMatterInqireMapper { * @param carBassMatterInqireVO 요청 정보 * @return 등록된 행 수 */ - int insertCarBassMatterInqire(CarBassMatterInqireVO carBassMatterInqireVO); + int insertCarBassMatterInqire(VmisCarBassMatterInqireVO carBassMatterInqireVO); /** * API 응답 결과를 업데이트합니다. @@ -42,7 +42,7 @@ public interface CarBassMatterInqireMapper { * @param carBassMatterInqireVO 응답 정보 (carBassMatterInqire 필드는 필수) * @return 업데이트된 행 수 */ - int updateCarBassMatterInqire(CarBassMatterInqireVO carBassMatterInqireVO); + int updateCarBassMatterInqire(VmisCarBassMatterInqireVO carBassMatterInqireVO); /** * ID로 조회 정보를 조회합니다. @@ -50,5 +50,5 @@ public interface CarBassMatterInqireMapper { * @param carBassMatterInqire 자동차 기본 사항 조회 ID * @return 조회된 정보 */ - CarBassMatterInqireVO selectCarBassMatterInqireById(String carBassMatterInqire); + VmisCarBassMatterInqireVO selectCarBassMatterInqireById(String carBassMatterInqire); } diff --git a/src/main/java/go/kr/project/vmis/mapper/CarLedgerFrmbkMapper.java b/src/main/java/go/kr/project/vmis/mapper/VmisCarLedgerFrmbkMapper.java similarity index 52% rename from src/main/java/go/kr/project/vmis/mapper/CarLedgerFrmbkMapper.java rename to src/main/java/go/kr/project/vmis/mapper/VmisCarLedgerFrmbkMapper.java index 5f72781..00adb54 100644 --- a/src/main/java/go/kr/project/vmis/mapper/CarLedgerFrmbkMapper.java +++ b/src/main/java/go/kr/project/vmis/mapper/VmisCarLedgerFrmbkMapper.java @@ -1,7 +1,7 @@ package go.kr.project.vmis.mapper; -import go.kr.project.vmis.model.ledger.CarLedgerFrmbkDtlVO; -import go.kr.project.vmis.model.ledger.CarLedgerFrmbkVO; +import go.kr.project.vmis.model.ledger.VmisCarLedgerFrmbkDtlVO; +import go.kr.project.vmis.model.ledger.VmisCarLedgerFrmbkVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,19 +10,19 @@ import java.util.List; * 자동차 등록 원부(갑) Mapper */ @Mapper -public interface CarLedgerFrmbkMapper { +public interface VmisCarLedgerFrmbkMapper { // ID 시퀀스 String selectNextCarLedgerFrmbkId(); String selectNextCarLedgerFrmbkDtlId(); // 마스터 INSERT/UPDATE/SELECT - int insertCarLedgerFrmbk(CarLedgerFrmbkVO vo); - int updateCarLedgerFrmbk(CarLedgerFrmbkVO vo); - CarLedgerFrmbkVO selectCarLedgerFrmbkById(String carLedgerFrmbkId); + int insertCarLedgerFrmbk(VmisCarLedgerFrmbkVO vo); + int updateCarLedgerFrmbk(VmisCarLedgerFrmbkVO vo); + VmisCarLedgerFrmbkVO selectCarLedgerFrmbkById(String carLedgerFrmbkId); // 상세 INSERT (단건) - int insertCarLedgerFrmbkDtl(CarLedgerFrmbkDtlVO vo); + int insertCarLedgerFrmbkDtl(VmisCarLedgerFrmbkDtlVO vo); // 편의: 상세 일괄 (MyBatis foreach를 XML에서 사용할 수도 있으나, 여기서는 단건 호출을 반복) } diff --git a/src/main/java/go/kr/project/vmis/model/basic/CarBassMatterInqireVO.java b/src/main/java/go/kr/project/vmis/model/basic/VmisCarBassMatterInqireVO.java similarity index 96% rename from src/main/java/go/kr/project/vmis/model/basic/CarBassMatterInqireVO.java rename to src/main/java/go/kr/project/vmis/model/basic/VmisCarBassMatterInqireVO.java index c423893..6d742bd 100644 --- a/src/main/java/go/kr/project/vmis/model/basic/CarBassMatterInqireVO.java +++ b/src/main/java/go/kr/project/vmis/model/basic/VmisCarBassMatterInqireVO.java @@ -19,11 +19,11 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -public class CarBassMatterInqireVO { +public class VmisCarBassMatterInqireVO { // ==== Static factory/mapping methods (moved from Service) ==== - public static CarBassMatterInqireVO fromRequest(BasicRequest request) { - return CarBassMatterInqireVO.builder() + public static VmisCarBassMatterInqireVO fromRequest(BasicRequest request) { + return VmisCarBassMatterInqireVO.builder() .infoSysId(request.getInfoSysId()) .infoSysIp(request.getInfoSysIp()) .sigunguCode(request.getSigunguCode()) @@ -39,10 +39,10 @@ public class CarBassMatterInqireVO { .build(); } - public static CarBassMatterInqireVO fromResponse(String id, Envelope envelope) { + public static VmisCarBassMatterInqireVO fromResponse(String id, Envelope envelope) { if (envelope == null || envelope.getData() == null || envelope.getData().isEmpty()) return null; BasicResponse response = envelope.getData().get(0); - CarBassMatterInqireVO.CarBassMatterInqireVOBuilder builder = CarBassMatterInqireVO.builder() + VmisCarBassMatterInqireVO.VmisCarBassMatterInqireVOBuilder builder = VmisCarBassMatterInqireVO.builder() .carBassMatterInqire(id) .cntcResultCode(response.getCntcResultCode()) .cntcResultDtls(response.getCntcResultDtls()); @@ -53,7 +53,7 @@ public class CarBassMatterInqireVO { return builder.build(); } - private static void applyRecord(CarBassMatterInqireVO.CarBassMatterInqireVOBuilder builder, BasicResponse.Record record) { + private static void applyRecord(VmisCarBassMatterInqireVO.VmisCarBassMatterInqireVOBuilder builder, BasicResponse.Record record) { builder .prye(record.getPrye()) // 연식 .registDe(record.getRegistDe()) // 등록일 diff --git a/src/main/java/go/kr/project/vmis/model/ledger/CarLedgerFrmbkDtlVO.java b/src/main/java/go/kr/project/vmis/model/ledger/VmisCarLedgerFrmbkDtlVO.java similarity index 88% rename from src/main/java/go/kr/project/vmis/model/ledger/CarLedgerFrmbkDtlVO.java rename to src/main/java/go/kr/project/vmis/model/ledger/VmisCarLedgerFrmbkDtlVO.java index 722bcb1..60631cd 100644 --- a/src/main/java/go/kr/project/vmis/model/ledger/CarLedgerFrmbkDtlVO.java +++ b/src/main/java/go/kr/project/vmis/model/ledger/VmisCarLedgerFrmbkDtlVO.java @@ -18,14 +18,14 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class CarLedgerFrmbkDtlVO { +public class VmisCarLedgerFrmbkDtlVO { // ==== Static factory/mapping methods (moved from Service) ==== - public static List listFromResponse(LedgerResponse res, String masterId) { - List list = new ArrayList<>(); + public static List listFromResponse(LedgerResponse res, String masterId) { + List list = new ArrayList<>(); if (res == null || res.getRecord() == null) return list; for (LedgerResponse.Record r : res.getRecord()) { - CarLedgerFrmbkDtlVO vo = CarLedgerFrmbkDtlVO.builder() + VmisCarLedgerFrmbkDtlVO vo = VmisCarLedgerFrmbkDtlVO.builder() .carLedgerFrmbkId(masterId) // 원부 마스터 ID (FK) .mainchk(r.getMainchk()) // 주요 체크 .changeJobSeCode(r.getChangeJobSeCode()) // 변경 작업 구분 코드 diff --git a/src/main/java/go/kr/project/vmis/model/ledger/CarLedgerFrmbkVO.java b/src/main/java/go/kr/project/vmis/model/ledger/VmisCarLedgerFrmbkVO.java similarity index 95% rename from src/main/java/go/kr/project/vmis/model/ledger/CarLedgerFrmbkVO.java rename to src/main/java/go/kr/project/vmis/model/ledger/VmisCarLedgerFrmbkVO.java index f760687..4c565c0 100644 --- a/src/main/java/go/kr/project/vmis/model/ledger/CarLedgerFrmbkVO.java +++ b/src/main/java/go/kr/project/vmis/model/ledger/VmisCarLedgerFrmbkVO.java @@ -15,11 +15,11 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class CarLedgerFrmbkVO { +public class VmisCarLedgerFrmbkVO { // ==== Static factory/mapping methods (moved from Service) ==== - public static CarLedgerFrmbkVO fromRequest(go.kr.project.vmis.model.ledger.LedgerRequest request) { - return CarLedgerFrmbkVO.builder() + public static VmisCarLedgerFrmbkVO fromRequest(go.kr.project.vmis.model.ledger.LedgerRequest request) { + return VmisCarLedgerFrmbkVO.builder() .infoSysId(request.getInfoSysId()) .infoSysIp(request.getInfoSysIp()) .sigunguCode(request.getSigunguCode()) @@ -32,8 +32,8 @@ public class CarLedgerFrmbkVO { .build(); } - public static CarLedgerFrmbkVO fromResponseMaster(String id, go.kr.project.vmis.model.ledger.LedgerResponse res) { - return CarLedgerFrmbkVO.builder() + public static VmisCarLedgerFrmbkVO fromResponseMaster(String id, go.kr.project.vmis.model.ledger.LedgerResponse res) { + return VmisCarLedgerFrmbkVO.builder() .carLedgerFrmbkId(id) // 등록원부 ID .cntcResultCode(res.getCntcResultCode()) // 연계 결과 코드 .cntcResultDtls(res.getCntcResultDtls()) // 연계 결과 상세 diff --git a/src/main/java/go/kr/project/vmis/service/InternalVehicleInfoServiceImpl.java b/src/main/java/go/kr/project/vmis/service/InternalVehicleInfoServiceImpl.java index 43ec36e..5abb9a3 100644 --- a/src/main/java/go/kr/project/vmis/service/InternalVehicleInfoServiceImpl.java +++ b/src/main/java/go/kr/project/vmis/service/InternalVehicleInfoServiceImpl.java @@ -37,15 +37,15 @@ import java.util.List; *

처리 흐름:

*
    *
  1. 차량번호를 받아 BasicRequest, LedgerRequest 생성
  2. - *
  3. CarBassMatterInqireService.basic() 호출 (기본정보)
  4. - *
  5. CarLedgerFrmbkService.ledger() 호출 (등록원부)
  6. + *
  7. VmisCarBassMatterInqireService.basic() 호출 (기본정보)
  8. + *
  9. VmisCarLedgerFrmbkService.ledger() 호출 (등록원부)
  10. *
  11. 내부 모델을 외부 VO로 변환 (VehicleResponseMapper 사용)
  12. *
  13. VehicleApiResponseVO로 결과 반환
  14. *
* * @see VehicleInfoService - * @see CarBassMatterInqireService - * @see CarLedgerFrmbkService + * @see VmisCarBassMatterInqireService + * @see VmisCarLedgerFrmbkService */ @Slf4j @Service @@ -53,8 +53,8 @@ import java.util.List; @ConditionalOnProperty(name = "vmis.integration.mode", havingValue = "internal") public class InternalVehicleInfoServiceImpl implements VehicleInfoService { - private final CarBassMatterInqireService carBassMatterInqireService; - private final CarLedgerFrmbkService carLedgerFrmbkService; + private final VmisCarBassMatterInqireService carBassMatterInqireService; + private final VmisCarLedgerFrmbkService carLedgerFrmbkService; @Override public VehicleApiResponseVO getVehicleInfo(String vehicleNumber) { diff --git a/src/main/java/go/kr/project/vmis/service/CarBassMatterInqireLogService.java b/src/main/java/go/kr/project/vmis/service/VmisCarBassMatterInqireLogService.java similarity index 83% rename from src/main/java/go/kr/project/vmis/service/CarBassMatterInqireLogService.java rename to src/main/java/go/kr/project/vmis/service/VmisCarBassMatterInqireLogService.java index 7fedbe7..5345c92 100644 --- a/src/main/java/go/kr/project/vmis/service/CarBassMatterInqireLogService.java +++ b/src/main/java/go/kr/project/vmis/service/VmisCarBassMatterInqireLogService.java @@ -1,7 +1,7 @@ package go.kr.project.vmis.service; -import go.kr.project.vmis.mapper.CarBassMatterInqireMapper; -import go.kr.project.vmis.model.basic.CarBassMatterInqireVO; +import go.kr.project.vmis.mapper.VmisCarBassMatterInqireMapper; +import go.kr.project.vmis.model.basic.VmisCarBassMatterInqireVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,9 +17,9 @@ import org.springframework.transaction.annotation.Transactional; @Slf4j @Service @RequiredArgsConstructor -public class CarBassMatterInqireLogService { +public class VmisCarBassMatterInqireLogService { - private final CarBassMatterInqireMapper carBassMatterInqireMapper; + private final VmisCarBassMatterInqireMapper carBassMatterInqireMapper; /** * 최초 API 요청 정보를 등록한다. (REQUIRES_NEW) @@ -27,7 +27,7 @@ public class CarBassMatterInqireLogService { * @return 생성된 ID */ @Transactional(propagation = Propagation.REQUIRES_NEW) - public String createInitialRequestNewTx(CarBassMatterInqireVO request) { + public String createInitialRequestNewTx(VmisCarBassMatterInqireVO request) { String generatedId = carBassMatterInqireMapper.selectNextCarBassMatterInqireId(); request.setCarBassMatterInqire(generatedId); int result = carBassMatterInqireMapper.insertCarBassMatterInqire(request); @@ -43,7 +43,7 @@ public class CarBassMatterInqireLogService { * @param response 업데이트 내용 */ @Transactional(propagation = Propagation.REQUIRES_NEW) - public void updateResponseNewTx(CarBassMatterInqireVO response) { + public void updateResponseNewTx(VmisCarBassMatterInqireVO response) { if (response.getCarBassMatterInqire() == null) { throw new IllegalArgumentException("자동차 기본 사항 조회 ID는 필수입니다."); } diff --git a/src/main/java/go/kr/project/vmis/service/CarBassMatterInqireService.java b/src/main/java/go/kr/project/vmis/service/VmisCarBassMatterInqireService.java similarity index 85% rename from src/main/java/go/kr/project/vmis/service/CarBassMatterInqireService.java rename to src/main/java/go/kr/project/vmis/service/VmisCarBassMatterInqireService.java index 4051f95..cedd622 100644 --- a/src/main/java/go/kr/project/vmis/service/CarBassMatterInqireService.java +++ b/src/main/java/go/kr/project/vmis/service/VmisCarBassMatterInqireService.java @@ -5,7 +5,7 @@ import go.kr.project.vmis.config.ApiConstant; import go.kr.project.vmis.util.ExceptionDetailUtil; import go.kr.project.vmis.model.basic.BasicRequest; import go.kr.project.vmis.model.basic.BasicResponse; -import go.kr.project.vmis.model.basic.CarBassMatterInqireVO; +import go.kr.project.vmis.model.basic.VmisCarBassMatterInqireVO; import go.kr.project.vmis.model.common.Envelope; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -25,11 +25,11 @@ import org.springframework.transaction.annotation.Transactional; @Slf4j @Service @RequiredArgsConstructor -public class CarBassMatterInqireService { +public class VmisCarBassMatterInqireService { private final GovernmentApi governmentApi; - private final RequestEnricher enricher; - private final CarBassMatterInqireLogService logService; + private final VmisRequestEnricher enricher; + private final VmisCarBassMatterInqireLogService logService; @@ -47,7 +47,7 @@ public class CarBassMatterInqireService { // 2) 최초 요청 로그 저장 (첫 번째 데이터 기준) if (envelope.getData() != null && !envelope.getData().isEmpty()) { BasicRequest req = envelope.getData().get(0); - CarBassMatterInqireVO logEntity = CarBassMatterInqireVO.fromRequest(req); + VmisCarBassMatterInqireVO logEntity = VmisCarBassMatterInqireVO.fromRequest(req); generatedId = logService.createInitialRequestNewTx(logEntity); } @@ -57,7 +57,7 @@ public class CarBassMatterInqireService { // 4) 응답 로그 업데이트 // 원본 소스, 정상적인 호출, 리턴(에러 리턴포함) 일 경우에만 에러 로그 남김 if (generatedId != null && response.getBody() != null) { - CarBassMatterInqireVO update = CarBassMatterInqireVO.fromResponse(generatedId, response.getBody()); + VmisCarBassMatterInqireVO update = VmisCarBassMatterInqireVO.fromResponse(generatedId, response.getBody()); if (update != null) { logService.updateResponseNewTx(update); } @@ -69,7 +69,7 @@ public class CarBassMatterInqireService { if (generatedId != null) { try { String detail = ExceptionDetailUtil.buildForLog(e); - CarBassMatterInqireVO errorLog = CarBassMatterInqireVO.builder() + VmisCarBassMatterInqireVO errorLog = VmisCarBassMatterInqireVO.builder() .carBassMatterInqire(generatedId) // 자동차기본사항조회 ID (PK) .cntcResultCode(ApiConstant.CNTC_RESULT_CODE_ERROR) // 연계결과코드 (에러) .cntcResultDtls(detail) // 연계결과상세 (에러 메시지) diff --git a/src/main/java/go/kr/project/vmis/service/CarLedgerFrmbkLogService.java b/src/main/java/go/kr/project/vmis/service/VmisCarLedgerFrmbkLogService.java similarity index 79% rename from src/main/java/go/kr/project/vmis/service/CarLedgerFrmbkLogService.java rename to src/main/java/go/kr/project/vmis/service/VmisCarLedgerFrmbkLogService.java index 2b4a2dd..c42c7b6 100644 --- a/src/main/java/go/kr/project/vmis/service/CarLedgerFrmbkLogService.java +++ b/src/main/java/go/kr/project/vmis/service/VmisCarLedgerFrmbkLogService.java @@ -1,8 +1,8 @@ package go.kr.project.vmis.service; -import go.kr.project.vmis.mapper.CarLedgerFrmbkMapper; -import go.kr.project.vmis.model.ledger.CarLedgerFrmbkDtlVO; -import go.kr.project.vmis.model.ledger.CarLedgerFrmbkVO; +import go.kr.project.vmis.mapper.VmisCarLedgerFrmbkMapper; +import go.kr.project.vmis.model.ledger.VmisCarLedgerFrmbkDtlVO; +import go.kr.project.vmis.model.ledger.VmisCarLedgerFrmbkVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -18,12 +18,12 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class CarLedgerFrmbkLogService { +public class VmisCarLedgerFrmbkLogService { - private final CarLedgerFrmbkMapper mapper; + private final VmisCarLedgerFrmbkMapper mapper; @Transactional(propagation = Propagation.REQUIRES_NEW) - public String createInitialRequestNewTx(CarLedgerFrmbkVO request) { + public String createInitialRequestNewTx(VmisCarLedgerFrmbkVO request) { String id = mapper.selectNextCarLedgerFrmbkId(); request.setCarLedgerFrmbkId(id); int result = mapper.insertCarLedgerFrmbk(request); @@ -35,7 +35,7 @@ public class CarLedgerFrmbkLogService { } @Transactional(propagation = Propagation.REQUIRES_NEW) - public void updateResponseNewTx(CarLedgerFrmbkVO response) { + public void updateResponseNewTx(VmisCarLedgerFrmbkVO response) { if (response.getCarLedgerFrmbkId() == null) { throw new IllegalArgumentException("자동차 등록 원부(갑) ID는 필수입니다."); } @@ -48,9 +48,9 @@ public class CarLedgerFrmbkLogService { } @Transactional(propagation = Propagation.REQUIRES_NEW) - public void saveDetailsNewTx(String masterId, List details) { + public void saveDetailsNewTx(String masterId, List details) { if (details == null || details.isEmpty()) return; - for (CarLedgerFrmbkDtlVO dtl : details) { + for (VmisCarLedgerFrmbkDtlVO dtl : details) { String dtlId = mapper.selectNextCarLedgerFrmbkDtlId(); dtl.setCarLedgerFrmbkDtlId(dtlId); dtl.setCarLedgerFrmbkId(masterId); diff --git a/src/main/java/go/kr/project/vmis/service/CarLedgerFrmbkService.java b/src/main/java/go/kr/project/vmis/service/VmisCarLedgerFrmbkService.java similarity index 82% rename from src/main/java/go/kr/project/vmis/service/CarLedgerFrmbkService.java rename to src/main/java/go/kr/project/vmis/service/VmisCarLedgerFrmbkService.java index e2b9cc7..edf7c6f 100644 --- a/src/main/java/go/kr/project/vmis/service/CarLedgerFrmbkService.java +++ b/src/main/java/go/kr/project/vmis/service/VmisCarLedgerFrmbkService.java @@ -3,8 +3,8 @@ package go.kr.project.vmis.service; import go.kr.project.vmis.client.GovernmentApi; import go.kr.project.vmis.config.ApiConstant; import go.kr.project.vmis.model.common.Envelope; -import go.kr.project.vmis.model.ledger.CarLedgerFrmbkDtlVO; -import go.kr.project.vmis.model.ledger.CarLedgerFrmbkVO; +import go.kr.project.vmis.model.ledger.VmisCarLedgerFrmbkDtlVO; +import go.kr.project.vmis.model.ledger.VmisCarLedgerFrmbkVO; import go.kr.project.vmis.model.ledger.LedgerRequest; import go.kr.project.vmis.model.ledger.LedgerResponse; import go.kr.project.vmis.util.ExceptionDetailUtil; @@ -23,11 +23,11 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class CarLedgerFrmbkService { +public class VmisCarLedgerFrmbkService { private final GovernmentApi governmentApi; - private final RequestEnricher enricher; - private final CarLedgerFrmbkLogService logService; + private final VmisRequestEnricher enricher; + private final VmisCarLedgerFrmbkLogService logService; /** * 자동차 등록원부(갑) 조회: 보강 -> 최초요청로그(별도TX) -> 외부호출 -> 응답로그(마스터/상세, 별도TX) -> 오류 시 에러로그(별도TX). @@ -42,7 +42,7 @@ public class CarLedgerFrmbkService { // 2) 최초 요청 로그 저장 (첫 번째 데이터 기준) if (envelope.getData() != null && !envelope.getData().isEmpty()) { LedgerRequest req = envelope.getData().get(0); - CarLedgerFrmbkVO init = CarLedgerFrmbkVO.fromRequest(req); + VmisCarLedgerFrmbkVO init = VmisCarLedgerFrmbkVO.fromRequest(req); generatedId = logService.createInitialRequestNewTx(init); } @@ -53,10 +53,10 @@ public class CarLedgerFrmbkService { if (generatedId != null && response.getBody() != null && response.getBody().getData() != null && !response.getBody().getData().isEmpty()) { LedgerResponse body = response.getBody().getData().get(0); - CarLedgerFrmbkVO masterUpdate = CarLedgerFrmbkVO.fromResponseMaster(generatedId, body); + VmisCarLedgerFrmbkVO masterUpdate = VmisCarLedgerFrmbkVO.fromResponseMaster(generatedId, body); logService.updateResponseNewTx(masterUpdate); - List details = CarLedgerFrmbkDtlVO.listFromResponse(body, generatedId); + List details = VmisCarLedgerFrmbkDtlVO.listFromResponse(body, generatedId); if (details != null && !details.isEmpty()) { logService.saveDetailsNewTx(generatedId, details); } @@ -68,7 +68,7 @@ public class CarLedgerFrmbkService { if (generatedId != null) { try { String detail = ExceptionDetailUtil.buildForLog(e); - CarLedgerFrmbkVO errorLog = CarLedgerFrmbkVO.builder() + VmisCarLedgerFrmbkVO errorLog = VmisCarLedgerFrmbkVO.builder() .carLedgerFrmbkId(generatedId) .cntcResultCode(ApiConstant.CNTC_RESULT_CODE_ERROR) .cntcResultDtls(detail) diff --git a/src/main/java/go/kr/project/vmis/service/RequestEnricher.java b/src/main/java/go/kr/project/vmis/service/VmisRequestEnricher.java similarity index 96% rename from src/main/java/go/kr/project/vmis/service/RequestEnricher.java rename to src/main/java/go/kr/project/vmis/service/VmisRequestEnricher.java index ef0f37f..ab43670 100644 --- a/src/main/java/go/kr/project/vmis/service/RequestEnricher.java +++ b/src/main/java/go/kr/project/vmis/service/VmisRequestEnricher.java @@ -17,11 +17,11 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Component -public class RequestEnricher { +public class VmisRequestEnricher { private final VmisProperties props; - public RequestEnricher(VmisProperties props) { + public VmisRequestEnricher(VmisProperties props) { this.props = props; } diff --git a/src/main/resources/mybatis/mapper/vmis/CarBassMatterInqireMapper_maria.xml b/src/main/resources/mybatis/mapper/vmis/CarBassMatterInqireMapper_maria.xml index a322e25..e576e0e 100644 --- a/src/main/resources/mybatis/mapper/vmis/CarBassMatterInqireMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/vmis/CarBassMatterInqireMapper_maria.xml @@ -2,7 +2,7 @@ - + - + INSERT INTO tb_car_bass_matter_inqire ( CAR_BASS_MATTER_INQIRE, INFO_SYS_ID, @@ -45,7 +45,7 @@ - + UPDATE tb_car_bass_matter_inqire CNTC_RESULT_CODE = #{cntcResultCode}, @@ -139,7 +139,7 @@ - SELECT * FROM tb_car_bass_matter_inqire WHERE CAR_BASS_MATTER_INQIRE = #{carBassMatterInqire} diff --git a/src/main/resources/mybatis/mapper/vmis/CarLedgerFrmbkMapper_maria.xml b/src/main/resources/mybatis/mapper/vmis/CarLedgerFrmbkMapper_maria.xml index ae829a0..855cdf2 100644 --- a/src/main/resources/mybatis/mapper/vmis/CarLedgerFrmbkMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/vmis/CarLedgerFrmbkMapper_maria.xml @@ -2,7 +2,7 @@ - + - + INSERT INTO tb_car_ledger_frmbk ( CAR_LEDGER_FRMBK_ID, INFO_SYS_ID, @@ -57,7 +57,7 @@ - + UPDATE tb_car_ledger_frmbk CNTC_RESULT_CODE = #{cntcResultCode}, @@ -128,7 +128,7 @@ - + INSERT INTO tb_car_ledger_frmbk_dtl ( CAR_LEDGER_FRMBK_DTL_ID, CAR_LEDGER_FRMBK_ID, @@ -169,7 +169,7 @@ - SELECT * FROM tb_car_ledger_frmbk WHERE CAR_LEDGER_FRMBK_ID = #{carLedgerFrmbkId}