From c7eea28b6a68bd8ad72a271c47eb8d19cf21bac0 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Wed, 11 Sep 2024 14:29:52 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=86=A1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=98=EC=98=81=20-=20status=20=20=20?= =?UTF-8?q?=20=20=20=20-=20=EC=83=81=ED=83=9C=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EB=B0=98=EC=98=81=EC=8B=9C=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EB=8D=B0=EC=9D=B4=ED=83=80=20=ED=8F=AC=EB=A7=B7=20?= =?UTF-8?q?=EB=B3=80=EB=A0=B9=20=20=20=20=20=20=20=20=20->=20yyyyMMddHHmms?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/mens-iup-query.sql | 6 +++--- .../service/support/KkoTalkRsltFetcher.java | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db/mens-iup-query.sql b/db/mens-iup-query.sql index e481f68..bb33c72 100644 --- a/db/mens-iup-query.sql +++ b/db/mens-iup-query.sql @@ -1,14 +1,14 @@ Insert into TB_INPUT_XIT (LNK_INPUT_ID, ORG_CD, JOB_CD, TOT_CNT, PRCS_CD, RUN_DT, EXPIRES_DT, SEND_TYPE, REG_ID, REG_DT, PAY_EXPIRES_DT) Values - (302400001119, '0002', 'B0001', 1, 'TGRG', SYSDATE, SYSDATE + 30 + (302400001120, '0002', 'B0001', 1, 'TGRG', SYSDATE, SYSDATE + 30 , 'KP', 'cntc', SYSDATE, SYSDATE+30); Insert into TB_INPUT_DATA_XIT (LNK_INPUT_ID, DATA_ID, SID, NAME, BIRTHDAY, GENDER, MSG_DATA, MSG_DTL_DATA, REG_ID, REG_DT, CAR_NO, CALL_CENTER_NO) Values - (302400001119, '300799990000000001119', '8312181157213', '김지호', '19831218','1' + (302400001120, '300799990000000001120', '8312181157213', '김지호', '19831218','1' , '{"~~@@!!CAR_NO!!@@~~":"20우3412","~~@@!!DEGREE!!@@~~":"3","~~@@!!FEE!!@@~~":"1,900","~~@@!!YYYY!!@@~~":"2022","~~@@!!MM!!@@~~":"03","~~@@!!DD!!@@~~":"11","~~@@!!BANK!!@@~~":"우체국","~~@@!!ACCOUNT!!@@~~":"8608-90-80907938","~~@@!!HISTORY!!@@~~":"-2021-11-29 12:33 (별내 550)\n-2021-11-29 12:19 (양주 900)\n-2021-11-30 14:33 (불암산② 450)","~~@@!!CALL_NO!!@@~~":"(031)522-6400~1","~~@@!!HOMEPAGE!!@@~~":"https://seoulbeltway.co.kr/main/esccar.jsp"}' , '{"details":[{"item_type":"TEXT","elements":[],"title":"미납통행료 안내문(1차)","properties":{"use_toggle":false}},{"item_type":"PRE_TEXT","elements":"수도권제1순환고속도로 안내문(1차)이 도착하였습니다.\n미납통행료 종이고지서를 모바일 전자문서로 고지하고 있으며, 본 전자문서를 받으신 경우 종이고지서는 발송되지 않습니다.","title":"","properties":{"use_toggle":false}},{"item_type":"KEY_VALUE","elements":[{"level":1,"value":"67어3853","key":"차량번호"},{"level":1,"value":"수도권제1순환","key":"미납발생\n노선명"},{"level":1,"value":"미납통행료 안내문(1차)","key":"고지서명"},{"level":1,"value":"1,260원","key":"납부하실 통행료"},{"level":1,"value":"1,260원","key":"- 미납통행료"},{"level":1,"value":"0원","key":"- 부가통행료"},{"level":1,"value":"2023년 06월 22일까지","key":"납부기한"}],"title":"안내내역","properties":{"use_toggle":false}},{"item_type":"TEXT","elements":[],"title":"상세내역","properties":{"use_toggle":false}},{"item_type":"KEY_VALUE","elements":[{"level":1,"value":"2023-05-20 13:10","key":"통행일시"},{"level":1,"value":"양주","key":"통행영업소"},{"level":1,"value":"1,260 원","key":"통행요금"},{"level":1,"value":"SC잔액부족","key":"미납사유"}],"title":"","properties":{"use_toggle":false}},{"item_type":"PRE_TEXT","elements":" \n","title":"","properties":{"use_toggle":false}},{"item_type":"PRE_TEXT","elements":"※ 해당 통행을 포함하여 최근 1년 이내에 20회 이상 통행료 미납 시 누적 20회부터 즉시 부가통행료(미납통행료의 10배)가 미납통행료와 함께 부과될 수 있음을 알려드립니다.","title":"","properties":{"style":{"highlight":{"※ 해당 통행을 포함하여 최근 1년 이내에 20회 이상 통행료 미납 시 누적 20회부터 즉시 부가통행료(미납통행료의 10배)가 미납통행료와 함께 부과될 수 있음을 알려드립니다.":{"font-color":"black","font-weight":"bold"}}},"use_toggle":false}},{"item_type":"KEY_VALUE","elements":[{"level":1,"value":"하단의 납부하기 클릭 또는\n가상계좌 납부\n(우체국 8608-89-80215603)","key":"납부방법"},{"level":1,"value":"수도권제1순환고속도로\n고객센터 ☎ (031)894-6300~1\n홈페이지 https://seoulbeltway.co.kr/main/esccar.jsp","key":"문의처"}],"title":"납부방법 및 문의처","properties":{"hyperlink":["https://seoulbeltway.co.kr/main/esccar.jsp"],"style":{"highlight":{"(031)894-6300~1":{"font-color":"blue","font-weight":"bold","font-size":"35px","use-clipboard":true},"우체국":{"font-weight":"bold"},"고객센터 ☎ ":{"font-color":"blue","font-weight":"bold","font-size":"35px"},"8608-89-80215603":{"font-weight":"bold","use-clipboard":true}}},"use_toggle":false}},{"item_type":"TABLE","elements":{"head":[""],"rows":[["발송처 : 민자도로 관리지원센터\n(044-211-3377)"]]},"title":"","properties":{"style":{"highlight":{"발송처 : 민자도로 관리지원센터":{"font-size":"25px"},"(044-211-3377)":{"font-size":"25px"}},"text_align":["right"]},"use_toggle":false}},{"item_type":"PAY_BUTTON","title":"납부하기"}]}' , 'cntc', SYSDATE, '20우3412', '1599-2509'); @@ -47,7 +47,7 @@ commit; -select * from ens_intgrn_snd_mast; +select * from ens_intgrn_snd_mast order by REGIST_DT desc; select * from ens_intgrn_snd_dtl; select * from ens_bill; select * from ens_tmplt_mng; diff --git a/src/main/java/cokr/xit/ens/modules/kkotalk/service/support/KkoTalkRsltFetcher.java b/src/main/java/cokr/xit/ens/modules/kkotalk/service/support/KkoTalkRsltFetcher.java index 7ea622f..25f9be2 100644 --- a/src/main/java/cokr/xit/ens/modules/kkotalk/service/support/KkoTalkRsltFetcher.java +++ b/src/main/java/cokr/xit/ens/modules/kkotalk/service/support/KkoTalkRsltFetcher.java @@ -94,7 +94,7 @@ public class KkoTalkRsltFetcher extends ResultProcTemplate { .map(row -> this.toApiRespVOMap(row)) .collect(Collectors.toMap(m -> String.valueOf(m.get("key")), m -> (KkoTalkApiRespVO) m.get("value"), (k1, k2) -> k1)); - list.stream().forEach(row -> this.modifyStatInfoByEnvelopeId(row, mApiRespVO)); + list.forEach(row -> this.modifyStatInfoByEnvelopeId(row, mApiRespVO)); } catch (EnsException e) { @@ -112,7 +112,7 @@ public class KkoTalkRsltFetcher extends ResultProcTemplate { ); } finally { // FIXME: 카카오톡 추가 - 카카오톡 테이블 업데이트 - list.stream() + list .forEach(talkMapper::updateKakaotalkStatusBulksResult); if (!CmmnUtil.isEmpty(envelopeIds)) @@ -280,14 +280,14 @@ public class KkoTalkRsltFetcher extends ResultProcTemplate { .envelopeId(row.getEnvelopeId()) .externalId(row.getExternalId()) .status(statusData.containsKey("status") ? (String) statusData.get("status") : null) - .sentAt(statusData.containsKey("sentAt") ? (String) statusData.get("sentAt") : null) - .receivedAt(statusData.containsKey("receivedAt") ? (String) statusData.get("receivedAt") : null) - .readAt(statusData.containsKey("readAt") ? (String) statusData.get("readAt") : null) - .readExpiredAt(statusData.containsKey("readExpiredAt") ? (String) statusData.get("readExpiredAt") : null) - .authenticatedAt(statusData.containsKey("authenticatedAt") ? (String) statusData.get("authenticatedAt") : null) - .ottVerifiedAt(statusData.containsKey("ottVerifiedAt") ? (String) statusData.get("ottVerifiedAt") : null) - .userNotifiedAt(statusData.containsKey("userNotifiedAt") ? (String) statusData.get("userNotifiedAt") : null) - .distributionReceivedAt(statusData.containsKey("distributionReceivedAt") ? (String) statusData.get("distributionReceivedAt") : null) + .sentAt(statusData.containsKey("sentAt") ? DateUtil.getTimeOfTimeT((String)statusData.get("sentAt"), "yyyyMMddHHmmss") : null) + .receivedAt(statusData.containsKey("receivedAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("receivedAt"), "yyyyMMddHHmmss") : null) + .readAt(statusData.containsKey("readAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("readAt"), "yyyyMMddHHmmss") : null) + .readExpiredAt(statusData.containsKey("readExpiredAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("readExpiredAt"), "yyyyMMddHHmmss") : null) + .authenticatedAt(statusData.containsKey("authenticatedAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("authenticatedAt"), "yyyyMMddHHmmss") : null) + .ottVerifiedAt(statusData.containsKey("ottVerifiedAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("ottVerifiedAt"), "yyyyMMddHHmmss") : null) + .userNotifiedAt(statusData.containsKey("userNotifiedAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("userNotifiedAt"), "yyyyMMddHHmmss") : null) + .distributionReceivedAt(statusData.containsKey("distributionReceivedAt") ? DateUtil.getTimeOfTimeT((String) statusData.get("distributionReceivedAt"), "yyyyMMddHHmmss") : null) .payload(statusData.containsKey("payload") ? (String) statusData.get("payload") : null) .error(FieldError.initBuilder() .errorCode(apiRespVO.getErrorCode())