Commit @3e88ee9889e5bc46a23dc162b91ff51e7318fe6a

이호영 2024-12-26

사용자 알림 설정에 따른 즉시 발송

@3e88ee9889e5bc46a23dc162b91ff51e7318fe6a

0decb97

3e88ee9

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


 	 * @param statusResponse
 	 * @param agentSendCounts 
 	 * @param sendRateList 
+	 * @param isNotified 
 	 * @return call by reference
 	 * @throws Exception 
 	 */
 	public static Boolean populateSendLists(MjonMsgVO mjonMsgVO, List<MjonMsgSendVO> mjonMsgSendListVO
 			, StatusResponse statusResponse, List<String> resultSpamTxt
-			, Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList) throws Exception{
+			, Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList, boolean isNotified) throws Exception{
 		
 		log.info(" :: populateSendLists :: ");
 		

 			if (!replaceYN) {
 				// 스팸 체크와 메시지 타입 체크 각각 한 번만 수행
 				if (!hasPerformedSpamCheck) {
-					checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt);
+					checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isNotified);
 					hasPerformedSpamCheck = true;
 				}
 				if (!hasPerformedMsgType) {

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

 		sendVO.setFileCnt(mjonMsgVO.getFileCnt());
 	}
 
-	private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt) throws Exception {
+	private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt, boolean isNotified) throws Exception {
+		
+
+		mjonMsgVO.setSpamStatus("N");
 		
 		if(StringUtils.isNotEmpty(personalizedSmsTxt)) {
 			

 					spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1); 	
 					
 				}
-				log.info(" + spmFilterTxt :: [{}]", spmFilterTxt);
-				log.info(" + resultParser :: [{}]", resultParser);
 				
-	//			mjonMsgVO.setSpamKeyword(spmFilterTxt);
 				mjonMsgVO.setSpamStatus("Y");
-				mjonMsgVO.setDelayYn("Y");
+				if(isNotified) {
+					mjonMsgVO.setDelayYn("Y");
+				}
 			}
-			else 
-			{
-				mjonMsgVO.setSpamStatus("N");
-			}
-			
-		}else {
-			mjonMsgVO.setSpamStatus("N");
-			
 		}
 	}
 

0decb97

3e88ee9

src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

--- src/main/java/itn/let/mjo/mjocommon/MjonCommon.java

+++ src/main/java/itn/let/mjo/mjocommon/MjonCommon.java


 
 		// 알림 발송
 		if (!isNotificationAllowed) {
-			getAdminSandSlack(mjonMsgVO);
+//			getAdminSandSlack(mjonMsgVO);
 			return true; // 알림 발송 성공
 		}
 

 		MsgAlarmSetVO msgAlarmSetVO = new MsgAlarmSetVO();
 		msgAlarmSetVO.setUseYn("Y");
 		msgAlarmSetVO.setFirstIndex(0);
+		msgAlarmSetVO.setRecordCountPerPage(10000);
 		return msgHolidayService.selectAlarmSettingList(msgAlarmSetVO);
 	}
 

 
 		MsgHolidayVO msgHolidayVO = new MsgHolidayVO();
 		msgHolidayVO.setFirstIndex(0);
-		msgHolidayVO.setRecordCountPerPage(100);
+		msgHolidayVO.setRecordCountPerPage(10000);
 		msgHolidayVO.setSearchHoliYear(Integer.toString(year));
 		return msgHolidayService.selectMsgHolidayList(msgHolidayVO);
 	}

0decb97

3e88ee9

src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

--- src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

+++ src/main/java/itn/let/mjo/msg/web/MjonMsgController.java


 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;

 			searchVO.setSearchSortCnd("FRST_REGIST_PNTTM");
 			searchVO.setSearchSortOrd("desc");
 		}
