diff --git a/DB/DDL/vips/tb_car_bass_matter_inqire.sql b/DB/DDL/vips/tb_car_bass_matter_inqire.sql index 2590d46..859afcb 100644 --- a/DB/DDL/vips/tb_car_bass_matter_inqire.sql +++ b/DB/DDL/vips/tb_car_bass_matter_inqire.sql @@ -1,6 +1,6 @@ create table tb_car_bass_matter_inqire ( - CAR_BASS_MATTER_INQIRE varchar(20) not null comment '자동차 기본 사항 조회 ID' + CAR_BASS_MATTER_INQIRE_ID varchar(20) not null comment '자동차 기본 사항 조회 ID' primary key, INFO_SYS_ID varchar(6) null comment '정보 시스템 ID', INFO_SYS_IP varchar(23) null comment '정보 시스템 IP', @@ -52,7 +52,7 @@ create table tb_car_bass_matter_inqire PRPOS_SE_CODE varchar(2) null comment '용도 구분 코드', MTRS_FOM_NM varchar(75) null comment '원동기 형식명', FRNT_VHRNO varchar(30) null comment '이전 차량번호', - VHCLNO varchar(30) null comment '차량번호', + VHRNO varchar(30) null comment '차량번호', VIN varchar(17) null comment '차대번호', CNM varchar(75) null comment '차명', VHCLE_TOT_WT varchar(6) null comment '차량 총 중량', diff --git a/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireLogServiceImpl.java b/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireLogServiceImpl.java index fdb3ecd..7632d37 100644 --- a/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireLogServiceImpl.java +++ b/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireLogServiceImpl.java @@ -31,7 +31,7 @@ public class VmisCarBassMatterInqireLogServiceImpl implements VmisCarBassMatterI @Transactional(propagation = Propagation.REQUIRES_NEW) public String createInitialRequestNewTx(VmisCarBassMatterInqireVO request) { String generatedId = carBassMatterInqireMapper.selectNextCarBassMatterInqireId(); - request.setCarBassMatterInqire(generatedId); + request.setCarBassMatterInqireId(generatedId); int result = carBassMatterInqireMapper.insertCarBassMatterInqire(request); if (result != 1) { throw new RuntimeException("자동차 기본 사항 조회 정보 등록 실패"); @@ -47,13 +47,13 @@ public class VmisCarBassMatterInqireLogServiceImpl implements VmisCarBassMatterI @Override @Transactional(propagation = Propagation.REQUIRES_NEW) public void updateResponseNewTx(VmisCarBassMatterInqireVO response) { - if (response.getCarBassMatterInqire() == null) { + if (response.getCarBassMatterInqireId() == null) { throw new IllegalArgumentException("자동차 기본 사항 조회 ID는 필수입니다."); } int result = carBassMatterInqireMapper.updateCarBassMatterInqire(response); if (result != 1) { - throw new RuntimeException("자동차 기본 사항 조회 정보 업데이트 실패 - ID: " + response.getCarBassMatterInqire()); + throw new RuntimeException("자동차 기본 사항 조회 정보 업데이트 실패 - ID: " + response.getCarBassMatterInqireId()); } - log.info("[BASIC-RES-LOG] 응답/에러 정보 저장 완료(별도TX) - ID: {}, 결과코드: {}", response.getCarBassMatterInqire(), response.getCntcResultCode()); + log.info("[BASIC-RES-LOG] 응답/에러 정보 저장 완료(별도TX) - ID: {}, 결과코드: {}", response.getCarBassMatterInqireId(), response.getCntcResultCode()); } } diff --git a/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireServiceImpl.java b/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireServiceImpl.java index b0f30b6..0b82e79 100644 --- a/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireServiceImpl.java +++ b/src/main/java/go/kr/project/api/internal/service/impl/VmisCarBassMatterInqireServiceImpl.java @@ -71,7 +71,7 @@ public class VmisCarBassMatterInqireServiceImpl implements VmisCarBassMatterInqi try { String detail = ExceptionDetailUtil.buildForLog(e); VmisCarBassMatterInqireVO errorLog = VmisCarBassMatterInqireVO.builder() - .carBassMatterInqire(generatedId) // 자동차기본사항조회 ID (PK) + .carBassMatterInqireId(generatedId) // 자동차기본사항조회 ID (PK) .cntcResultCode(ApiConstant.CNTC_RESULT_CODE_ERROR) // 연계결과코드 (에러) .cntcResultDtls(detail) // 연계결과상세 (에러 메시지) .build(); diff --git a/src/main/java/go/kr/project/api/model/response/VmisCarBassMatterInqireVO.java b/src/main/java/go/kr/project/api/model/response/VmisCarBassMatterInqireVO.java index d099837..bc4aaee 100644 --- a/src/main/java/go/kr/project/api/model/response/VmisCarBassMatterInqireVO.java +++ b/src/main/java/go/kr/project/api/model/response/VmisCarBassMatterInqireVO.java @@ -44,7 +44,7 @@ public class VmisCarBassMatterInqireVO { if (envelope == null || envelope.getData() == null || envelope.getData().isEmpty()) return null; BasicResponse response = envelope.getData().get(0); VmisCarBassMatterInqireVO.VmisCarBassMatterInqireVOBuilder builder = VmisCarBassMatterInqireVO.builder() - .carBassMatterInqire(id) + .carBassMatterInqireId(id) .cntcResultCode(response.getCntcResultCode()) .cntcResultDtls(response.getCntcResultDtls()); if (response.getRecord() != null && !response.getRecord().isEmpty()) { @@ -94,7 +94,7 @@ public class VmisCarBassMatterInqireVO { .prposSeCode(record.getPrposSeCode()) // 용도 구분 코드 .mtrsFomNm(record.getMtrsFomNm()) // 원동기 형식명 .frntVhrno(record.getFrntVhrno()) // 이전 차량번호 - .vhclno(record.getVhrno()) // 차량번호 + .vhrno(record.getVhrno()) // 차량번호 .vin(record.getVin()) // 차대번호 .cnm(record.getCnm()) // 차명 .vhcleTotWt(record.getVhcleTotWt()) // 차량 총 중량 @@ -146,7 +146,7 @@ public class VmisCarBassMatterInqireVO { * 자동차 기본 사항 조회 ID (PK) * 형식: CBMI000000000001 */ - private String carBassMatterInqire; + private String carBassMatterInqireId; // ===== 요청 정보 ===== /** @@ -403,7 +403,7 @@ public class VmisCarBassMatterInqireVO { /** * 차량번호 */ - private String vhclno; + private String vhrno; /** * 차대번호 diff --git a/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java b/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java index b096882..d81eb34 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java @@ -25,7 +25,7 @@ import java.time.LocalDateTime; public class CarBassMatterInqireVO { /** 자동차 기본 사항 조회 ID */ - private String carBassMatterInqire; + private String carBassMatterInqireId; /** 정보 시스템 ID */ private String infoSysId; @@ -178,7 +178,7 @@ public class CarBassMatterInqireVO { private String frntVhrno; /** 차량번호 */ - private String vhclno; + private String vhrno; /** 차대번호 */ private String vin; diff --git a/src/main/resources/mybatis/mapper/api-internal/CarBassMatterInqireMapper_maria.xml b/src/main/resources/mybatis/mapper/api-internal/CarBassMatterInqireMapper_maria.xml index bf98eb3..4c2faad 100644 --- a/src/main/resources/mybatis/mapper/api-internal/CarBassMatterInqireMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/api-internal/CarBassMatterInqireMapper_maria.xml @@ -12,7 +12,7 @@ INSERT INTO tb_car_bass_matter_inqire ( - CAR_BASS_MATTER_INQIRE, + CAR_BASS_MATTER_INQIRE_ID, INFO_SYS_ID, INFO_SYS_IP, SIGUNGU_CODE, @@ -27,7 +27,7 @@ REG_DT, RGTR ) VALUES ( - #{carBassMatterInqire}, + #{carBassMatterInqireId}, #{infoSysId}, #{infoSysIp}, #{sigunguCode}, @@ -87,7 +87,7 @@ PRPOS_SE_CODE = #{prposSeCode}, MTRS_FOM_NM = #{mtrsFomNm}, FRNT_VHRNO = #{frntVhrno}, - VHCLNO = #{vhclno}, + VHRNO = #{vhrno}, VIN = #{vin}, CNM = #{cnm}, VHCLE_TOT_WT = #{vhcleTotWt}, @@ -135,14 +135,14 @@ ELCTY_CMPND_FUEL_CNSMP_RT = #{elctyCmpndFuelCnsmpRt}, MBER_NM = #{mberNm}, - WHERE CAR_BASS_MATTER_INQIRE = #{carBassMatterInqire} + WHERE CAR_BASS_MATTER_INQIRE_ID = #{carBassMatterInqireId} diff --git a/src/main/resources/mybatis/mapper/carInspectionPenalty/VehicleApiHistoryMapper_maria.xml b/src/main/resources/mybatis/mapper/carInspectionPenalty/VehicleApiHistoryMapper_maria.xml index b817ce9..5b9b374 100644 --- a/src/main/resources/mybatis/mapper/carInspectionPenalty/VehicleApiHistoryMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/carInspectionPenalty/VehicleApiHistoryMapper_maria.xml @@ -9,7 +9,7 @@ SELECT * FROM tb_car_bass_matter_inqire - WHERE CAR_BASS_MATTER_INQIRE = #{carBassMatterInqire} + WHERE CAR_BASS_MATTER_INQIRE_ID = #{carBassMatterInqireId} diff --git a/src/main/webapp/WEB-INF/views/carInspectionPenalty/callApi/inquiry.jsp b/src/main/webapp/WEB-INF/views/carInspectionPenalty/callApi/inquiry.jsp index 544bc5a..2e3e63d 100644 --- a/src/main/webapp/WEB-INF/views/carInspectionPenalty/callApi/inquiry.jsp +++ b/src/main/webapp/WEB-INF/views/carInspectionPenalty/callApi/inquiry.jsp @@ -385,7 +385,7 @@ displayBasicResult: function(data) { var html = ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; html += ''; diff --git a/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp b/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp index 247ac5c..d216e03 100644 --- a/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp +++ b/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp @@ -317,7 +317,7 @@ return totalCount - (page - 1) * perPage - rowIndex; } }, - { header: '조회ID', name: 'carBassMatterInqire', align: 'center', width: 150, hidden: true }, + { header: '조회ID', name: 'carBassMatterInqireId', align: 'center', width: 150, hidden: true }, { header: '정보시스템ID', name: 'infoSysId', align: 'center', width: 120 }, { header: '정보시스템IP', name: 'infoSysIp', align: 'center', width: 120 }, { header: '시군구코드', name: 'sigunguCode', align: 'center', width: 100 }, @@ -331,7 +331,7 @@ { header: '요청차대번호', name: 'dmndVin', align: 'center', width: 150 }, { header: '연계결과코드', name: 'cntcResultCode', align: 'center', width: 100 }, { header: '연계결과상세', name: 'cntcResultDtls', align: 'left', width: 200 }, - { header: '차량번호', name: 'vhclno', align: 'center', width: 120 }, + { header: '차량번호', name: 'vhrno', align: 'center', width: 120 }, { header: '차대번호', name: 'vin', align: 'center', width: 150 }, { header: '차명', name: 'cnm', align: 'left', width: 150 }, { header: '연식', name: 'prye', align: 'center', width: 80 }, @@ -461,7 +461,7 @@ this.instance.on('dblclick', function(ev) { var rowData = self.instance.getRow(ev.rowKey); if (rowData) { - VehicleApiHistoryList.showDetailModalBasic(rowData.carBassMatterInqire); + VehicleApiHistoryList.showDetailModalBasic(rowData.carBassMatterInqireId); } }); } @@ -659,11 +659,11 @@ /** * 자동차 기본정보 조회 이력 상세 모달 표시 */ - showDetailModalBasic: function(carBassMatterInqire) { + showDetailModalBasic: function(carBassMatterInqireId) { $.ajax({ url: '', type: 'GET', - data: {carBassMatterInqire: carBassMatterInqire}, + data: {carBassMatterInqireId: carBassMatterInqireId}, dataType: 'json', success: function(response) { if (response.result) { @@ -672,7 +672,7 @@ // 모든 필드를 2열로 표시 var fields = [ - {label: '조회ID', key: 'carBassMatterInqire'}, + {label: '조회ID', key: 'carBassMatterInqireId'}, {label: '정보시스템ID', key: 'infoSysId'}, {label: '정보시스템IP', key: 'infoSysIp'}, {label: '시군구코드', key: 'sigunguCode'}, @@ -686,7 +686,7 @@ {label: '요청차대번호', key: 'dmndVin'}, {label: '연계결과코드', key: 'cntcResultCode'}, {label: '연계결과상세', key: 'cntcResultDtls'}, - {label: '차량번호', key: 'vhclno'}, + {label: '차량번호', key: 'vhrno'}, {label: '차대번호', key: 'vin'}, {label: '차명', key: 'cnm'}, {label: '연식', key: 'prye'},
차량번호' + this.nvl(data.vhclno) + '
차량번호' + this.nvl(data.vhrno) + '차대번호' + this.nvl(data.vin) + '
차명' + this.nvl(data.cnm) + '연식' + this.nvl(data.prye) + '