From 20081b89abf23dcf4aaf45009c8b844060f59c23 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 27 Aug 2024 13:28:26 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20ktgbs=20=EC=83=81=ED=83=9C=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B2=B0=EA=B3=BC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/mens_traffic_oracle.sql | 15 +++++++++++++++ .../xit/biz/ktgbs/service/BizKtGbsService.java | 3 +-- .../core/spring/config/SpringDocsApiConfig.java | 12 +++++++++++- .../kr/xit/ens/kt/web/KtBcInboundController.java | 2 +- .../ens/ktgbs/web/KtGbsInboundController.java | 2 +- .../mapper/biz/ens-kt-oracle-mapper.xml | 16 ++-------------- 6 files changed, 31 insertions(+), 19 deletions(-) diff --git a/db/mens_traffic_oracle.sql b/db/mens_traffic_oracle.sql index 6b83ba7..f6d2525 100644 --- a/db/mens_traffic_oracle.sql +++ b/db/mens_traffic_oracle.sql @@ -181,3 +181,18 @@ from tb_ens_rlaybsnm_manage; ON tekmd.sndng_detail_id = tempm.sndng_detail_id WHERE tekmd.envelope_id = 'EVLP-01J5YX9QNMS3Y8D3QZTB51NMMN-00' AND tekmd.external_id = '4413311202408230033'; + + + UPDATE tb_ens_kt_gbs + SET mms_sndg_rslt_sqno = '#{mmsSndgRsltSqno} ' /* MMS 발송 결과 상태 순번 - 1:수신시, 2:발송시*/ + , prcs_dt =' #{prcsDt} ' /* 처리일자 */ + , mbl_bzowr_dvcd = '#{mblBzowrDvcd}' /* 모바일 사업자 구분 : 01:KT, 02:SKT, 03:LGT */ + , rl_mms_sndg_telno = '#{rlMmsSndgTelno}' /* 실제 발송 번호 */ + , mms_rslt_dvcd = '#{mmsRsltDvcd} ' /* 발송결과코드 */ + --, mms_sndg_rslt_dvcd_msg = #{mmsRsltDvcdMsg} /* 발송결과코드 메세지 */ + , mms_sndg_tmst = mms_sndg_tmst /* 발송 타임 스탬프 */ + , mms_rcv_tmst = mms_rcv_tmst /* 수신 타임 스탬프 */ + , mms_rdg_tmst = mms_rdg_tmst /* 열람 타임 스탬프 */ + , updt_dt = sysdate + , updusr = 'api_inbound' + WHERE unity_sndng_detail_id = '' diff --git a/mens-api/src/main/java/kr/xit/biz/ktgbs/service/BizKtGbsService.java b/mens-api/src/main/java/kr/xit/biz/ktgbs/service/BizKtGbsService.java index 980f549..5fec1a5 100644 --- a/mens-api/src/main/java/kr/xit/biz/ktgbs/service/BizKtGbsService.java +++ b/mens-api/src/main/java/kr/xit/biz/ktgbs/service/BizKtGbsService.java @@ -113,8 +113,7 @@ public class BizKtGbsService extends AbstractService implements IBizKtGbsService dto.setMmsRsltDvcd("60"); } dto.setMmsRsltDvcdMsg(messageUtil.getMessage("info.api.kt.msg.rslt."+dto.getMmsRsltDvcd())); - // FIXME: KT GIBIS 적용 안됨 - 기존API 반영 결과와 신규 발송 결과에 따른 반영 구분 - //if(mapper.updateKtGbsDtl2(dto) != 1) { + // FIXME: KT GIBIS 적용 안됨 - 기존API 반영 결과와 신규 발송 결과에 따른 반영 구분{ if(mapper.updateKtGbsDtl(dto) != 1) { errors.add(new ErrorMsg( String.format("존재 하지 않는 발송 대상(src_key[%s], mms_rslt_sqno[%s]) 입니다", diff --git a/mens-api/src/main/java/kr/xit/core/spring/config/SpringDocsApiConfig.java b/mens-api/src/main/java/kr/xit/core/spring/config/SpringDocsApiConfig.java index cf626b5..ef13616 100644 --- a/mens-api/src/main/java/kr/xit/core/spring/config/SpringDocsApiConfig.java +++ b/mens-api/src/main/java/kr/xit/core/spring/config/SpringDocsApiConfig.java @@ -39,7 +39,17 @@ public class SpringDocsApiConfig { return GroupedOpenApi.builder() .group("2. 문서중계자 API") .pathsToMatch( - "/api/ens/**", + "/api/ens/**" + ) + .build(); + } + + @Bean + public GroupedOpenApi inboudnApiDoc() { + return GroupedOpenApi.builder() + .group("3. 문서중계자 API(Inbound)") + .pathsToMatch( + "/api/msg/**", "/api/ag/**" ) .build(); diff --git a/mens-api/src/main/java/kr/xit/ens/kt/web/KtBcInboundController.java b/mens-api/src/main/java/kr/xit/ens/kt/web/KtBcInboundController.java index 3eb1f29..ca926f7 100644 --- a/mens-api/src/main/java/kr/xit/ens/kt/web/KtBcInboundController.java +++ b/mens-api/src/main/java/kr/xit/ens/kt/web/KtBcInboundController.java @@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor; * * */ -@Tag(name = "KtBcInboundController", description = "KT BC Inbound API") +@Tag(name = "KtBcInboundController", description = "KT BC Inbound API - KT BC 에서 사용하는 API") @RequiredArgsConstructor @RestController public class KtBcInboundController { diff --git a/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsInboundController.java b/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsInboundController.java index c77f5bb..d7e066c 100644 --- a/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsInboundController.java +++ b/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsInboundController.java @@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor; * * */ -@Tag(name = "KtGbsInboundController", description = "KT GIBIS Inbound API") +@Tag(name = "KtGbsInboundController", description = "KT GIBIS Inbound API - KT GIBIS 에서 사용하는 API") @RequiredArgsConstructor @RestController public class KtGbsInboundController { diff --git a/mens-api/src/main/resources/egovframework/mapper/biz/ens-kt-oracle-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/biz/ens-kt-oracle-mapper.xml index 84fd517..96eb510 100644 --- a/mens-api/src/main/resources/egovframework/mapper/biz/ens-kt-oracle-mapper.xml +++ b/mens-api/src/main/resources/egovframework/mapper/biz/ens-kt-oracle-mapper.xml @@ -1,7 +1,7 @@ - + /** ens-kt-oracle-mapper|updateRlaybsnmKtInfo-kt token 정보 갱신|julim */ @@ -33,7 +33,6 @@ , mbl_bzowr_dvcd = #{mblBzowrDvcd} /* 모바일 사업자 구분 : 01:KT, 02:SKT, 03:LGT */ , rl_mms_sndg_telno = #{rlMmsSndgTelno} /* 실제 발송 번호 */ , mms_rslt_dvcd = #{mmsRsltDvcd} /* 발송결과코드 */ - --, mms_sndg_rslt_dvcd_msg = #{mmsRsltDvcdMsg} /* 발송결과코드 메세지 */ , mms_sndg_tmst = NVL(#{mmsSndgTmst}, mms_sndg_tmst) /* 발송 타임 스탬프 */ , mms_rcv_tmst = NVL(#{mmsRcvTmst}, mms_rcv_tmst) /* 수신 타임 스탬프 */ , mms_rdg_tmst = NVL(#{mmsRdgTmst}, mms_rdg_tmst) /* 열람 타임 스탬프 */ @@ -51,7 +50,7 @@ FROM tb_ens_sndng_mastr tesn JOIN tb_elctrn_ntic_sndng_detail tcsnd ON tesn.unity_sndng_mastr_id = tcsnd.elctrn_ntic_sndng_detail_id - WHERE tcsnd.unity_sndng_detail_id = #{srcKey} + WHERE tcsnd.elctrn_ntic_sndng_detail_id = #{srcKey} INSERT INTO tb_elctrn_ntic_sndng_result ( elctrn_ntic_sndng_detail_id, /* 통합 발송 상세 ID*/ @@ -87,15 +86,4 @@ , updt_dt = sysdate , updusr = 'batch' - - - /** ens-kt-oracle-mapper|updateKtGbsDtl2-기존 kt GIBIS 메세지 수신결과 상세 반영|julim */ - UPDATE ens_snd_dtl_kt_gbs - SET doc_stat = #{mmsRsltDvcd} /* 발송결과코드 */ - , doc_sent_dt = NVL(#{mmsSndgTmst}, mms_sndg_tmst) /* 발송 타임 스탬프 */ - , doc_received_dt = NVL(#{mmsRcvTmst}, mms_rcv_tmst) /* 수신 타임 스탬프 */ - , doc_read_frst_dt = NVL(#{mmsRdgTmst}, mms_rdg_tmst) /* 열람 타임 스탬프 */ - , error_message = #{errorMsg} /* 발송결과코드 메세지 */ - WHERE src_key = #{srcKey} -