From b45ecb2fda6cb9a333649460c67ddc4c7d6e034d Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Mon, 2 Dec 2024 15:09:36 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=97=90=EB=9F=AC=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/biz/mbl/mapper/IMobilePageMapper.java | 4 +- .../biz/mbl/service/IMobilePageService.java | 4 +- .../biz/mbl/service/MobilePageService.java | 4 +- .../biz/mbl/web/MobilePageAsIsController.java | 49 ++++++++----------- 4 files changed, 29 insertions(+), 32 deletions(-) diff --git a/mens-api/src/main/java/kr/xit/biz/mbl/mapper/IMobilePageMapper.java b/mens-api/src/main/java/kr/xit/biz/mbl/mapper/IMobilePageMapper.java index aae5f11..1939789 100644 --- a/mens-api/src/main/java/kr/xit/biz/mbl/mapper/IMobilePageMapper.java +++ b/mens-api/src/main/java/kr/xit/biz/mbl/mapper/IMobilePageMapper.java @@ -1,5 +1,7 @@ package kr.xit.biz.mbl.mapper; +import java.util.*; + import org.egovframe.rte.psl.dataaccess.mapper.*; import kr.xit.biz.mbl.model.*; @@ -27,5 +29,5 @@ public interface IMobilePageMapper { MobilePageManage selectKtBcMobilePage(final T t); MobilePageManage selectKtGbsMobilePage(final T t); - MobilePageManage selectKtGbsSignguCode(final T t); + List selectKtGbsSignguCode(final String signguCode); } diff --git a/mens-api/src/main/java/kr/xit/biz/mbl/service/IMobilePageService.java b/mens-api/src/main/java/kr/xit/biz/mbl/service/IMobilePageService.java index 903f99e..a438e56 100644 --- a/mens-api/src/main/java/kr/xit/biz/mbl/service/IMobilePageService.java +++ b/mens-api/src/main/java/kr/xit/biz/mbl/service/IMobilePageService.java @@ -1,5 +1,7 @@ package kr.xit.biz.mbl.service; +import java.util.*; + import kr.xit.biz.ens.model.kt.KtTokenDTO.*; import kr.xit.biz.ens.model.ktgbs.*; import kr.xit.biz.mbl.model.*; @@ -25,5 +27,5 @@ public interface IMobilePageService { String findKtBcMblPage(final KtTokenConfirmRequest reqDTO); String findKtGbsMblPage(final KtGbsDTO.TokenConfirmRequest reqDTO); - MobilePageDTO.MobilePageManage findKtGbsSignguCode(final String signguCode); + List findKtGbsSignguCode(final String signguCode); } diff --git a/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java b/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java index 35c41bf..c542b80 100644 --- a/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java +++ b/mens-api/src/main/java/kr/xit/biz/mbl/service/MobilePageService.java @@ -1,5 +1,7 @@ package kr.xit.biz.mbl.service; +import java.util.*; + import org.springframework.stereotype.*; import kr.xit.biz.ens.model.kakao.pay.*; @@ -218,7 +220,7 @@ public class MobilePageService extends AbstractService implements IMobilePageSer } @Override - public MobilePageDTO.MobilePageManage findKtGbsSignguCode(final String signguCode){ + public List findKtGbsSignguCode(final String signguCode){ return mapper.selectKtGbsSignguCode(signguCode); } } diff --git a/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageAsIsController.java b/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageAsIsController.java index 9a5fc60..d8abfd4 100644 --- a/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageAsIsController.java +++ b/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageAsIsController.java @@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.tags.*; import kr.xit.biz.ens.model.ktgbs.*; import kr.xit.biz.mbl.model.*; import kr.xit.biz.mbl.service.*; +import kr.xit.core.consts.*; import kr.xit.core.exception.*; import lombok.*; @@ -55,13 +56,12 @@ public class MobilePageAsIsController { try { - if ((StringUtils.isEmpty(documentBinderUuid) && StringUtils.isEmpty(envelopeId)) - || StringUtils.isEmpty(srcKey)) { + if (StringUtils.isEmpty(documentBinderUuid) && StringUtils.isEmpty(envelopeId) && StringUtils.isEmpty(srcKey)) { throw BizRuntimeException.create("정상적인 요청이 아닙니다. 재인증 후 시도하시기 바랍니다."); } if (!StringUtils.isEmpty(documentBinderUuid) || !StringUtils.isEmpty(envelopeId)) { - return findKkoReadyAndMblData( + findKkoReadyAndMblData( MobilePageDTO.KakaoValidTokenRequest.builder() .document_binder_uuid(documentBinderUuid) .envelopeId(envelopeId) @@ -73,21 +73,22 @@ public class MobilePageAsIsController { ); }else{ - return findKtMblPage(token, srcKey, model); + findKtMblPage(token, srcKey, model); } } catch (BizRuntimeException e) { - model.addAttribute("errCode", e.getErrorCode()); + ErrorCode errorCode = e.getErrorCode(); + String errCode = errorCode != null? errorCode.getHttpStatus().value() + "": ErrorCode.BAD_REQUEST.getHttpStatus().value() + ""; + model.addAttribute("errCode", errCode); model.addAttribute("errMsg", e.getMessage()); - return "notiprnt"; } catch (Exception e) { - model.addAttribute("errCode", e.getMessage()); + model.addAttribute("errCode", "500"); model.addAttribute("errMsg", e.getMessage()); - return "notiprnt"; } + return "notiPrnt"; } - private String findKkoReadyAndMblData(final MobilePageDTO.KakaoValidTokenRequest reqDTO, Model model) { + private void findKkoReadyAndMblData(final MobilePageDTO.KakaoValidTokenRequest reqDTO, Model model) { if ((StringUtils.isEmpty(reqDTO.getDocument_binder_uuid()) && StringUtils.isEmpty(reqDTO.getEnvelopeId())) || StringUtils.isEmpty(reqDTO.getToken())) { @@ -103,23 +104,18 @@ public class MobilePageAsIsController { model.addAttribute("payButtonLinks", "{}"); } catch (BizRuntimeException e) { - model.addAttribute("errCode", e.getErrorCode()); - model.addAttribute("errMsg", e.getMessage()); - model.addAttribute("details", "{}"); + throw e; } catch (Exception e) { - model.addAttribute("errCode", e.getMessage()); - model.addAttribute("errMsg", e.getMessage()); - model.addAttribute("details", "{}"); + throw e; } - return "notiPrnt"; } - public String findKtMblPage(final String token, final String srcKey, Model model) { + public void findKtMblPage(final String token, final String srcKey, Model model) { try { - final MobilePageDTO.MobilePageManage mobilePageManage = service.findKtGbsSignguCode(srcKey); - if(mobilePageManage == null) { + final List sigunguList = service.findKtGbsSignguCode(srcKey); + if(sigunguList.size() == 0 || sigunguList.size() > 1) { throw BizRuntimeException.create( - String.format("정상적인 요청이 아닙니다. src_key를 확인해 주세요.\n(요청 src_key: %s)", srcKey)); + String.format("정상적인 요청이 아닙니다. src_key를 확인해 주세요.(요청 src_key: %s)", srcKey)); } /* @@ -147,8 +143,8 @@ public class MobilePageAsIsController { model.addAttribute("details", service.findKtGbsMblPage( KtGbsDTO.TokenConfirmRequest.builder() - .signguCode(mobilePageManage.getSignguCode()) - .ffnlgCode(mobilePageManage.getFfnlgCode()) + .signguCode(sigunguList.get(0).getSignguCode()) + .ffnlgCode(sigunguList.get(0).getFfnlgCode()) .token(token) .srcKey(srcKey) .build() @@ -156,14 +152,9 @@ public class MobilePageAsIsController { ); } catch (BizRuntimeException e) { - model.addAttribute("errCode", e.getErrorCode()); - model.addAttribute("errMsg", e.getMessage()); - model.addAttribute("details", "{}"); + throw e; } catch (Exception e) { - model.addAttribute("errCode", e.getMessage()); - model.addAttribute("errMsg", e.getMessage()); - model.addAttribute("details", "{}"); + throw e; } - return "notiPrnt"; } } \ No newline at end of file