-		
+		System.out.println("searchVO.getCancelResultYn() :: "+ searchVO.getCancelResultYn());
 		
 		/*
 		 * 2024.01.26 우영두 변경

 	   		searchVO.setNtceBgnde(beforeMonthDay);
 	   		searchVO.setNtceEndde(toDay); 
 	   	}		
+	   	
+	   	
+	   	// 조건 값이 없을때 미처리 상태 노출
+	   	if(StringUtils.isEmpty(searchVO.getCancelResultYn())) {
+	   		searchVO.setCancelResultYn("N");
+	   	}
+	   	
 
 	   	List<MjonMsgVO> resultList = new ArrayList<MjonMsgVO>();
 		resultList = mjonMsgService.selectMjonHoliMsgList(searchVO);

0decb97

3e88ee9

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


 //		UserManageVO userManageVO = MjonCommon.getUserManageInfo(userId);
 		
 		
+		
+
+		// 스팸 및 스미싱 의심이면 slack 알림
+		boolean isNotified = mjonCommon.processUserAndCheckSms(mjonMsgVO, userId);
+		
+		
 		// 스팸관련 키워드 select
 		List<String> resultSpamTxt = mjonMsgDataService.selectSpamKeywordList();
-
+		
 		/**
 		 * @methodName : populateReplacementLists
 		 * @author : 이호영

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

 		log.debug("총 단가 합계: [{}]", mjonMsgVO.getTotPrice());
 //		
 
-		// 스팸 및 스미싱 의심이면 slack 알림
-		boolean isNotified = mjonCommon.processUserAndCheckSms(mjonMsgVO, userId);
 
 		if (isNotified) {
 			System.out.println("스미싱 알림이 처리되었습니다.");
-		} else {
+			mjonCommon.getAdminSandSlack(mjonMsgVO);
+		} else if("Y".equalsIgnoreCase(mjonMsgVO.getSpamStatus())){
 			System.out.println("알림 조건을 충족하지 않았습니다.");
+			mjonMsgDAO.insertSpamPassMsgData(mjonMsgVO);
 		}
 
 		statusResponse.setStatus(HttpStatus.OK);

 
 		mjonMsgVO.setMsgGroupId(mjonMsgSendVO.getMsgGroupId());
 		mjonMsgVO.setMsgType(mjonMsgSendVO.getMsgType());
+		
+		
+		//test - 스미싱의심 [발송승인, 발송취소] 조건
+		// mjonMsgVO.setDelayYn("N");
+		
 		mjonMsgDAO.insertGroupMsgData(mjonMsgVO);
 
 	}

Add a comment

Open 0
Closed 0

List

...	...	@@ -198,12 +198,13 @@
198	198	* @param statusResponse
199	199	* @param agentSendCounts
200	200	* @param sendRateList
	201	+ * @param isNotified
201	202	* @return call by reference
202	203	* @throws Exception
203	204	*/
204	205	public static Boolean populateSendLists(MjonMsgVO mjonMsgVO, List<MjonMsgSendVO> mjonMsgSendListVO
205	206	, StatusResponse statusResponse, List<String> resultSpamTxt
206		- , Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList) throws Exception{
	207	+ , Map<String, Integer> agentSendCounts, List<MjonMsgVO> sendRateList, boolean isNotified) throws Exception{
207	208
208	209	log.info(" :: populateSendLists :: ");
209	210
...	...	@@ -299,7 +300,7 @@
299	300	if (!replaceYN) {
300	301	// 스팸 체크와 메시지 타입 체크 각각 한 번만 수행
301	302	if (!hasPerformedSpamCheck) {
302		- checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt);
	303	+ checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isNotified);
303	304	hasPerformedSpamCheck = true;
304	305	}
305	306	if (!hasPerformedMsgType) {
...	...	@@ -315,7 +316,7 @@
315	316	{// 치환 문자인 경우
316	317	// 스팸 체크는 `spamChkSize`만큼 반복 수행
317	318	if (sampleCounter < spamChkSize && !"Y".equals(mjonMsgVO.getSpamStatus())) {
318		- checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt);
	319	+ checkSpamAndSetStatus(mjonMsgVO, smsSpamChkTxt, resultSpamTxt, isNotified);
319	320	sampleCounter++;
320	321	}
321	322
...	...	@@ -419,7 +420,10 @@
419	420	sendVO.setFileCnt(mjonMsgVO.getFileCnt());
420	421	}
421	422
422		- private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt) throws Exception {
	423	+ private static void checkSpamAndSetStatus(MjonMsgVO mjonMsgVO, String personalizedSmsTxt, List<String> resultSpamTxt, boolean isNotified) throws Exception {
	424	+
	425	+
	426	+ mjonMsgVO.setSpamStatus("N");
423	427
424	428	if(StringUtils.isNotEmpty(personalizedSmsTxt)) {
425	429
...	...	@@ -442,21 +446,12 @@
442	446	spmFilterTxt = StringUtil.getWordLeft(spmFilterTxt.trim(), 1);
443	447
444	448	}
445		- log.info(" + spmFilterTxt :: [{}]", spmFilterTxt);
446		- log.info(" + resultParser :: [{}]", resultParser);
447	449
448		- // mjonMsgVO.setSpamKeyword(spmFilterTxt);
449	450	mjonMsgVO.setSpamStatus("Y");
450		- mjonMsgVO.setDelayYn("Y");
	451	+ if(isNotified) {
	452	+ mjonMsgVO.setDelayYn("Y");
	453	+ }
451	454	}
452		- else
453		- {
454		- mjonMsgVO.setSpamStatus("N");
455		- }
456		-
457		- }else {
458		- mjonMsgVO.setSpamStatus("N");
459		-
460	455	}
461	456	}
462	457

...	...	@@ -545,7 +545,7 @@
545	545
546	546	// 알림 발송
547	547	if (!isNotificationAllowed) {
548		- getAdminSandSlack(mjonMsgVO);
	548	+// getAdminSandSlack(mjonMsgVO);
549	549	return true; // 알림 발송 성공
550	550	}
551	551
...	...	@@ -562,6 +562,7 @@
562	562	MsgAlarmSetVO msgAlarmSetVO = new MsgAlarmSetVO();
563	563	msgAlarmSetVO.setUseYn("Y");
564	564	msgAlarmSetVO.setFirstIndex(0);
	565	+ msgAlarmSetVO.setRecordCountPerPage(10000);
