From 392a994b5c0ad1598d360cd1e3cedaabddc7c58b Mon Sep 17 00:00:00 2001 From: wyh Date: Wed, 21 Jun 2023 11:46:21 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=A0=84=EC=86=A1=EC=8B=9C?= =?UTF-8?q?=20B=EB=9D=BC=EC=9D=B8=20=EC=9A=B4=EC=98=81=EC=97=AC=EB=B6=80?= =?UTF-8?q?=20=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/conf/web/MjonConfController.java | 40 ++++++++++++++++++- .../msg/service/impl/MjonMsgServiceImpl.java | 4 +- .../msgdata/web/MjonMsgDataController.java | 1 + .../sqlmap/let/agent/MjonAgent_SQL_mysql.xml | 3 +- .../jsp/web/msgdata/MsgDataSMLView.jsp | 15 +++++++ .../WEB-INF/jsp/web/msgdata/MsgDataView.jsp | 32 ++++++++++++++- .../web/msgdata/excel/MsgExcelDataSMLView.jsp | 29 +++++++++++++- .../web/msgdata/excel/MsgExcelDataView.jsp | 31 ++++++++++++++ 8 files changed, 147 insertions(+), 8 deletions(-) diff --git a/src/main/java/itn/let/mjo/conf/web/MjonConfController.java b/src/main/java/itn/let/mjo/conf/web/MjonConfController.java index 62858b7a..8f49e3e4 100644 --- a/src/main/java/itn/let/mjo/conf/web/MjonConfController.java +++ b/src/main/java/itn/let/mjo/conf/web/MjonConfController.java @@ -14,6 +14,8 @@ import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; import itn.let.mjo.conf.service.MjonConfService; import itn.let.mjo.conf.service.MjonConfVO; +import itn.let.mjo.msgagent.service.MjonMsgAgentStsService; +import itn.let.mjo.msgagent.service.MjonMsgAgentStsVO; @Controller public class MjonConfController { @@ -21,7 +23,8 @@ public class MjonConfController { @Resource(name = "mjonConfService") private MjonConfService mjonConfService; - + @Resource(name = "mjonMsgAgentStsService") + private MjonMsgAgentStsService mjonMsgAgentStsService; /** @@ -96,5 +99,38 @@ public class MjonConfController { return modelAndView; } - + @RequestMapping(value = "/web/mjon/conf/selectBlineSendCheckAjax.do") + public ModelAndView selectBlineSendCheckAjax( + @ModelAttribute MjonMsgAgentStsVO mjonMsgAgentStsVO + , Model model) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + try { + + System.out.println(mjonMsgAgentStsVO.getAgentCode()); + if(mjonMsgAgentStsVO.getAgentCode().equals("b1")||mjonMsgAgentStsVO.getAgentCode().equals("B1")) { + mjonMsgAgentStsVO.setAgentCode("08"); + }else if(mjonMsgAgentStsVO.getAgentCode().equals("b2")||mjonMsgAgentStsVO.getAgentCode().equals("B2")) { + mjonMsgAgentStsVO.setAgentCode("09"); + } + + MjonMsgAgentStsVO vo = mjonMsgAgentStsService.selectMsgAgentBlineYnInfo(mjonMsgAgentStsVO); + + if(vo == null || "".equals(vo.getUseYn()) || !"Y".equals(vo.getUseYn())) { + modelAndView.addObject("message", "문자 발송 불가"); + modelAndView.addObject("result", "fail"); + } else { + modelAndView.addObject("message", "문자 발송 가능"); + modelAndView.addObject("result", "success"); + } + + }catch (Exception e) { + modelAndView.addObject("message", "오류가 발생하였습니다."); + modelAndView.addObject("result", "fail"); + } + + return modelAndView; + } } diff --git a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java index b4cf5597..f67878fe 100644 --- a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java +++ b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java @@ -703,10 +703,10 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM //인비토 딜레이문자 삭제 IVTResult = mjonReservMsgDAO.deleteIVTMsgSeqListByMsgSeq(mjonResvMsgVO); - //제이제이 예약취소 삭제 + //제이제이 딜레이문자 삭제 jjBline01Result = mjonReservMsgDAO.deleteJJB01MsgSeqListByMsgSeq(mjonResvMsgVO); - //제이제이 예약취소 삭제 + //제이제이 딜레이문자 삭제 jjBline02Result = mjonReservMsgDAO.deleteJJB02MsgSeqListByMsgSeq(mjonResvMsgVO); //삭제 결과 합산 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 0cd66d53..ba2d0444 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -908,6 +908,7 @@ public class MjonMsgDataController { mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); + model.addAttribute("blineCode", mberManageVO.getBlineCode()); } model.addAttribute("exceptSpamYn", mberManageVO.getExceptSpamYn()); diff --git a/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml index 372f92fc..e241888c 100644 --- a/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/agent/MjonAgent_SQL_mysql.xml @@ -73,7 +73,8 @@ + "/> +

대량문자/단체문자 전송

@@ -3043,8 +3068,8 @@ $(".btn_event_cash").off().on("click", function(){ 문자분류 - - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataView.jsp index d56e6718..e2a404c6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataView.jsp @@ -471,6 +471,29 @@ function checkConf() { return confCheck; } +function blineSendCheck(blineCode) { + + var confCheck = false; + + $.ajax({ + type: "POST", + url: "/web/mjon/conf/selectBlineSendCheckAjax.do", + data: {"agentCode":blineCode}, + dataType:'json', + async: false, + success: function (returnData, status) { + if(returnData.result == "fail") { + console.log(returnData.message); + }else if(returnData.result == "success"){ + confCheck = true; + } + } + ,error: function (e) {console.log("ERROR : ", e); } + }); + + return confCheck; +} + //문자발송 처리 함수 function fn_sendMsgData(){ @@ -515,6 +538,14 @@ function fn_sendMsgData(){ } + var blineCodeYn = $("#blineCode").val(); + if(blineCodeYn != 'N'){ + if(!blineSendCheck(blineCodeYn)){ //문자온 conf-check + alert("현재 문자 발송하기 기능 점검 중입니다.\n\n잠시 후 다시 시도해주세요."); + return false; + } + } + //MJ_MSG_GROUP_DATA 누락데이터 체크 //if (getMsgGroupDataErrorCheck() == false) { // alert("고객님께서 발송한 최근문자가 발송결과에 표시되지않아, 문자발송이 임시로 차단되었습니다.\n문자온 고객센터에 문의해주세요.");