Commit @04c8475bc748ddaf63f6498851870f084591bd0a

이호영 2025-01-06

금지어 예외처리 슬렉 알림 추가

@04c8475bc748ddaf63f6498851870f084591bd0a

20ae689

04c8475

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


 	 */
 	public static Boolean populateSendLists(MjonMsgVO mjonMsgVO, List<MjonMsgSendVO> mjonMsgSendListVO
 			, StatusResponse statusResponse, List<String> resultSpamTxt
-			, Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList, boolean isHolidayNotified, String smishingYn) throws Exception{
+			, Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList, boolean isHolidayNotified, UserManageVO userManageVO) throws Exception{
+		
+		
 		
 		log.info(" :: populateSendLists :: ");
-		
-		
+
+		String smishingYn = userManageVO.getSmishingYn();
+		String exceptSpamYn = userManageVO.getExceptSpamYn();
 
 
 		// 예약 시간 기본값 설정

 			// 치환 문자가 아닌 경우
 			if (!replaceYN) {
 				// 스팸 체크와 메시지 타입 체크 각각 한 번만 수행
-				if (!hasPerformedSpamCheck) {
+				if (!hasPerformedSpamCheck && "N".equals(exceptSpamYn)) {
 					checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isHolidayNotified);
 					hasPerformedSpamCheck = true;
 				}

 			else  
 			{// 치환 문자인 경우
 				// 스팸 체크는 `spamChkSize`만큼 반복 수행
-				if (sampleCounter < spamChkSize && !"Y".equals(mjonMsgVO.getSpamStatus())) {
+				if (sampleCounter < spamChkSize && !"Y".equals(mjonMsgVO.getSpamStatus()) && "N".equals(exceptSpamYn)) {
 					checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isHolidayNotified);
 					sampleCounter++;
 				}

20ae689

04c8475

src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

--- src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java

+++ src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java


 		 *              전송사 코드 셋팅
 		 */
 		if (!MsgSendUtils.populateSendLists(mjonMsgVO, mjonMsgSendVOList, statusResponse, resultSpamTxt,
-				agentSendCounts, sendRateList, isHolidayNotified, userManageVO.getSmishingYn())) {
+				agentSendCounts, sendRateList, isHolidayNotified, userManageVO)) {
 			;
 			// 문자 치환 후 전송 문자 길이를 초과하였습니다.
 			// 문자 치환 중 오류가 발생하였습니다.

20ae689

04c8475

src/main/java/itn/let/uss/umt/service/UserManageVO.java

--- src/main/java/itn/let/uss/umt/service/UserManageVO.java

+++ src/main/java/itn/let/uss/umt/service/UserManageVO.java


 	private String nextPayMethod;
 	private float paymentCash;		//이전달에 실제 사용한 캐시 정보
 	
+	private String exceptSpamYn;		//금지어 예외여부 온(on) - Y, 오프(off) - N
+	
 	
 
 	public UserManageVO(String userId) {

20ae689

04c8475

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml


 			,AUTO_CASH					AS autoCash
 			,IFNULL(BLINE_CODE, 'N')	AS blineCode
 			,IFNULL(RECOMMEND_ID, '')	AS recommendId
+			,EXCEPT_SPAM_YN				AS exceptSpamYn
 		FROM
 			LETTNGNRLMBER
 		WHERE

Add a comment

Open 0
Closed 0

List

...	...	@@ -205,11 +205,14 @@
205	205	*/
206	206	public static Boolean populateSendLists(MjonMsgVO mjonMsgVO, List<MjonMsgSendVO> mjonMsgSendListVO
207	207	, StatusResponse statusResponse, List<String> resultSpamTxt
208		- , Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList, boolean isHolidayNotified, String smishingYn) throws Exception{
	208	+ , Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList, boolean isHolidayNotified, UserManageVO userManageVO) throws Exception{
	209	+
	210	+
209	211
210	212	log.info(" :: populateSendLists :: ");
211		-
212		-
	213	+
	214	+ String smishingYn = userManageVO.getSmishingYn();
	215	+ String exceptSpamYn = userManageVO.getExceptSpamYn();
213	216
214	217
215	218	// 예약 시간 기본값 설정
...	...	@@ -303,7 +306,7 @@
303	306	// 치환 문자가 아닌 경우
304	307	if (!replaceYN) {
305	308	// 스팸 체크와 메시지 타입 체크 각각 한 번만 수행
306		- if (!hasPerformedSpamCheck) {
	309	+ if (!hasPerformedSpamCheck && "N".equals(exceptSpamYn)) {
307	310	checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isHolidayNotified);
308	311	hasPerformedSpamCheck = true;
309	312	}
...	...	@@ -319,7 +322,7 @@
319	322	else
320	323	{// 치환 문자인 경우
321	324	// 스팸 체크는 `spamChkSize`만큼 반복 수행
322		- if (sampleCounter < spamChkSize && !"Y".equals(mjonMsgVO.getSpamStatus())) {
	325	+ if (sampleCounter < spamChkSize && !"Y".equals(mjonMsgVO.getSpamStatus()) && "N".equals(exceptSpamYn)) {
323	326	checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isHolidayNotified);
324	327	sampleCounter++;
325	328	}

...	...	@@ -4076,7 +4076,7 @@
4076	4076	* 전송사 코드 셋팅
4077	4077	*/
4078	4078	if (!MsgSendUtils.populateSendLists(mjonMsgVO, mjonMsgSendVOList, statusResponse, resultSpamTxt,
4079		- agentSendCounts, sendRateList, isHolidayNotified, userManageVO.getSmishingYn())) {
	4079	+ agentSendCounts, sendRateList, isHolidayNotified, userManageVO)) {
4080	4080	;
4081	4081	// 문자 치환 후 전송 문자 길이를 초과하였습니다.
4082	4082	// 문자 치환 중 오류가 발생하였습니다.

...	...	@@ -218,6 +218,8 @@
218	218	private String nextPayMethod;
219	219	private float paymentCash; //이전달에 실제 사용한 캐시 정보
220	220
	221	+ private String exceptSpamYn; //금지어 예외여부 온(on) - Y, 오프(off) - N
	222	+
221	223
222	224
223	225	public UserManageVO(String userId) {

...	...	@@ -1318,6 +1318,7 @@
1318	1318	,AUTO_CASH AS autoCash
1319	1319	,IFNULL(BLINE_CODE, 'N') AS blineCode
1320	1320	,IFNULL(RECOMMEND_ID, '') AS recommendId
	1321	+ ,EXCEPT_SPAM_YN AS exceptSpamYn
1321	1322	FROM
1322	1323	LETTNGNRLMBER
1323	1324	WHERE

Delete comment