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

null 처리 오류 수정

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2024-12-23 14:46:52 +09:00
parent 6540db465c
commit 6d880bbdb0
1 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/itn/com/cmm/util/MsgSendUtils.java
View File

@ -284,7 +284,10 @@ public final class MsgSendUtils {
} }
} }
String smsSpamChkTxt = smsTxt.replaceAll(String.valueOf((char) 13), ""); String smsSpamChkTxt = smsTxt;
if(StringUtils.isNotEmpty(smsTxt)) {
smsSpamChkTxt = smsTxt.replaceAll(String.valueOf((char) 13), "");
}
// == 치환 여부에 따라 처리 로직 분기 == // == 치환 여부에 따라 처리 로직 분기 ==
// 치환 문자가 아닌 경우 // 치환 문자가 아닌 경우
@ -420,32 +423,44 @@ public final class MsgSendUtils {
} }
private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt) throws Exception { private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt) throws Exception {
String resultParser = ComGetSpamStringParser.getSpamTextParse(personalizedSmsTxt).trim();
int spmCnt = 0; if(StringUtils.isNotEmpty(personalizedSmsTxt)) {
String spmFilterTxt = "";
for (String spmTxt : resultSpamTxt) {
String parserStr = ComGetSpamStringParser.getSpamTextParse(spmTxt).trim();
if (resultParser.contains(parserStr)) {
spmCnt++;
spmFilterTxt += spmTxt + ",";
}
}
if (spmCnt > 0) { // 스팸 문자가 포함된 경우
if (StringUtil.getWordRight(spmFilterTxt.trim(), 1).equals(",")) {
// 처음부터 idx 만큼 잘라낸 나머지 글자
spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1);
}
log.info(" + spmFilterTxt :: [{}]", spmFilterTxt);
log.info(" + resultParser :: [{}]", resultParser);
// mjonMsgVO.setSpamKeyword(spmFilterTxt); String resultParser = ComGetSpamStringParser.getSpamTextParse(personalizedSmsTxt).trim();
mjonMsgVO.setSpamStatus("Y"); int spmCnt = 0;
mjonMsgVO.setDelayYn("Y"); String spmFilterTxt = "";
}else {mjonMsgVO.setSpamStatus("N");}
for (String spmTxt : resultSpamTxt) {
String parserStr = ComGetSpamStringParser.getSpamTextParse(spmTxt).trim();
if (resultParser.contains(parserStr)) {
spmCnt++;
spmFilterTxt += spmTxt + ",";
}
}
if (spmCnt > 0) { // 스팸 문자가 포함된 경우
if (StringUtil.getWordRight(spmFilterTxt.trim(), 1).equals(",")) {
// 처음부터 idx 만큼 잘라낸 나머지 글자
spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1);
}
log.info(" + spmFilterTxt :: [{}]", spmFilterTxt);
log.info(" + resultParser :: [{}]", resultParser);
// mjonMsgVO.setSpamKeyword(spmFilterTxt);
mjonMsgVO.setSpamStatus("Y");
mjonMsgVO.setDelayYn("Y");
}
else
{
mjonMsgVO.setSpamStatus("N");
}
}else {
mjonMsgVO.setSpamStatus("N");
}
} }
private static Boolean getReplaceYN(String smsTxtTemplate) {// 여러 치환 구문이 포함된 정규식 패턴 private static Boolean getReplaceYN(String smsTxtTemplate) {// 여러 치환 구문이 포함된 정규식 패턴