Commit @f228f2a24704df700ee73344b3ca4e9f7b99c823

106f370

f228f2a

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


 
 			
 
+			/* @isHolidayNotified
+			 *  - 관리자 알림 설정으로 인해 
+			 *  - 해당 시간이면 지연 미처리
+			 * @smishingYn
+			 *  - 회원 별 '스미싱 온' 상태값
+			 *  - Y면 알림, 지연 처리해야 함
+			 * */
 			if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) {
 				mjonMsgVO.setSpamStatus("Y");
 				mjonMsgVO.setSmishingYn("Y");

 					
 				}
 				
+				/* @isHolidayNotified
+				 *  - 관리자 알림 설정으로 인해 
+				 *  - 해당 시간이면 지연 미처리
+				 * */
 				mjonMsgVO.setSpamStatus("Y");
 				if(isHolidayNotified) {
 					mjonMsgVO.setDelayYn("Y");

106f370

f228f2a

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


 		List<MsgHolidayVO> holidayList = getHolidayList();
 		boolean isNotificationAllowed = new MjonHolidayApi().getHolidaySmishingPassStatus(alarmList, holidayList);
 
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
-		System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
 		return !isNotificationAllowed; // 알림 발송 조건 미충족
 	}
 

106f370

f228f2a

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


 		System.out.println("================================");
 		// 스팸 및 스미싱 의심이면 slack 알림
 		boolean isHolidayNotified = mjonCommon.handleSmishingAlert(mjonMsgVO);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
-		System.out.println("isNotified :: "+ isHolidayNotified);
 		
 		
 		// 스팸관련 키워드 select

106f370

f228f2a

src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp


 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				else{
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				}
 			}
 			form.submit();					
 		}

 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				else{
+					
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				}
 			}
 			form.submit();		
 	    }

106f370

f228f2a

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp


 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				else
+				{
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				}
 			}
 			form.submit();					
 		}

 				if (advertisementCnt > 0) {
 					// 광고문자
 					form.msgResendAllAdvertiseYn.value = "Y";
+					form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
 				}
-				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				else
+				{
+					form.action="/web/mjon/msgdata/selectMsgDataView.do";
+				}
 			}
 			form.submit();		
 	    }

106f370

f228f2a

src/main/webapp/js/web/msgdata/msgDataView.js

--- src/main/webapp/js/web/msgdata/msgDataView.js

+++ src/main/webapp/js/web/msgdata/msgDataView.js


 				
 				// 문자내용
 				if (smsTxt.indexOf("(광고)") == 0) {
-					$('#send_adYnY').prop('checked', true);
+					// $('#send_adYnY').prop('checked', true);
 					
 					//광고 상하단 내용 넣어주기
-					advMsgInsert();				
+					// advMsgInsert();				
 					
 					// 광고 기본정보 제거
 					smsTxt = $.trim(smsTxt.replace("(광고)", ""));

...	...	@@ -357,6 +357,13 @@
357	357
358	358
359	359
	360	+ /* @isHolidayNotified
	361	+ * - 관리자 알림 설정으로 인해
	362	+ * - 해당 시간이면 지연 미처리
	363	+ * @smishingYn
	364	+ * - 회원 별 '스미싱 온' 상태값
	365	+ * - Y면 알림, 지연 처리해야 함
	366	+ * */
360	367	if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) {
361	368	mjonMsgVO.setSpamStatus("Y");
362	369	mjonMsgVO.setSmishingYn("Y");
...	...	@@ -461,6 +468,10 @@
461	468
462	469	}
463	470
	471	+ /* @isHolidayNotified
	472	+ * - 관리자 알림 설정으로 인해
	473	+ * - 해당 시간이면 지연 미처리
	474	+ * */
464	475	mjonMsgVO.setSpamStatus("Y");
465	476	if(isHolidayNotified) {
466	477	mjonMsgVO.setDelayYn("Y");

...	...	@@ -544,10 +544,6 @@
544	544	List<MsgHolidayVO> holidayList = getHolidayList();
545	545	boolean isNotificationAllowed = new MjonHolidayApi().getHolidaySmishingPassStatus(alarmList, holidayList);
546	546
547		- System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
548		- System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
549		- System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
550		- System.out.println(" :: isNotificationAllowed : "+ isNotificationAllowed);
551	547	return !isNotificationAllowed; // 알림 발송 조건 미충족
552	548	}
553	549

...	...	@@ -4060,11 +4060,6 @@
4060	4060	System.out.println("================================");
4061	4061	// 스팸 및 스미싱 의심이면 slack 알림
4062	4062	boolean isHolidayNotified = mjonCommon.handleSmishingAlert(mjonMsgVO);
4063		- System.out.println("isNotified :: "+ isHolidayNotified);
4064		- System.out.println("isNotified :: "+ isHolidayNotified);
4065		- System.out.println("isNotified :: "+ isHolidayNotified);
4066		- System.out.println("isNotified :: "+ isHolidayNotified);
4067		- System.out.println("isNotified :: "+ isHolidayNotified);
4068	4063
4069	4064
4070	4065	// 스팸관련 키워드 select

...	...	@@ -73,8 +73,11 @@
73	73	if (advertisementCnt > 0) {
74	74	// 광고문자
75	75	form.msgResendAllAdvertiseYn.value = "Y";
	76	+ form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
76	77	}
77		- form.action="/web/mjon/msgdata/selectMsgDataView.do";
	78	+ else{
	79	+ form.action="/web/mjon/msgdata/selectMsgDataView.do";
	80	+ }
78	81	}
79	82	form.submit();
80	83	}
...	...	@@ -96,8 +99,12 @@
96	99	if (advertisementCnt > 0) {
97	100	// 광고문자
98	101	form.msgResendAllAdvertiseYn.value = "Y";
	102	+ form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
99	103	}
100		- form.action="/web/mjon/msgdata/selectMsgDataView.do";
	104	+ else{
	105	+
	106	+ form.action="/web/mjon/msgdata/selectMsgDataView.do";
	107	+ }
101	108	}
102	109	form.submit();
103	110	}

...	...	@@ -694,8 +694,12 @@
694	694	if (advertisementCnt > 0) {
695	695	// 광고문자
696	696	form.msgResendAllAdvertiseYn.value = "Y";
	697	+ form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
697	698	}
698		- form.action="/web/mjon/msgdata/selectMsgDataView.do";
	699	+ else
	700	+ {
	701	+ form.action="/web/mjon/msgdata/selectMsgDataView.do";
	702	+ }
699	703	}
700	704	form.submit();
701	705	}
...	...	@@ -717,8 +721,12 @@
717	721	if (advertisementCnt > 0) {
718	722	// 광고문자
719	723	form.msgResendAllAdvertiseYn.value = "Y";
	724	+ form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do";
720	725	}
721		- form.action="/web/mjon/msgdata/selectMsgDataView.do";
	726	+ else
	727	+ {
	728	+ form.action="/web/mjon/msgdata/selectMsgDataView.do";
	729	+ }
722	730	}
723	731	form.submit();
724	732	}

...	...	@@ -60,10 +60,10 @@
60	60
61	61	// 문자내용
62	62	if (smsTxt.indexOf("(광고)") == 0) {
63		- $('#send_adYnY').prop('checked', true);
	63	+ // $('#send_adYnY').prop('checked', true);
64	64
65	65	//광고 상하단 내용 넣어주기
66		- advMsgInsert();
	66	+ // advMsgInsert();
67	67
68	68	// 광고 기본정보 제거
69	69	smsTxt = $.trim(smsTxt.replace("(광고)", ""));

Delete comment