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 4b2fe96..3fc96ef 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 @@ -22,7 +22,6 @@ import kr.xit.biz.mbl.model.MobilePageDTO.MobilePageManage; */ @Mapper public interface IMobilePageMapper { - // FIXME: kakao v1 or v2 MobilePageManage selectKkopayMobilePage(final MobilePageDTO.KakaoValidTokenRequest dto); MobilePageManage selectKkotalkMobilePage(final MobilePageDTO.KakaoValidTokenRequest dto); 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 546a43f..80b82e3 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 @@ -20,7 +20,6 @@ import kr.xit.biz.mbl.model.MobilePageDTO; * */ public interface IMobilePageService { - // FIXME: kakao v1 or v2 - 천안 jsp에서 호출됨 String findKkopayReadyAndMblPage(MobilePageDTO.KakaoValidTokenRequest reqDTO); String findKkotalkReadyAndMblPage(MobilePageDTO.KakaoValidTokenRequest reqDTO); 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 05a0807..c0ac046 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 @@ -148,11 +148,6 @@ public class MobilePageService extends AbstractService implements IMobilePageSer @Override @TraceLogging public String findKtBcMblPage(final KtTokenDTO.KtTokenConfirmRequest reqDTO) { - //TODO::테스트 - //MobilePageManage mblDTO = mapper.selectKtMobilePage("DPDKT202311080000111"); - //return ApiResponseDTO.success(mblDTO.getMobilePageCn()); - - //TODO::실운영시 코멘트 제거 if (Checks.isEmpty(reqDTO.getAccessToken())) throw BizRuntimeException.create(String.valueOf(ErrorCode.BAD_REQUEST.getHttpStatus().value()), "KT BC 안심문자 정상 요청이 아닙니다. 재인증 후 시도하시기 바랍니다."); @@ -197,11 +192,6 @@ public class MobilePageService extends AbstractService implements IMobilePageSer @Override @TraceLogging public String findKtGbsMblPage(final KtGbsDTO.TokenConfirmRequest reqDTO) { - //TODO::테스트 - //MobilePageManage mblDTO = mapper.selectKtMobilePage("DPDKT202311080000111"); - //return ApiResponseDTO.success(mblDTO.getMobilePageCn()); - - //TODO::실운영시 코멘트 제거 if (Checks.isEmpty(reqDTO.getToken())) throw BizRuntimeException.create(String.valueOf(ErrorCode.BAD_REQUEST.getHttpStatus().value()), "KT GIBIS 안심문자 정상 요청이 아닙니다. 재인증 후 시도하시기 바랍니다."); diff --git a/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageController.java b/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageController.java index 231f3b2..a777b55 100644 --- a/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageController.java +++ b/mens-api/src/main/java/kr/xit/biz/mbl/web/MobilePageController.java @@ -139,7 +139,7 @@ public class MobilePageController { break; case "/kt/mblPage/old": - //FIXME: KT mblpage 적용 안됨 + //FIXME: KT old mblpage 적용 안됨 mblCnts = service.findKtBcMblPage( KtTokenDTO.KtTokenConfirmRequest.builder() .signguCode("") diff --git a/mens-api/src/main/java/kr/xit/ens/ktgbs/service/IKtGbsService.java b/mens-api/src/main/java/kr/xit/ens/ktgbs/service/IKtGbsService.java index ecd49ff..b59bc06 100644 --- a/mens-api/src/main/java/kr/xit/ens/ktgbs/service/IKtGbsService.java +++ b/mens-api/src/main/java/kr/xit/ens/ktgbs/service/IKtGbsService.java @@ -18,7 +18,6 @@ import kr.xit.biz.ens.model.ktgbs.KtGbsDTO; * */ public interface IKtGbsService { - // FIXME : KT GIBIS 적용 안됨 //------------------------------------------------------------------------------ // mens 사용 API //------------------------------------------------------------------------------ diff --git a/mens-api/src/main/java/kr/xit/ens/ktgbs/service/KtGbsService.java b/mens-api/src/main/java/kr/xit/ens/ktgbs/service/KtGbsService.java index 7d52bcd..a5fc34e 100644 --- a/mens-api/src/main/java/kr/xit/ens/ktgbs/service/KtGbsService.java +++ b/mens-api/src/main/java/kr/xit/ens/ktgbs/service/KtGbsService.java @@ -137,7 +137,6 @@ public class KtGbsService extends AbstractService implements IKtGbsService { ); } - // FIXME : KT GIBIS 적용 안됨 @Override @TraceLogging public KtCommonDTO.KtCommonResponse mainSend(final KtGbsDTO.MsgSendRequest reqDTO) { diff --git a/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsController.java b/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsController.java index 4c1e378..7479d42 100644 --- a/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsController.java +++ b/mens-api/src/main/java/kr/xit/ens/ktgbs/web/KtGbsController.java @@ -36,9 +36,6 @@ import lombok.RequiredArgsConstructor; public class KtGbsController { private final IKtGbsService service; - - - // FIXME : KT GIBIS 적용 안됨 @Operation(summary = "본문자 수신 등록 요청", description = "본문자 수신 등록 요청") @PostMapping(value = "/mainSend", produces = MediaType.APPLICATION_JSON_VALUE) public IApiResponse mainSend(@RequestBody final KtGbsDTO.MsgSendRequest reqDTO) { 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 d7e066c..92c0692 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 @@ -43,7 +43,6 @@ public class KtGbsInboundController { * @return KtCommonResponse * */ - // FIXME : KT GIBIS 적용 안됨 @io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = { @Content( mediaType = "application/json", diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchAcceptService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchAcceptService.java index fb5639c..aa505df 100644 --- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchAcceptService.java +++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchAcceptService.java @@ -422,7 +422,6 @@ public class EnsBatchAcceptService extends AbstractService implements IEnsBatchA VNOInterop vnoInterop = new VNOInterop(); /* ──── DI or CI 값을 추출하기 위한 부분 Start */ - // FIXME : site code, site password 반영 필요 if(isCi) { iRtn = vnoInterop.fnRequestConnInfo(diciSiteCode, diciSitePwd, ihidnum, "JID"); } else { diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java index 0de8d30..8da3277 100644 --- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java +++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchExtractService.java @@ -73,7 +73,6 @@ public class EnsBatchExtractService extends AbstractService implements */ @Override @Transactional(propagation = Propagation.REQUIRES_NEW) - // FIXME: kakao v1 or v2 public void saveKkopaySendResult(final String mstId, String unitySndMstId, final List resList) { // 결과 반영 resList.forEach(o -> diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java index 6149c76..6fadccb 100644 --- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java +++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchMakeService.java @@ -177,10 +177,10 @@ public class EnsBatchMakeService extends AbstractService implements IEnsBatchMak * - 최초(전송 없슴), 1차 전송, 2차 전송 데이타 대상 * KAKAO - {@link IEnsBatchMapper#insertKakaopay(Object) insertKakaopay} * - tb_ens_kakao_my_doc - * KT_BC - {@link IEnsBatchMapper#insertKtBcMastr(Object) insertKtBcMastr} - * - tb_ens_kt_bc_mastr FIXME::운영 전환 시 처리 필요 - * - {@link IEnsBatchMapper#insertKtBcDetail(Object) insertKtBcDetail} - * - tb_ens_kt_bc_detail FIXME::운영 전환 시 처리 필요 + * KT_BC, KT_GIBIS - {@link IEnsBatchMapper#insertKtBcMastr(Object) insertKtBcMastr} + * - tb_ens_kt_bc_mastr, tb_ens_kt_gbs + * - {@link IEnsBatchMapper#insertKtBcDetail(Object)} + * {@link IEnsBatchMapper#insertKtGbsDetail(Object)} * @param dto SndngMssageParam * @return int * diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchSendService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchSendService.java index 2e839f5..5117413 100644 --- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchSendService.java +++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchSendService.java @@ -135,7 +135,6 @@ public class EnsBatchSendService extends AbstractService implements IEnsBatchSen */ @Override @Transactional(propagation = Propagation.REQUIRES_NEW) - // FIXME: kakao v1 or v2 public void sendBulks(final SndngMssageParam dto) { dto.setProfile(ApiConstants.IS_PROFILE_LOCAL? "local" : "prod"); @@ -603,7 +602,6 @@ public class EnsBatchSendService extends AbstractService implements IEnsBatchSen private void sendBulkKtGibis(final SndngMssageParam dto) { final String url = apiHost + apiKtGbsBulkSend; - // FIXME : KT GIBIS 적용 안됨 - 대상 조회시 필요한 필드 매핑 필요(SQL) EnsKtGbsDTO mstDTO = mapper.selectKtGbsMstTgtInfo(dto) .orElseThrow(() -> BizRuntimeException.create("KT GBIS 본문자 수신 등록 대상이 존재 하지 않습니다 ")); diff --git a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchStatusService.java b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchStatusService.java index dabd493..7f79055 100644 --- a/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchStatusService.java +++ b/mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchStatusService.java @@ -77,7 +77,6 @@ public class EnsBatchStatusService extends AbstractService implements IEnsBatchS */ @Override @Transactional(propagation = Propagation.REQUIRES_NEW) - // FIXME: kakao v1 or v2 public void statusBulks(final EnsDTO.BatchEnsRequest reqDTO) { final List tgtList = mapper.selectStatusBulkTgts(reqDTO); diff --git a/mens-core/src/main/java/kr/xit/biz/ens/model/kakao/talk/KkotalkApiDTO.java b/mens-core/src/main/java/kr/xit/biz/ens/model/kakao/talk/KkotalkApiDTO.java index 1fd5e88..221afe6 100644 --- a/mens-core/src/main/java/kr/xit/biz/ens/model/kakao/talk/KkotalkApiDTO.java +++ b/mens-core/src/main/java/kr/xit/biz/ens/model/kakao/talk/KkotalkApiDTO.java @@ -199,8 +199,7 @@ public class KkotalkApiDTO { * 문서 고유 ID, 34자로 고정 */ @Schema(requiredMode = Schema.RequiredMode.REQUIRED, title = "문서 고유 ID, 34자로 고정", example = " ") - // FIXME: 테스트후 주석 제거!!! - //@Size(min = 34, max = 34, message = "문서 고유 ID는 필수입니다(34자)") + @Size(min = 34, max = 34, message = "문서 고유 ID는 필수입니다(34자)") private String envelopeId; /** @@ -411,8 +410,7 @@ public class KkotalkApiDTO { * 문서 고유 ID, 34자로 고정 */ @Schema(requiredMode = Schema.RequiredMode.REQUIRED, title = "문서 고유 ID, 34자로 고정", example = " ") - // FIXME: 테스트후 주석 제거!!! - //@Size(min = 34, max = 34, message = "문서 고유 ID는 필수입니다(34자)") + @Size(min = 34, max = 34, message = "문서 고유 ID는 필수입니다(34자)") private String envelopeId; } diff --git a/mens-core/src/main/java/kr/xit/biz/ens/model/kt/KtMmsSendDTO.java b/mens-core/src/main/java/kr/xit/biz/ens/model/kt/KtMmsSendDTO.java index abe2a4c..f305a94 100644 --- a/mens-core/src/main/java/kr/xit/biz/ens/model/kt/KtMmsSendDTO.java +++ b/mens-core/src/main/java/kr/xit/biz/ens/model/kt/KtMmsSendDTO.java @@ -1,15 +1,20 @@ package kr.xit.biz.ens.model.kt; +import java.util.List; + +import javax.validation.Valid; +import javax.validation.constraints.Digits; +import javax.validation.constraints.Size; + +import org.hibernate.validator.constraints.NotEmpty; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; + import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Size; import kr.xit.biz.ens.model.cmm.CmmEnsRequestDTO; import kr.xit.biz.ens.model.kt.KtCommonDTO.KtCommonResponse; import lombok.AllArgsConstructor; @@ -19,7 +24,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.hibernate.validator.constraints.NotEmpty; /** *
@@ -916,7 +920,6 @@ public class KtMmsSendDTO {
 
         /**
          * 
-         * TODO::결과코드에 따른 메세지 처리 필요
          * 발송결과코드 : 필수 - 2자리
          * 40	MMS/RCS 발송	수신성공
          * 41	MMS발송	메시지 내용 스팸
diff --git a/mens-core/src/main/java/kr/xit/biz/ens/model/ktgbs/KtGbsDTO.java b/mens-core/src/main/java/kr/xit/biz/ens/model/ktgbs/KtGbsDTO.java
index b25a3ca..b30be66 100644
--- a/mens-core/src/main/java/kr/xit/biz/ens/model/ktgbs/KtGbsDTO.java
+++ b/mens-core/src/main/java/kr/xit/biz/ens/model/ktgbs/KtGbsDTO.java
@@ -343,7 +343,6 @@ public class KtGbsDTO {
         @Schema(requiredMode = Schema.RequiredMode.REQUIRED, title = "발송결과코드", example = "40")
         @Size(min = 2, max = 2, message = "발송결과코드는 필수 입니다")
         private String mmsRsltDvcd;
-        //private String mmsSndgRsltDvcd;
 
         /**
          * 
diff --git a/mens-core/src/main/java/kr/xit/core/spring/util/ApiWebClientUtil.java b/mens-core/src/main/java/kr/xit/core/spring/util/ApiWebClientUtil.java
index 93860ea..0f0cbb2 100644
--- a/mens-core/src/main/java/kr/xit/core/spring/util/ApiWebClientUtil.java
+++ b/mens-core/src/main/java/kr/xit/core/spring/util/ApiWebClientUtil.java
@@ -129,7 +129,6 @@ public class ApiWebClientUtil {
      */
     public  T exchangeKkotalk(final String url, final HttpMethod method, final Object body, final Class rtnClzz, final CmmEnsRlaybsnmDTO ensDTO) {
 
-        // FIXME: Kkotalk 값 설정
         Map map = new HashMap<>();
         map.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
         map.put(HttpHeaders.AUTHORIZATION, String.format("KakaoAK %s", ensDTO.getKakaoDealerRestApiKey()));