565	566	return msgHolidayService.selectAlarmSettingList(msgAlarmSetVO);
566	567	}
567	568
...	...	@@ -572,7 +573,7 @@
572	573
573	574	MsgHolidayVO msgHolidayVO = new MsgHolidayVO();
574	575	msgHolidayVO.setFirstIndex(0);
575		- msgHolidayVO.setRecordCountPerPage(100);
	576	+ msgHolidayVO.setRecordCountPerPage(10000);
576	577	msgHolidayVO.setSearchHoliYear(Integer.toString(year));
577	578	return msgHolidayService.selectMsgHolidayList(msgHolidayVO);
578	579	}

...	...	@@ -20,6 +20,7 @@
20	20	import javax.servlet.http.HttpServletResponse;
21	21	import javax.servlet.http.HttpSession;
22	22
	23	+import org.apache.commons.lang3.StringUtils;
23	24	import org.apache.poi.ss.usermodel.Cell;
24	25	import org.apache.poi.ss.usermodel.CellStyle;
25	26	import org.apache.poi.ss.usermodel.Font;
...	...	@@ -1280,7 +1281,7 @@
1280	1281	searchVO.setSearchSortCnd("FRST_REGIST_PNTTM");
1281	1282	searchVO.setSearchSortOrd("desc");
1282	1283	}
1283		-
	1284	+ System.out.println("searchVO.getCancelResultYn() :: "+ searchVO.getCancelResultYn());
1284	1285
1285	1286	/*
1286	1287	* 2024.01.26 우영두 변경
...	...	@@ -1293,6 +1294,13 @@
1293	1294	searchVO.setNtceBgnde(beforeMonthDay);
1294	1295	searchVO.setNtceEndde(toDay);
1295	1296	}
	1297	+
	1298	+
	1299	+ // 조건 값이 없을때 미처리 상태 노출
	1300	+ if(StringUtils.isEmpty(searchVO.getCancelResultYn())) {
	1301	+ searchVO.setCancelResultYn("N");
	1302	+ }
	1303	+
1296	1304
1297	1305	List<MjonMsgVO> resultList = new ArrayList<MjonMsgVO>();
1298	1306	resultList = mjonMsgService.selectMjonHoliMsgList(searchVO);

...	...	@@ -4054,9 +4054,15 @@
4054	4054	// UserManageVO userManageVO = MjonCommon.getUserManageInfo(userId);
4055	4055
4056	4056
	4057	+
	4058	+
	4059	+ // 스팸 및 스미싱 의심이면 slack 알림
	4060	+ boolean isNotified = mjonCommon.processUserAndCheckSms(mjonMsgVO, userId);
	4061	+
	4062	+
4057	4063	// 스팸관련 키워드 select
4058	4064	List<String> resultSpamTxt = mjonMsgDataService.selectSpamKeywordList();
4059		-
	4065	+
4060	4066	/**
4061	4067	* @methodName : populateReplacementLists
4062	4068	* @author : 이호영
...	...	@@ -4066,7 +4072,7 @@
4066	4072	* 전송사 코드 셋팅
4067	4073	*/
4068	4074	if (!MsgSendUtils.populateSendLists(mjonMsgVO, mjonMsgSendVOList, statusResponse, resultSpamTxt,
4069		- agentSendCounts, sendRateList)) {
	4075	+ agentSendCounts, sendRateList, isNotified)) {
4070	4076	;
4071	4077	// 문자 치환 후 전송 문자 길이를 초과하였습니다.
4072	4078	// 문자 치환 중 오류가 발생하였습니다.
...	...	@@ -4153,13 +4159,13 @@
4153	4159	log.debug("총 단가 합계: [{}]", mjonMsgVO.getTotPrice());
4154	4160	//
4155	4161
4156		- // 스팸 및 스미싱 의심이면 slack 알림
4157		- boolean isNotified = mjonCommon.processUserAndCheckSms(mjonMsgVO, userId);
4158	4162
4159	4163	if (isNotified) {
4160	4164	System.out.println("스미싱 알림이 처리되었습니다.");
4161		- } else {
	4165	+ mjonCommon.getAdminSandSlack(mjonMsgVO);
	4166	+ } else if("Y".equalsIgnoreCase(mjonMsgVO.getSpamStatus())){
4162	4167	System.out.println("알림 조건을 충족하지 않았습니다.");
	4168	+ mjonMsgDAO.insertSpamPassMsgData(mjonMsgVO);
4163	4169	}
4164	4170
4165	4171	statusResponse.setStatus(HttpStatus.OK);
...	...	@@ -4191,6 +4197,11 @@
4191	4197
4192	4198	mjonMsgVO.setMsgGroupId(mjonMsgSendVO.getMsgGroupId());
4193	4199	mjonMsgVO.setMsgType(mjonMsgSendVO.getMsgType());
	4200	+
	4201	+
	4202	+ //test - 스미싱의심 [발송승인, 발송취소] 조건
	4203	+ // mjonMsgVO.setDelayYn("N");
	4204	+
4194	4205	mjonMsgDAO.insertGroupMsgData(mjonMsgVO);
4195	4206
4196	4207	}

Delete comment