diff --git a/src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java b/src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java index 457326c0..399a748b 100644 --- a/src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java +++ b/src/main/java/itn/com/cmm/util/SlackMessageFormatUtil.java @@ -2,6 +2,7 @@ package itn.com.cmm.util; import org.apache.commons.lang3.StringUtils; +import itn.let.kakao.kakaoComm.KakaoSendAdvcVO; import itn.let.kakao.kakaoComm.KakaoVO; import itn.let.mjo.msg.service.MjonMsgVO; @@ -36,10 +37,10 @@ public class SlackMessageFormatUtil { /** * 카카오톡 메시지 텍스트 포맷팅 */ - public static String formatKakaoText(KakaoVO kakaoVO) { - String smsTxt = kakaoVO.getTemplateContent(); - String reserveYn = safeGetString(kakaoVO.getReserveYn()); - String atDelayYn = safeGetString(kakaoVO.getAtDelayYn()); + public static String formatKakaoText(KakaoSendAdvcVO sendVO) { + String smsTxt = sendVO.getTemplateContent(); + String reserveYn = safeGetString(sendVO.getReserveYn()); + String atDelayYn = safeGetString(sendVO.getAtDelayYn()); // 공통 텍스트 포맷팅 로직 적용 return formatMessagePrefix(smsTxt, reserveYn, "Y".equals(atDelayYn)); @@ -73,10 +74,10 @@ public class SlackMessageFormatUtil { /** * @카카오톡용 sandName 포맷팅 메서드 */ - public static String formatKakaoSandName(KakaoVO kakaoVO) { - String userId = kakaoVO.getUserId(); - String callFrom = kakaoVO.getCallFrom(); - String msgType = getKakaoMessageTypeLabel(kakaoVO.getMsgType()); + public static String formatKakaoSandName(KakaoSendAdvcVO sendVO) { + String userId = sendVO.getUserId(); + String callFrom = sendVO.getCallFrom(); + String msgType = getKakaoMessageTypeLabel(sendVO.getMsgType()); return String.format("[%s][%s]%s", userId, callFrom, msgType); } diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java index f84d240c..cef9cf34 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java @@ -902,9 +902,6 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements boolean isNotified = mjonCommon.processUserAndCheckAT(kakaoVO); -/** @LETTNGNRLMBER 사용자 정보 -> 스미싱의심 여부 */ - UserManageVO userManageVO = mjonCommon.getUserManageInfo(userId); - kakaoVO.setAtSmishingYn(userManageVO.getAtSmishingYn()); /** @카카오톡 전송 list 셋팅 -------------------------------------------*/ List kakaoSendAdvcListVO = kakaoSendUtil.populateSendLists(kakaoVO, isNotified, statusResponse); @@ -976,7 +973,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements /** @SLACK발송 */ /** @발송조건이되면 발송 */ if(isNotified) { - mjonCommon.getAdminKakaoAtSendSlack(kakaoVO); + mjonCommon.getAdminKakaoAtSendSlack(sendVO); }else if("Y".equals(kakaoVO.getAtSmishingYn())){ /** @발송조건이 안되면 DB INSERT */ mjonMsgDAO.insertSpamPassMsgData(MjonMsgVO.builder() diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java index 2ee69ccd..3f30a8b3 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java @@ -1430,7 +1430,7 @@ public class KakaoAlimTalkSendController { if(!smishingAlarmPassSts) {//평일,주말, 공휴일 알림설정 시간에 포함되지 않는 경우 슬랙 알림 발송 - mjonCommon.getAdminKakaoAtSendSlack(kakaoVO); +// mjonCommon.getAdminKakaoAtSendSlack(kakaoVO); } diff --git a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java index 826f6809..d1217838 100644 --- a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java +++ b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java @@ -27,6 +27,7 @@ import itn.com.cmm.MjonMsgSendVO; import itn.com.cmm.OptimalMsgResultDTO; import itn.com.cmm.util.MsgSendUtils; import itn.com.cmm.util.SlackMessageFormatUtil; +import itn.let.kakao.kakaoComm.KakaoSendAdvcVO; import itn.let.kakao.kakaoComm.KakaoVO; import itn.let.mail.service.StatusResponse; import itn.let.mjo.event.service.MjonEventService; @@ -159,7 +160,7 @@ public class MjonCommon { } } - public void getAdminKakaoAtSendSlack(KakaoVO kakaoVO) { + public void getAdminKakaoAtSendSlack(KakaoSendAdvcVO kakaoVO) { HttpClient client = new HttpClient(); PostMethod post = new PostMethod(SLACK_URL); @@ -537,7 +538,7 @@ private int parseIntOrDefault(String value, int defaultValue) { // 조건 체크 if ("Y".equals(adminSmsNoticeYn) || "Y".equals(atSmishingYn)) { - kakaoVO.setAtSmishingYn(atSmishingYn); // MjonMsgVO에 스미싱 정보 설정 + kakaoVO.setAtSmishingYn("Y"); // MjonMsgVO에 스미싱 정보 설정 // 스미싱 알림 처리 return handleSmishingAlert(); // 알림 처리 결과 반환 diff --git a/src/main/java/itn/let/module/base/PriceAndPoint.java b/src/main/java/itn/let/module/base/PriceAndPoint.java index d1eec610..d4f190f1 100644 --- a/src/main/java/itn/let/module/base/PriceAndPoint.java +++ b/src/main/java/itn/let/module/base/PriceAndPoint.java @@ -117,6 +117,7 @@ public class PriceAndPoint { MjonPayVO mjonPayVO = new MjonPayVO(); mjonPayVO.setCashId(idgenMjonCashId.getNextStringId()); mjonPayVO.setUserId(userId); + System.out.println(" + totPrice :: "+ totPrice); mjonPayVO.setCash(totPrice); mjonPayVO.setFrstRegisterId(userId); mjonPayVO.setMemo(memo); diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp index 5e821eb4..d7970509 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp @@ -702,6 +702,8 @@ function sendTemplateInfo(){ + return false; + var status = data.status; if("OK" == status){ var resultSts = data.object.resultSts; @@ -1505,7 +1507,7 @@ $(window).on('load', function() {
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index 242ba050..a0e21e02 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -1118,7 +1118,19 @@ $(document).ready(function (){ .filter(num => num !== "") .filter(num => isValidPhoneNumber(num)); // 유효한 번호만 필터링; - fn_phoneAddProcess(tableL, numbers); + console.log('numbers : ', numbers); + const addrData = processPhoneNumbers(numbers); + + + // 기존 tableL의 데이터를 가져옵니다. + var existingData = tableL.getData(); + + // 데이터 병합 및 중복 제거 + const result = mergeAndValidateData(existingData, addrData); + + + // 테이블 데이터 업데이트 + if (!updateTableData(tableL, result)) return false; // textarea 초기화 textarea.val(''); // jQuery 객체에서 값을 초기화할 때는 .val('') 사용