Commit @6d880bbdb09063ad41c90fb35d1d2e9f9e21cf77

이호영 2024-12-23

null 처리 오류 수정

@6d880bbdb09063ad41c90fb35d1d2e9f9e21cf77

6540db4

6d880bb

src/main/java/itn/com/cmm/util/MsgSendUtils.java

--- src/main/java/itn/com/cmm/util/MsgSendUtils.java

+++ src/main/java/itn/com/cmm/util/MsgSendUtils.java


 				}
 			}
 
-			String smsSpamChkTxt = smsTxt.replaceAll(String.valueOf((char) 13), "");
+			String smsSpamChkTxt = smsTxt;
+			if(StringUtils.isNotEmpty(smsTxt)) {
+				smsSpamChkTxt = smsTxt.replaceAll(String.valueOf((char) 13), "");
+			}
 
 			// == 치환 여부에 따라 처리 로직 분기 == 
 			// 치환 문자가 아닌 경우

 	}
 
 	private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt) throws Exception {
-		String resultParser = ComGetSpamStringParser.getSpamTextParse(personalizedSmsTxt).trim();
-		int spmCnt = 0;
-		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);
+		
+		if(StringUtils.isNotEmpty(personalizedSmsTxt)) {
 			
-//			mjonMsgVO.setSpamKeyword(spmFilterTxt);
-			mjonMsgVO.setSpamStatus("Y");
-			mjonMsgVO.setDelayYn("Y");
-		}else {mjonMsgVO.setSpamStatus("N");}
+			String resultParser = ComGetSpamStringParser.getSpamTextParse(personalizedSmsTxt).trim();
+			int spmCnt = 0;
+			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);
+				mjonMsgVO.setSpamStatus("Y");
+				mjonMsgVO.setDelayYn("Y");
+			}
+			else 
+			{
+				mjonMsgVO.setSpamStatus("N");
+			}
+			
+		}else {
+			mjonMsgVO.setSpamStatus("N");
+			
+		}
 	}
 
 	private static Boolean getReplaceYN(String smsTxtTemplate) {// 여러 치환 구문이 포함된 정규식 패턴

Add a comment

Open 0
Closed 0

List

...	...	@@ -284,7 +284,10 @@
284	284	}
285	285	}
286	286
287		- String smsSpamChkTxt = smsTxt.replaceAll(String.valueOf((char) 13), "");
	287	+ String smsSpamChkTxt = smsTxt;
	288	+ if(StringUtils.isNotEmpty(smsTxt)) {
	289	+ smsSpamChkTxt = smsTxt.replaceAll(String.valueOf((char) 13), "");
	290	+ }
288	291
289	292	// == 치환 여부에 따라 처리 로직 분기 ==
290	293	// 치환 문자가 아닌 경우
...	...	@@ -420,32 +423,44 @@
420	423	}
421	424
422	425	private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt) throws Exception {
423		- String resultParser = ComGetSpamStringParser.getSpamTextParse(personalizedSmsTxt).trim();
424		- int spmCnt = 0;
425		- String spmFilterTxt = "";
426		-
427		- for (String spmTxt : resultSpamTxt) {
428		- String parserStr = ComGetSpamStringParser.getSpamTextParse(spmTxt).trim();
429		- if (resultParser.contains(parserStr)) {
430		- spmCnt++;
431		- spmFilterTxt += spmTxt + ",";
432		- }
433		- }
434		-
435		- if (spmCnt > 0) { // 스팸 문자가 포함된 경우
436		-
437		- if (StringUtil.getWordRight(spmFilterTxt.trim(), 1).equals(",")) {
438		- // 처음부터 idx 만큼 잘라낸 나머지 글자
439		- spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1);
440		-
441		- }
442		- log.info(" + spmFilterTxt :: [{}]", spmFilterTxt);
443		- log.info(" + resultParser :: [{}]", resultParser);
	426	+
	427	+ if(StringUtils.isNotEmpty(personalizedSmsTxt)) {
444	428
445		-// mjonMsgVO.setSpamKeyword(spmFilterTxt);
446		- mjonMsgVO.setSpamStatus("Y");
447		- mjonMsgVO.setDelayYn("Y");
448		- }else {mjonMsgVO.setSpamStatus("N");}
	429	+ String resultParser = ComGetSpamStringParser.getSpamTextParse(personalizedSmsTxt).trim();
	430	+ int spmCnt = 0;
	431	+ String spmFilterTxt = "";
	432	+
	433	+ for (String spmTxt : resultSpamTxt) {
	434	+ String parserStr = ComGetSpamStringParser.getSpamTextParse(spmTxt).trim();
	435	+ if (resultParser.contains(parserStr)) {
	436	+ spmCnt++;
	437	+ spmFilterTxt += spmTxt + ",";
	438	+ }
	439	+ }
	440	+
	441	+ if (spmCnt > 0) { // 스팸 문자가 포함된 경우
	442	+
	443	+ if (StringUtil.getWordRight(spmFilterTxt.trim(), 1).equals(",")) {
	444	+ // 처음부터 idx 만큼 잘라낸 나머지 글자
	445	+ spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1);
	446	+
	447	+ }
	448	+ log.info(" + spmFilterTxt :: [{}]", spmFilterTxt);
	449	+ log.info(" + resultParser :: [{}]", resultParser);
	450	+
	451	+ // mjonMsgVO.setSpamKeyword(spmFilterTxt);
	452	+ mjonMsgVO.setSpamStatus("Y");
	453	+ mjonMsgVO.setDelayYn("Y");
	454	+ }
	455	+ else
	456	+ {
	457	+ mjonMsgVO.setSpamStatus("N");
	458	+ }
	459	+
	460	+ }else {
	461	+ mjonMsgVO.setSpamStatus("N");
	462	+
	463	+ }
449	464	}
450	465
451	466	private static Boolean getReplaceYN(String smsTxtTemplate) {// 여러 치환 구문이 포함된 정규식 패턴

Delete comment