xit-java
/
mens-traffic-parent
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 카카오톡 status 반영

Browse Source
main
Jonguk. Lim 3 months ago
parent 1cbbb8c8b4
commit 833080747a
5 changed files with 223 additions and 70 deletions
Show Stats Download Patch File Download Diff File

5
db/mens_traffic.sql
Unescape Escape View File

@ -84,5 +84,8 @@ where teim.ihidnum = 'RUNCNjEwM0JERENGMEMzNjRBOTAyMERERjg5MDFEODc=';
select DATE_FORMAT(DATE_ADD(clos_dt, INTERVAL 1 DAY), '%Y-%m-%dT%H:%i:%s')
, DATE_FORMAT(clos_dt, '%Y-%m-%dT%H:%i:%s')
, DATE_FORMAT(null, '%Y-%m-%dT%H:%i:%s')
, DATE_FORMAT('', '%Y-%m-%dT%H:%i:%s')
, DATE_FORMAT('2024-09-05T23:59:59', '%Y%m%d%H%i%s')
, sysdate()
from tb_ens_unity_sndng_mastr;

39
mens-batch/src/main/java/kr/xit/biz/ens/mapper/IEnsBatchMapper.java
Unescape Escape View File

@ -13,6 +13,7 @@ import kr.xit.biz.ens.model.cmm.TmplatManage;
import kr.xit.biz.ens.model.cntc.CntcDTO;
import kr.xit.biz.ens.model.kakao.v1.KkopayDocBulkDTO;
import kr.xit.biz.ens.model.kakao.v1.KkopayDocDTO;
import kr.xit.biz.ens.model.kakao.v2.KkotalkDTO;
import kr.xit.biz.ens.model.kt.KtMmsSendDTO.KtMainSendReqData;
/**
@ -336,24 +337,41 @@ public interface IEnsBatchMapper {
/**
* <pre>
* 카카오 문서 상태 조회 대상 목록 조회
* 카카오페이 문서 상태 조회 대상 목록 조회
* - tb_ens_sndng_mastr, tb_ens_kakao_my_doc
* @param dto EnsDTO.BatchEnsRequest
* @return List<String>
* </pre>
*/
List<String> selectKakaoStatusTgts(final SndngMssageParam dto);
List<String> selectKakaopayStatusTgts(final SndngMssageParam dto);
/**
* <pre>
* 카카오톡 문서 상태 조회 대상 목록 조회
* - tb_ens_sndng_mastr, tb_ens_kakao_d10
* @param dto EnsDTO.BatchEnsRequest
* @return List<String>
* </pre>
*/
List<String> selectKakaotalkStatusTgts(final SndngMssageParam dto);
/**
* <pre>
* 카카오 문서 상태 조회 결과 반영
* 카카오페이 문서 상태 조회 결과 반영
* - tb_ens_kakao_my_doc
* @param dto EnsDTO.KakaoMyDoc
* @return int
* </pre>
*/
// FIXME: kakao v1 or v2
int updateKakaoStatusInfo(final KkopayDocBulkDTO.BulkStatus dto);
int updateKakaopayStatusInfo(final KkopayDocBulkDTO.BulkStatus dto);
/**
* <pre>
* 카카오톡 문서 상태 조회 결과 반영
* - tb_ens_kakao_d10
* @param dto EnsDTO.KakaoMyDoc
* @return int
* </pre>
*/
int updateKakaotalkStatusInfo(final KkotalkDTO.EnvelopeStatusResponse dto);
//----------------------------------------------------------------------
// status
//----------------------------------------------------------------------
@ -374,12 +392,19 @@ public interface IEnsBatchMapper {
int insertCntcSndngResult(final CntcDTO.SndngResult dto);
/**
* 연계발송결과반영 - 카카오
* 연계발송결과반영 - 카카오페이
* - tb_cntc_sndng_result, tb_ens_kakao_my_doc
* @param dto SndngResult
* @return int
*/
int updateCntcSndngResultByKkoMyDoc(final CntcDTO.SndngResult dto);
int updateCntcSndngResultByKkopay(final CntcDTO.SndngResult dto);
/**
* 연계발송결과반영 - 카카오톡
* - tb_cntc_sndng_result, tb_ens_kakao_d10
* @param dto SndngResult
* @return int
*/
int updateCntcSndngResultByKkotalk(final CntcDTO.SndngResult dto);
//----------------------------------------------------------------------
// result
//----------------------------------------------------------------------

92
mens-batch/src/main/java/kr/xit/biz/ens/service/EnsBatchStatusService.java
Unescape Escape View File

@ -23,6 +23,7 @@ import kr.xit.biz.ens.model.cmm.SndngMssageParam;
import kr.xit.biz.ens.model.cntc.CntcDTO;
import kr.xit.biz.ens.model.kakao.v1.KkopayDocAttrDTO;
import kr.xit.biz.ens.model.kakao.v1.KkopayDocBulkDTO;
import kr.xit.biz.ens.model.kakao.v2.KkotalkDTO;
import kr.xit.core.exception.BizRuntimeException;
import kr.xit.core.model.ApiResponseDTO;
import kr.xit.core.service.AbstractService;
@ -51,8 +52,12 @@ import lombok.RequiredArgsConstructor;
public class EnsBatchStatusService extends AbstractService implements IEnsBatchStatusService {
@Value("${app.contract.host}")
private String apiHost;
@Value("${app.contract.kakao.api.pay.bulkstatus}")
private String apiKkoBulkStatus;
private String apiKkopayBulkStatus;
@Value("${app.contract.kakao.api.talk.bulkstatus}")
private String apiKkotalkBulkStatus;
@Value("${app.contract.kakao.bulk-max-cnt}")
private int bulkKkoMaxCnt;
@ -97,10 +102,10 @@ public class EnsBatchStatusService extends AbstractService implements IEnsBatchS
* 모바일 페이지 생성 : tb_ens_mobile_page_manage
* 연계발송결과 생성 : tb_cntc_sndng_result
*/
case KAKAO -> statusKakao(dto);
case KAKAO -> statusKakaopay(dto);
case KAKAO_NEW
-> statusKakao(dto);
-> statusKakaotalk(dto);
//break;
case KT_BC -> {}
@ -122,10 +127,10 @@ public class EnsBatchStatusService extends AbstractService implements IEnsBatchS
* @param dto BatchEnsRequest
* </pre>
*/
private void statusKakao(final SndngMssageParam dto) {
final String url = apiHost + apiKkoBulkStatus;
private void statusKakaopay(final SndngMssageParam dto) {
final String url = apiHost + apiKkopayBulkStatus;
final List<String> docsBinderUuids = mapper.selectKakaoStatusTgts(dto);
final List<String> docsBinderUuids = mapper.selectKakaopayStatusTgts(dto);
final List<List<String>> partitions = ListUtils.partition(docsBinderUuids, bulkKkoMaxCnt);
@SuppressWarnings("rawtypes")
@ -153,11 +158,12 @@ public class EnsBatchStatusService extends AbstractService implements IEnsBatchS
// 결과 반영
resList.forEach(o ->
o.getDocuments().forEach(t -> {
mapper.updateKakaoStatusInfo(t);
mapper.updateKakaopayStatusInfo(t);
KkopayDocAttrDTO.DocStatus statusData = t.getStatus_data();
if(Checks.isNotEmpty(statusData)) {
mapper.updateCntcSndngResultByKkoMyDoc(CntcDTO.SndngResult.builder()
.documentBinderUuid(t.getDocument_binder_uuid())
mapper.updateCntcSndngResultByKkopay(
CntcDTO.SndngResult.builder()
.docKeyId(t.getDocument_binder_uuid())
.sndngResultSttus(StringUtils.defaultString(
String.valueOf(statusData.getDoc_box_status()), "FAIL"))
.requstDt(Checks.isEmpty(statusData.getDoc_box_sent_at()) ? null
@ -169,8 +175,9 @@ public class EnsBatchStatusService extends AbstractService implements IEnsBatchS
.errorCn(t.getError_message())
.build());
}else{
mapper.updateCntcSndngResultByKkoMyDoc(CntcDTO.SndngResult.builder()
.documentBinderUuid(t.getDocument_binder_uuid())
mapper.updateCntcSndngResultByKkopay(
CntcDTO.SndngResult.builder()
.docKeyId(t.getDocument_binder_uuid())
.sndngResultSttus(t.getError_code())
.errorCn(t.getError_message())
.build());
@ -178,4 +185,67 @@ public class EnsBatchStatusService extends AbstractService implements IEnsBatchS
})
);
}
/**
* <pre>
* 문서중개자 전송후 상태 조회
*
* @param dto BatchEnsRequest
* </pre>
*/
private void statusKakaotalk(final SndngMssageParam dto) {
final String url = apiHost + apiKkotalkBulkStatus;
final List<String> envelopeIds = mapper.selectKakaotalkStatusTgts(dto);
final List<List<String>> partitions = ListUtils.partition(envelopeIds, bulkKkoMaxCnt);
@SuppressWarnings("rawtypes")
final List<ApiResponseDTO> apiResults = partitions.stream()
.map(envelopes -> apiWebClient.exchange(
url,
HttpMethod.POST,
KkotalkDTO.BulkStatusRequest.builder()
.signguCode(dto.getSignguCode())
.ffnlgCode(dto.getFfnlgCode())
.envelopes(envelopes)
.build(),
ApiResponseDTO.class,
CmmEnsBizUtils.getHeadeMap())
).toList();
final List<KkotalkDTO.BulkStatusResponse> resList = new ArrayList<>();
//noinspection rawtypes
for(ApiResponseDTO apiResult : apiResults) {
if(apiResult.getData() != null) {
resList.add(toObjByObj(apiResult.getData(), KkotalkDTO.BulkStatusResponse.class));
}
}
// 결과 반영
resList.forEach(o ->
o.getEnvelopeStatus().forEach(t -> {
mapper.updateKakaotalkStatusInfo(t);
//EnvelopeStatus statusData = t;
if(Checks.isNotEmpty(t)) {
mapper.updateCntcSndngResultByKkotalk(
CntcDTO.SndngResult.builder()
.docKeyId(t.getEnvelopeId())
.sndngResultSttus(StringUtils.defaultString(
String.valueOf(t.getStatus()), "FAIL"))
.requstDt(t.getSentAt())
.inqireDt(t.getReceivedAt())
.readngDt(t.getReadAt())
.errorCn(t.getErrorMessage())
.build());
}else{
mapper.updateCntcSndngResultByKkotalk(
CntcDTO.SndngResult.builder()
.docKeyId(t.getEnvelopeId())
.sndngResultSttus(t.getErrorCode())
.errorCn(t.getErrorMessage())
.build());
}
})
);
}
}

65
mens-batch/src/main/resources/egovframework/mapper/biz/ens-mysql-mapper.xml
Unescape Escape View File

@ -1032,9 +1032,9 @@
AND tesm.ffnlg_code = #{ffnlgCode}
</select>
<select id="selectKakaoStatusTgts" resultType="string">
/** ens-mysql-mapper|selectKakaoStatusTgts-카카오 문서 상태 조회 대상 목록 조회|julim */
SELECT document_binder_uuid
<select id="selectKakaopayStatusTgts" resultType="string">
/** ens-mysql-mapper|selectKakaopayStatusTgts-카카오페이 문서 상태 조회 대상 목록 조회|julim */
SELECT tekmd.document_binder_uuid
FROM tb_ens_sndng_mastr tesm
JOIN tb_ens_kakao_my_doc tekmd
ON tesm.sndng_mastr_id = tekmd.sndng_mastr_id
@ -1045,8 +1045,21 @@
AND tesm.ffnlg_code = #{ffnlgCode}
</select>
<update id="updateKakaoStatusInfo">
/** ens-mysql-mapper|updateKakaoStatusInfo-카카오 문서 상태 조회 결과 반영|julim */
<select id="selectKakaotalkStatusTgts" resultType="string">
/** ens-mysql-mapper|selectKakaotalkStatusTgts-카카오톡 전자고지 상태 조회 대상 목록 조회|julim */
SELECT tekd.envelope_id
FROM tb_ens_sndng_mastr tesm
JOIN tb_ens_kakao_d10 tekd
ON tesm.sndng_mastr_id = tekd.sndng_mastr_id
WHERE tesm.sndng_process_sttus IN ('send-ok', 'sending1', 'sending2')
AND tesm.unity_sndng_mastr_id = #{unitySndngMastrId}
AND IFNULL(tekd.envelope_id, '') != ''
AND tesm.signgu_code = #{signguCode}
AND tesm.ffnlg_code = #{ffnlgCode}
</select>
<update id="updateKakaopayStatusInfo">
/** ens-mysql-mapper|updateKakaopayStatusInfo-카카오페이 문서 상태 조회 결과 반영|julim */
UPDATE tb_ens_kakao_my_doc
SET doc_box_status = #{status_data.doc_box_status} /* 진행상태 */
, doc_box_sent_at = #{status_data.doc_box_sent_at} /* 송신시간 */
@ -1064,6 +1077,27 @@
WHERE tekmd.document_binder_uuid = #{document_binder_uuid})
</update>
<update id="updateKakaotalkStatusInfo">
/** ens-mysql-mapper|updateKakaotalkStatusInfo-카카오톡 문서 상태 조회 결과 반영|jhseo */
UPDATE tb_ens_kakao_d10
SET status = #{status} /* 진행상태 */
, sent_at = #{sentAt} /* 문서 송신 일시 */
, received_at = #{receivedAt} /* 문서 수신 일시 */
, read_at = #{readAt} /* 문서 열람 일시 */
, read_expires_at = #{readExpiredAt} /* 문서 열람 만료 일시 */
, authenticated_at = #{authenticatedAt} /* 문서 열람 인증 일시 */
, ott_verified_at = #{ottVerifiedAt} /* 토큰 검증 일시 */
, is_notification_unavailable = #{isNotificationUnavailable} /* 사용자의 알림톡 수신 가능 여부 */
, user_notified_at = #{userNotifiedAt} /* 사용자의 알림톡 수신 일시 */
, distribution_received_at = #{distributionReceivedAt} /* 유통정보의 수신 시각 */
, error_code = #{errorCode} /* 에러 코드 */
, error_message = #{errorMessage} /* 에러 메시지 */
, updt_dt = now()
, updusr = 'batch'
WHERE unity_sndng_detail_id = (SELECT tekmd.unity_sndng_detail_id
FROM tb_ens_kakao_d10 tekmd
WHERE tekmd.envelope_id = #{envelopeId})
</update>
<!-- =================================================================================== -->
<!-- ================================ status ============================================= -->
<!-- =================================================================================== -->
@ -1102,8 +1136,8 @@
WHERE unity_sndng_detail_id = #{unitySndngDetailId}
</insert>
<update id="updateCntcSndngResultByKkoMyDoc">
/** ens-mysql-mapper|updateCntcSndngResult-연계발송결과반영|julim */
<update id="updateCntcSndngResultByKkopay">
/** ens-mysql-mapper|updateCntcSndngResultByKkopay-카카오페이 연계발송결과반영|julim */
UPDATE tb_cntc_sndng_result
SET sndng_result_sttus = #{sndngResultSttus}
, requst_dt = from_unixtime(#{requstDt}, '%Y%m%d%H%i%s') /* 송신(요청) 일시 */
@ -1114,7 +1148,22 @@
, updusr = 'batch'
WHERE unity_sndng_detail_id = (SELECT tekmd.unity_sndng_detail_id
FROM tb_ens_kakao_my_doc tekmd
WHERE tekmd.document_binder_uuid = #{documentBinderUuid})
WHERE tekmd.document_binder_uuid = #{docKeyId})
</update>
<update id="updateCntcSndngResultByKkotalk">
/** ens-mysql-mapper|updateCntcSndngResultByKkotalk-카카오톡 연계발송결과반영|jhseo */
UPDATE tb_cntc_sndng_result
SET sndng_result_sttus = #{sndngResultSttus}
, requst_dt = DATE_FORMAT(#{requstDt}, '%Y%m%d%H%i%s') /* 송신(요청) 일시 */
, inqire_dt = DATE_FORMAT(#{inqireDt}, '%Y%m%d%H%i%s') /* 수신(조회) 일시 */
, readng_dt = DATE_FORMAT(#{readngDt}, '%Y%m%d%H%i%s') /* 최초열람일시 */
, error_cn = #{errorCn}
, updt_dt = now()
, updusr = 'batch'
WHERE unity_sndng_detail_id = (SELECT tekd.unity_sndng_detail_id
FROM tb_ens_kakao_d10 tekd
WHERE tekd.envelope_id = #{docKeyId})
</update>
<!-- =================================================================================== -->
<!-- ================================ result ============================================= -->

16
mens-core/src/main/java/kr/xit/biz/ens/model/cntc/CntcDTO.java
Unescape Escape View File

@ -1,13 +1,19 @@
package kr.xit.biz.ens.model.cntc;
import java.io.Serializable;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import kr.xit.biz.common.AuditFields;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
/**
* <pre>
@ -199,7 +205,7 @@ public class CntcDTO {
/**
* documentBinderUuid
*/
private String documentBinderUuid;
private String docKeyId;
}
@Data

Write Preview
Loading…
Cancel
Save