From de18196f188f83a6b9b0afd68355ed31ae3ce7ba Mon Sep 17 00:00:00 2001 From: rosewiper Date: Thu, 9 Nov 2023 11:16:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=EC=A0=95=EC=A7=80=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=A0=84=EC=86=A1,=20=ED=8C=A9?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=84=EC=86=A1,=201:1=20=EB=AC=B8=EC=9D=98?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=ED=99=94=EB=A9=B4=20=EC=A0=91=EC=86=8D=20?= =?UTF-8?q?=EB=B6=88=EA=B0=80=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cop/bbs/web/EgovBBSManageController.java | 10 +++++++++ .../let/fax/user/web/FaxRestController.java | 14 +++++++++++++ .../kakaoAt/web/KakaoAlimTalkController.java | 15 +++++++++++++ .../web/KakaoAlimTalkSendController.java | 21 ++++++++++++++++++- .../web/KakaoAlimTalkTemplateController.java | 14 +++++++++++++ .../stepInfo/web/KakaoStepInfoController.java | 14 +++++++++++++ .../msgdata/at/KakaoAlimtalkMsgDataView.jsp | 5 +++++ 7 files changed, 92 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java index a4b39d32..b547ae68 100644 --- a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java @@ -1628,6 +1628,16 @@ public class EgovBBSManageController { return "redirect:/web/user/login/login.do"; } + /** + * 회원 정지된 상태이면 1:1 등록 화면으로 이동되지 않도록 처리 + * */ + boolean mberSttus = userManageService.selectUserStatusInfo(userId); + + if(!mberSttus) { + return "redirect:/web/uat/uia/actionLogout.do"; + } + + MberManageVO mberManageVO = new MberManageVO(); mberManageVO.setMberId(user.getId()); diff --git a/src/main/java/itn/let/fax/user/web/FaxRestController.java b/src/main/java/itn/let/fax/user/web/FaxRestController.java index 16dfbb94..275cfd72 100644 --- a/src/main/java/itn/let/fax/user/web/FaxRestController.java +++ b/src/main/java/itn/let/fax/user/web/FaxRestController.java @@ -29,6 +29,7 @@ import itn.let.fax.user.service.FaxConvertVO; import itn.let.fax.user.service.FaxService; import itn.let.fax.user.service.FaxTranVO; import itn.let.mail.service.StatusResponse; +import itn.let.uss.umt.service.EgovUserManageService; /** * @@ -50,6 +51,10 @@ public class FaxRestController { @Resource(name = "faxService") private FaxService faxService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + private static final Logger logger = LoggerFactory.getLogger(FaxRestController.class); /** @@ -132,6 +137,15 @@ public class FaxRestController { // 로그인 안되어있음 return if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + /** + * 회원 정지된 상태이면 팩스 발송이되지 않도록 처리 + * */ + boolean mberSttus = userManageService.selectUserStatusInfo(userId); + + if(!mberSttus) { + return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 팩스를 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다.", LocalDateTime.now())); + } + try { return ResponseEntity.ok().body(faxService.sendData(faxTranVO, userId)); // return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "임시 성공.", LocalDateTime.now())); diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java index 60e925cd..9ac8b441 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkController.java @@ -23,6 +23,7 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiProfile; import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiProfileCategory; import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService; import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService; +import itn.let.uss.umt.service.EgovUserManageService; @Controller public class KakaoAlimTalkController { @@ -36,6 +37,10 @@ public class KakaoAlimTalkController { @Resource(name = "kakaoAlimTalkService") private KakaoAlimTalkService kakaoAlimTalkService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + /** EgovMessageSource */ @Resource(name="egovMessageSource") EgovMessageSource egovMessageSource; @@ -58,6 +63,16 @@ public class KakaoAlimTalkController { } model.addAttribute("loginVO", loginVO); + /** + * 회원 정지된 상태이면 알림톡 설정화면으로 이동되지 않도록 처리 + * */ + boolean mberSttus = userManageService.selectUserStatusInfo(userId); + + if(!mberSttus) { + return "redirect:/web/uat/uia/actionLogout.do"; + } + + KakaoVO kakaoVO = new KakaoVO(); kakaoVO.setUserId(userId); kakaoVO.setCategoryDepth("1"); 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 fae0a426..438bb612 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 @@ -15,6 +15,7 @@ import java.util.Map; import java.util.stream.Collectors; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Cell; @@ -50,7 +51,6 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate; import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService; import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService; import itn.let.mjo.mjocommon.MjonCommon; -import itn.let.mjo.msg.service.MjonMsgVO; import itn.let.mjo.msgdata.service.MjonMsgDataService; import itn.let.mjo.msgdata.service.MjonMsgDataVO; import itn.let.mjo.msgdata.service.MjonMsgReturnVO; @@ -473,6 +473,7 @@ public class KakaoAlimTalkSendController { // @ResponseBody public ModelAndView kakaoAlimTalkMsgSendAjax( // @RequestBody KakaoVO kakaoVO + HttpServletRequest request, @ModelAttribute("kakaoVO") KakaoVO kakaoVO ) throws Exception { ModelAndView modelAndView = new ModelAndView(); @@ -492,6 +493,24 @@ public class KakaoAlimTalkSendController { modelAndView.addObject("result", "loginFail"); return modelAndView; }else { + + /** + * 회원 정지된 상태이면 알림톡 발송이 안되도록 처리함 + * 현재 로그인 세션도 만료 처리함 + * */ + boolean mberSttus = userManageService.selectUserStatusInfo(userId); + + if(!mberSttus) { + + modelAndView.addObject("message", "현재 고객님께서는 문자온 서비스 이용이 정지된 상태로 알림톡을 발송하실 수 없습니다. 이용정지 해제를 원하시면 고객센터로 연락주시기 바랍니다."); + modelAndView.addObject("result", "authFail"); + + request.getSession().invalidate(); + + return modelAndView; + + } + /** 카카오톡 전송 기본 설정 -------------------------------------------*/ kakaoVO.setSendType("AT"); kakaoVO.setMsgType("8"); diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java index 83d05b39..20e7a768 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java @@ -39,6 +39,7 @@ import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService; import itn.let.mjo.symbol.service.MjonSymbolService; import itn.let.mjo.symbol.service.MjonSymbolVO; import itn.let.uss.ion.cnt.service.CntManageVO; +import itn.let.uss.umt.service.EgovUserManageService; @Controller public class KakaoAlimTalkTemplateController { @@ -52,6 +53,10 @@ public class KakaoAlimTalkTemplateController { @Resource(name = "kakaoAlimTalkService") private KakaoAlimTalkService kakaoAlimTalkService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + /** EgovMessageSource */ @Resource(name="egovMessageSource") EgovMessageSource egovMessageSource; @@ -101,6 +106,15 @@ public class KakaoAlimTalkTemplateController { } model.addAttribute("loginVO", loginVO); + /** + * 회원 정지된 상태이면 알림톡 템플릿 등록 화면으로 이동되지 않도록 처리 + * */ + boolean mberSttus = userManageService.selectUserStatusInfo(userId); + + if(!mberSttus) { + return "redirect:/web/uat/uia/actionLogout.do"; + } + KakaoVO kakaoVO = new KakaoVO(); kakaoVO.setUserId(userId); kakaoVO.setCategoryDepth("1"); diff --git a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java index 58c63620..5b1fb768 100644 --- a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java +++ b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java @@ -26,6 +26,7 @@ import itn.let.cop.bbs.service.BoardMasterVO; import itn.let.cop.bbs.service.BoardVO; import itn.let.cop.bbs.service.EgovBBSAttributeManageService; import itn.let.cop.bbs.service.EgovBBSManageService; +import itn.let.uss.umt.service.EgovUserManageService; @Controller public class KakaoStepInfoController { @@ -43,6 +44,10 @@ public class KakaoStepInfoController { @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + /** * @Method Name : selectKaKaoStepInfo @@ -64,6 +69,15 @@ public class KakaoStepInfoController { } model.addAttribute("loginVO", loginVO); + /** + * 회원 정지된 상태이면 알림톡 사용안내 화면으로 이동되지 않도록 처리 + * */ + boolean mberSttus = userManageService.selectUserStatusInfo(userId); + + if(!mberSttus) { + return "redirect:/web/uat/uia/actionLogout.do"; + } + BoardMasterVO bmVO = new BoardMasterVO(); PaginationInfo paginationInfo = new PaginationInfo(); Map map = new HashMap(); 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 d8565ea7..c46bf615 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 @@ -686,6 +686,11 @@ function sendTemplateInfo(){ alert(returnData.message); return false; + }else if('authFail' == returnData.result){ + + alert(returnData.message); + location.reload(); + } else if(status == 'success'){ var kakaoSendCnt = returnData.resultSts;