tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://tolag3@vcs.iten.co.kr:9999/hylee/mjon_git into master_tolag3

Browse Source
This commit is contained in:
leejunho 2025-04-15 16:38:54 +09:00
commit e8c19d0f8a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
View File

@ -80,9 +80,6 @@ public class KakaoSendUtil {
log.info(" +kakaoVO.getVarListMap().size() :: [{}]", kakaoVO.getVarListMap().size());
List<KakaoSendAdvcVO> kakaoSendAdvcListVO = new ArrayList<>(); List<KakaoSendAdvcVO> kakaoSendAdvcListVO = new ArrayList<>();
Calendar calendar = setupBaseDate(kakaoVO, isNotified); Calendar calendar = setupBaseDate(kakaoVO, isNotified);
@ -133,9 +130,10 @@ public class KakaoSendUtil {
/** @Map에 총 갯수가 수신자 갯수와 동일함 */ /** @Map에 총 갯수가 수신자 갯수와 동일함 */
List<Map<String, String>> varList = kakaoVO.getVarListMap(); List<Map<String, String>> varList = kakaoVO.getVarListMap();
for (int i = 0; i < varList.size(); i++) { for (int i = 0; i < varList.size(); i++) {
// for(Map<String, String> variables : kakaoVO.getVarListMap()) { // for(Map<String, String> variables : kakaoVO.getVarListMap()) {
// 치환 데이터 // 치환 데이터
Map<String, String> variables = varList.get(i); Map<String, String> variables = varList.get(i);
log.info("");
/** @공통 기본값 */ /** @공통 기본값 */
KakaoSendAdvcVO sendVO = createSendVO(kakaoVO); KakaoSendAdvcVO sendVO = createSendVO(kakaoVO);
@ -151,10 +149,12 @@ public class KakaoSendUtil {
} }
/** @Step1-3: 템플릿 치환데이터 설정 */ /** @Step1-3: 템플릿 치환데이터 설정 */
String templateContentTemp = "";
String templateTitleTemp = "";
if (hasContentReplacement) { if (hasContentReplacement) {
templateContent = mjonCommon.ATReplaceTemplateVariables(templateContent, variables); templateContentTemp = mjonCommon.ATReplaceTemplateVariables(templateContent, variables);
if(hasTitleReplacement) { if(hasTitleReplacement) {
templateTitle = mjonCommon.ATReplaceTemplateVariables(templateTitle, variables); templateTitleTemp = mjonCommon.ATReplaceTemplateVariables(templateTitle, variables);
} }
} }
/** @버튼 치환 */ // 버튼 리스트가 있으면 치환 수행, 항상 sendVO에 설정 /** @버튼 치환 */ // 버튼 리스트가 있으면 치환 수행, 항상 sendVO에 설정
@ -164,8 +164,8 @@ public class KakaoSendUtil {
} }
sendVO.setButtonList(buttonList); sendVO.setButtonList(buttonList);
sendVO.setTemplateTitle(templateTitle); sendVO.setTemplateTitle(templateTitleTemp);
sendVO.setTemplateContent(templateContent); sendVO.setTemplateContent(templateContentTemp);
// Step 1-4: 실패 대체 문자 치환데이터 설정 // Step 1-4: 실패 대체 문자 치환데이터 설정
@ -261,6 +261,7 @@ public class KakaoSendUtil {
} }
} }
log.info(" sendVO :: [{}]", sendVO);
kakaoSendAdvcListVO.add(sendVO); kakaoSendAdvcListVO.add(sendVO);
} }