From f228f2a24704df700ee73344b3ca4e9f7b99c823 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Fri, 27 Dec 2024 12:52:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=EC=A0=84=EC=86=A1=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/util/MsgSendUtils.java | 11 +++++++++++ src/main/java/itn/let/mjo/mjocommon/MjonCommon.java | 4 ---- .../msgdata/service/impl/MjonMsgDataServiceImpl.java | 5 ----- .../WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp | 11 +++++++++-- .../webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp | 12 ++++++++++-- src/main/webapp/js/web/msgdata/msgDataView.js | 4 ++-- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/main/java/itn/com/cmm/util/MsgSendUtils.java b/src/main/java/itn/com/cmm/util/MsgSendUtils.java index 815c348a..9673b365 100644 --- a/src/main/java/itn/com/cmm/util/MsgSendUtils.java +++ b/src/main/java/itn/com/cmm/util/MsgSendUtils.java @@ -357,6 +357,13 @@ public final class MsgSendUtils { + /* @isHolidayNotified + * - 관리자 알림 설정으로 인해 + * - 해당 시간이면 지연 미처리 + * @smishingYn + * - 회원 별 '스미싱 온' 상태값 + * - Y면 알림, 지연 처리해야 함 + * */ if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) { mjonMsgVO.setSpamStatus("Y"); mjonMsgVO.setSmishingYn("Y"); @@ -461,6 +468,10 @@ public final class MsgSendUtils { } + /* @isHolidayNotified + * - 관리자 알림 설정으로 인해 + * - 해당 시간이면 지연 미처리 + * */ mjonMsgVO.setSpamStatus("Y"); if(isHolidayNotified) { mjonMsgVO.setDelayYn("Y"); diff --git a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java index d387cac8..ddab7c8f 100644 --- a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java +++ b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java @@ -544,10 +544,6 @@ private int parseIntOrDefault(String value, int defaultValue) { List 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; // 알림 발송 조건 미충족 } diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index 4b6c7799..68b27938 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -4060,11 +4060,6 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M 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 diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp index f896f2ad..aa3b4865 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp @@ -73,8 +73,11 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) if (advertisementCnt > 0) { // 광고문자 form.msgResendAllAdvertiseYn.value = "Y"; + form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do"; + } + else{ + form.action="/web/mjon/msgdata/selectMsgDataView.do"; } - form.action="/web/mjon/msgdata/selectMsgDataView.do"; } form.submit(); } @@ -96,8 +99,12 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) if (advertisementCnt > 0) { // 광고문자 form.msgResendAllAdvertiseYn.value = "Y"; + form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do"; + } + else{ + + form.action="/web/mjon/msgdata/selectMsgDataView.do"; } - form.action="/web/mjon/msgdata/selectMsgDataView.do"; } form.submit(); } diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index e246210a..c1f7c602 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -694,8 +694,12 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) if (advertisementCnt > 0) { // 광고문자 form.msgResendAllAdvertiseYn.value = "Y"; + form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do"; + } + else + { + form.action="/web/mjon/msgdata/selectMsgDataView.do"; } - form.action="/web/mjon/msgdata/selectMsgDataView.do"; } form.submit(); } @@ -717,8 +721,12 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) if (advertisementCnt > 0) { // 광고문자 form.msgResendAllAdvertiseYn.value = "Y"; + form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do"; + } + else + { + form.action="/web/mjon/msgdata/selectMsgDataView.do"; } - form.action="/web/mjon/msgdata/selectMsgDataView.do"; } form.submit(); } diff --git a/src/main/webapp/js/web/msgdata/msgDataView.js b/src/main/webapp/js/web/msgdata/msgDataView.js index 8a3e30a8..1c8a07e4 100644 --- a/src/main/webapp/js/web/msgdata/msgDataView.js +++ b/src/main/webapp/js/web/msgdata/msgDataView.js @@ -60,10 +60,10 @@ function getMjMsgGroupInfoByResend() { // 문자내용 if (smsTxt.indexOf("(광고)") == 0) { - $('#send_adYnY').prop('checked', true); + // $('#send_adYnY').prop('checked', true); //광고 상하단 내용 넣어주기 - advMsgInsert(); + // advMsgInsert(); // 광고 기본정보 제거 smsTxt = $.trim(smsTxt.replace("(광고)", ""));