diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index bd7be448..9f23aeec 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -5707,6 +5707,56 @@ public class MjonMsgDataController { return "/web/pop/testSendPop"; } + + + /* 테스트 발송 팝업 */ + @RequestMapping(value="/web/pop/testSmsSendPop.do") + public String testSmsSendPop(@ModelAttribute("searchVO") MjonMsgDataVO searchVO, HttpServletRequest request, Model model) throws Exception { + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + String author = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getAuthority()); + + String msgpreview = request.getParameter("msgpreview"); + String mmsSubject = request.getParameter("mmsSubject"); + String callFrom = request.getParameter("callFrom"); + String eachPrice = request.getParameter("eachPrice"); + model.addAttribute("msgpreview", msgpreview); + model.addAttribute("mmsSubject", mmsSubject); + model.addAttribute("callFrom", callFrom); + model.addAttribute("eachPrice", eachPrice); + model.addAttribute("searchVO", searchVO); + + MberManageVO mberManageVO = new MberManageVO(); + + if(!userId.equals("") && !author.equals("ROLE_ADMIN")) { + + mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); + searchVO.setUserId(userId); + + } + + //3.사용자 개인단가 정보가 0이 아니면 개인단가 사용, 없으면 시스템 기본 단가 사용 + BigDecimal userMoney = new BigDecimal(mberManageVO.getUserMoney()).setScale(2, RoundingMode.HALF_EVEN); + String userPoint = mberManageVO.getUserPoint(); + + model.addAttribute("mberManageVO", mberManageVO); + model.addAttribute("userMoney", userMoney); + model.addAttribute("userPoint", userPoint); + + //0.이벤트 진행중이 회원 정보 불러오기. + //이벤트 회원 정보 테이블에서 대상자의 정보를 불러온다. + MjonEventVO mjonEventVO = new MjonEventVO(); + mjonEventVO.setMberId(userId); + MjonEventVO eventMberInfo = mjonEventService.selectEventMsgMberDefaultInfo(mjonEventVO); + + model.addAttribute("eventMberInfo", eventMberInfo); + +// return "/web/pop/testSendPop"; + return "/web/pop/testSmsSendPop"; + } + + /** * 문자 발송 - 엑셀파일 불러오기 * @param body 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 dcb99f22..05de5f7f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3424,7 +3424,7 @@ function fnTestSend(){ form.msgKind.value = "N"; } - form.action = "/web/pop/testSendPop.do"; + form.action = "/web/pop/testSmsSendPop.do"; form.method = "post"; window.open("about:blank", 'testSendPop', 'width=770, height=850, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); form.target = "testSendPop"; diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp index 7c47bd99..e06bcf51 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp @@ -28,8 +28,8 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/pop/testSmsSendPop.jsp b/src/main/webapp/WEB-INF/jsp/web/pop/testSmsSendPop.jsp new file mode 100644 index 00000000..5dae9745 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/pop/testSmsSendPop.jsp @@ -0,0 +1,318 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> + + + + +
\ No newline at end of file diff --git a/src/main/webapp/js/web/msgdata/msgDataView.js b/src/main/webapp/js/web/msgdata/msgDataView.js index be0ba91f..75fc5110 100644 --- a/src/main/webapp/js/web/msgdata/msgDataView.js +++ b/src/main/webapp/js/web/msgdata/msgDataView.js @@ -1127,10 +1127,6 @@ function fn_sendMsgData(){ //form.reserveYn.value = reserYn; // 즉시 / 예약 문자 선택 여부 form.templateYnAdvc.value = templateYn; - console.log('imgFilePath : ', imgFilePath); - console.log('imgFilePath : ', JSON.stringify(imgFilePath)); - console.log('imgFileId : ', imgFileId); - console.log('imgFileId : ', JSON.stringify(imgFileId)); form.imgFilePathAdvc.value = imgFilePath; form.imgFileIdAdvc.value = imgFileId; // form.imgFilePath.value = JSON.stringify(imgFilePath).replace(/\\/g, ''); @@ -1232,8 +1228,9 @@ function sendMsgAjax_advc(){ formData["mjonMsgSendVOList"] = $selectedData; // JSON 데이터 확인 -// console.log("최종 formData:", JSON.stringify(formData)); - + console.log("최종 formData:", JSON.stringify(formData)); + // + return false; var url = "/web/mjon/msgdata/sendMsgDataAjax_advc.do"; // 시작 시간 @@ -1254,7 +1251,7 @@ function sendMsgAjax_advc(){ success: function (data) { // 요청 종료 시간 및 경과 시간 계산 - const endTime = new Date(); + /*const endTime = new Date(); const elapsed = (endTime - startTime) / 1000; // 밀리초 -> 초로 변환 console.log('AJAX 요청 성공, 경과 시간 : ', elapsed); if (elapsed >= 60) { @@ -1264,7 +1261,7 @@ function sendMsgAjax_advc(){ } else { console.log('AJAX 요청 성공, 경과 시간 : ' + elapsed + '초'); } - + */ console.log('data : ', data);