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 7d6e61b7..78c3b9ed 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 @@ -159,7 +159,16 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements } if(kakaoVO.getAtSmishingYn().equals("Y")) { - String sandDate = kakaoVO.getReqDate(); + String sandDate = ""; + + if(kakaoVO.getDivideChk().equals("Y")) { + //분할 문자 예약 시간 입력해주기 + sandDate = dividDayList.get(i); + }else { + //예약 시간 입력해주기 + sandDate = kakaoVO.getReqDate(); + } + SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); Date date = sdFormat.parse(sandDate); 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 c909497a..4e7697f1 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 @@ -49,11 +49,16 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiProfileCategory; 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; +import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; +import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.MberManageVO; +import itn.let.uss.umt.service.UserManageVO; /** * @@ -86,11 +91,19 @@ public class KakaoAlimTalkSendController { @Resource(name = "MjonMsgDataService") private MjonMsgDataService mjonMsgDataService; + + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; /** EgovMessageSource */ @Resource(name="egovMessageSource") EgovMessageSource egovMessageSource; + /** 사이트 설정 */ + @Resource(name = "egovSiteManagerService") + EgovSiteManagerService egovSiteManagerService; + @Autowired KakaoApiProfile kakaoApiProfile; @@ -480,10 +493,9 @@ public class KakaoAlimTalkSendController { int resultSts = 0; //발송결과 건수 int resultBlockSts = 0; //수신거부 등록번호로 발송을 안한 건수 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); try { - - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); if(userId == "") { modelAndView.addObject("message", "로그인 후 이용이 가능합니다."); @@ -492,7 +504,9 @@ public class KakaoAlimTalkSendController { }else { /** 카카오톡 전송 기본 설정 -------------------------------------------*/ kakaoVO.setSendType("AT"); + kakaoVO.setMsgType("8"); kakaoVO.setUserId(userId); + } /** 전송금액 설정 --------------------------------------------------*/ @@ -710,6 +724,43 @@ public class KakaoAlimTalkSendController { modelAndView.addObject("result", "success"); modelAndView.addObject("resultSts", resultSts); + +/** 카카오톡 발송 내용 법인폰, 알림톡 결과 처리 --------------------------------------------------*/ + try { + String adminSmsNoticeYn = "Y"; + String spamStatus = kakaoVO.getAtSmishingYn(); // 스미싱 의심으로 체크된 고객 정보 + + UserManageVO userManageVO = new UserManageVO(); + userManageVO.setMberId(userId); + + if(!userId.equals("")) { + userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO); + adminSmsNoticeYn = userManageVO.getAdminSmsNoticeYn(); + } + + //법인폰 알림 온 이거나 스미싱의심 문자인 경우 법인폰으로 발송 + if(adminSmsNoticeYn.equals("Y") || spamStatus.equals("Y")) { + + if(spamStatus.equals("Y")) { + kakaoVO.setAtDelayYn("Y"); + } + + // 법인폰 알람여부 체크 + JoinSettingVO joinSettingVO = new JoinSettingVO(); + joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); + + // SLACK 체크 + if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { + //Slack으로 메세지 전송 처리 + MjonCommon comm = new MjonCommon(); +// comm.getAdminKakaoAtSandSlack(kakaoVO); + } + } + + } catch (Exception e) { + throw new Exception("++++++++++++++++++++++ getAdminPhoneSendMsgData Error !!! " + e); + } + return modelAndView; } } diff --git a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java index 311e9db2..323e13ea 100644 --- a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java +++ b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import com.mysql.jdbc.StringUtils; +import itn.let.kakao.kakaoComm.KakaoVO; import itn.let.mjo.msg.service.MjonMsgVO; @Service("MjonCommon") @@ -242,4 +243,63 @@ public class MjonCommon { return mjonMsgVO; } + @SuppressWarnings("unchecked") + public void getAdminKakaoAtSandSlack(KakaoVO kakaoVO) { + + HttpClient client = new HttpClient(); + PostMethod post = new PostMethod(url); + JSONObject json = new JSONObject(); + try { + + String reserveYn = kakaoVO.getReserveYn(); + String atDelayYn = kakaoVO.getAtDelayYn(); + String smsTxt = kakaoVO.getTemplateContent(); + String reservSmsTxt = ""; + String smisingSmsTxt = ""; + //예약문자를 발송하는 경우 문자 내용 앞에 "[예약]" 표시되도록 처리 + if(reserveYn.equals("Y")) { + reservSmsTxt = "[예약]" + smsTxt; + smsTxt = reservSmsTxt; + }else if(atDelayYn.equals("Y")) { + + smisingSmsTxt = "[스미싱의심]" + smsTxt; + smsTxt = smisingSmsTxt; + } + + String sandName = kakaoVO.getCallFrom(); + String userId = kakaoVO.getUserId(); + String msgType = ""; + + if(kakaoVO.getMsgType().equals("8")) { + msgType = "[알림톡]"; + }else if(kakaoVO.getMsgType().equals("9")){ + + } + sandName = "[" + userId + "]" + "[" + sandName + "]" + msgType; + + json.put("channel", "mjon메시지"); + json.put("text", smsTxt); + json.put("username", sandName); + + + post.addParameter("payload", json.toString()); + // 처음에 utf-8로 content-type안넣어주니까 한글은 깨져서 content-type넣어줌 + post.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); + int responseCode = client.executeMethod(post); + String response = post.getResponseBodyAsString(); + if (responseCode != HttpStatus.SC_OK) { + System.out.println("Response: " + response); + } + } catch (IllegalArgumentException e) { + System.out.println("IllegalArgumentException posting to Slack " + e); + } catch (IOException e) { + System.out.println("IOException posting to Slack " + e); + } catch (Exception e) { + System.out.println("Exception posting to Slack " + e); + } finally { + post.releaseConnection(); + } + + } + } diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index 1c3527ff..77892ebe 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -356,7 +356,7 @@ public class MjonMsgVO extends ComDefaultVO{ private String atDelayYn = "N"; // 알림 30분 지연 처리 유무 private String atDelayCompleteYn; // 알림톡 30분 지연 처리 완료 유무 - private String atSmishingYn; // 알림 지연처리 + private String atSmishingYn; // 알림톡 스메싱 여부 private int totalCallCnt; //수신자 전체 갯 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 8db67237..46398448 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 @@ -2,6 +2,7 @@ package itn.let.mjo.msg.service.impl; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -17,6 +18,7 @@ import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.intercept.EgovReloadableFilterInvocationSecurityMetadataSource; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import itn.com.cmm.LoginVO; +import itn.com.cmm.util.MJUtil; import itn.com.utl.fcc.service.EgovDateUtil; import itn.let.mjo.msg.service.MjPhoneMemberVO; import itn.let.mjo.msg.service.MjonMapAddressVO; @@ -911,6 +913,7 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM int resultSts = 0; try { + boolean timeType = true; System.out.println("++++++++++++++++++ updateKakaoAtDelaySendRealTimeData groupId ::: "+mjonResvMsgVO.getMsgGroupId()); //삭제 문자 건수 MSG_SEQ 번호 받아오기 @@ -919,31 +922,32 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM int size = resultMsgSeqList.size(); List userDataList = new ArrayList(); for(int i=0; i < size; i++) { - userDataList.add(resultMsgSeqList.get(i).getUserData()); System.out.println(resultMsgSeqList.get(i).getUserData()); - } - mjonResvMsgVO.setUserDataList(userDataList); - //비즈뿌리오 딜레이문자 즉시발송 처리 - resultSts = mjonReservMsgDAO.updateRealTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO); + if(resultMsgSeqList.get(0).getReserveYn().equals("N")) { + // 즉시 발송시 + //비즈뿌리오 딜레이문자 즉시발송 처리 + resultSts = mjonReservMsgDAO.updateRealTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO); + + }else { + // 예약 발송시 + //비즈뿌리오 딜레이문자 예약발송 처리 + resultSts = mjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq(mjonResvMsgVO); + } System.out.println("++++++++++++++++++++++++++++++ resultSts ::: "+resultSts); - //예약 취소 환불 처리 + //발송 시간 수정(mj_msg_data, mj_msg_group_data) if(resultSts > 0) { - //그룹 데이터 정보 조회하기 MjonMsgVO mjonMsgVO = mjonMsgDAO.selectMsgGroupDataByGoupId(mjonResvMsgVO); - //mj_msg_data 테이블 지연 문자 즉시발송 요청 값 수정 mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgDataFlag(mjonMsgVO); - //mj_msg_group_data 테이블 즉시발송 요청 값 수정 mjonMsgDAO.updateKakaoAtDelaySendRealTimeMsgGroupDataFlag(mjonMsgVO); - } } catch (Exception e) { diff --git a/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java b/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java index 3f8fff9c..0247f9ce 100644 --- a/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java +++ b/src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java @@ -29,6 +29,7 @@ public class MjonResvMsgVO extends UserDefaultVO{ private String fileCnt; //첨부 이미지 갯수 - 0: 장문, 1 이상은 그림문자 private String totMsgCnt; //전체 전송문자 갯수 private String curState; //전송 처리 결과값 + private String reserveYn; //예약 여부 private String reserveCYn; //예약 취소 여부 private String filePath1; //그림 이미지 1 private String filePath2; //그림 이미지 2 @@ -290,5 +291,10 @@ public class MjonResvMsgVO extends UserDefaultVO{ public void setStrReqDate(String strReqDate) { this.strReqDate = strReqDate; } - + public String getReserveYn() { + return reserveYn; + } + public void setReserveYn(String reserveYn) { + this.reserveYn = reserveYn; + } } diff --git a/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java b/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java index 34cc94ae..6c836b5c 100644 --- a/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java +++ b/src/main/java/itn/let/mjo/reservmsg/service/impl/MjonReservMsgDAO.java @@ -277,4 +277,15 @@ public class MjonReservMsgDAO extends EgovAbstractDAO { return update("MjonReservMsgDAO.updateRealTimeJJB02MsgSeqListByMsgSeq", mjonResvMsgVO); } + + /** + * @Method Name : updateReserveTimeBizMsgSeqListByMsgSeq + * @작성일 : 2023. 07. 06. + * @작성자 : WYD + * @Method 설명 : 비즈뿌리오 지연처리 문자 예약 발송 + */ + public int updateReserveTimeBizMsgSeqListByMsgSeq(MjonResvMsgVO mjonResvMsgVO) { + + return update("MjonReservMsgDAO.updateReserveTimeBizMsgSeqListByMsgSeq", mjonResvMsgVO); + } } diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml index cef8b5a8..2deba729 100644 --- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml @@ -348,6 +348,8 @@ M2.yellowId , M2.userNm , M2.atSmishingYn , + M2.atDelayCompleteYn, + M2.atDelayYn, ( SELECT COUNT(0) FROM MJ_MSG_DATA C WHERE C.DEL_FLAG = 'N' @@ -451,46 +453,49 @@ MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey , MKPI.YELLOW_ID AS yellowId , LTM.MBER_NM AS userNm , - LTM.AT_SMISHING_YN AS atSmishingYn, + LTM.AT_SMISHING_YN AS atSmishingYn, BIZ_UMID AS bizUmid, BL.CALL_STATUS AS callStatus, - M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn - FROM ( - SELECT MG.USER_ID , - MG.MSG_GROUP_ID , - MG.MSG_GROUP_CNT , - MG.SMS_TXT , - MG.SUBJECT , - MG.REGDATE , - MG.REQ_DATE , - MD.RSLT_DATE , - MG.CALL_FROM , - MG.TOT_PRICE , - MG.EACH_PRICE , - MG.DEL_FLAG , - MG.MSG_TYPE , - MG.FILE_CNT , - MG.AGENT_CODE , - MG.RESERVE_YN , - MG.RESERVE_C_YN , - MG.CANCELDATE , - MD.MSG_SEQ , - MD.CALL_TO , - MD.CUR_STATE , - MD.RSLT_CODE , - MD.RSLT_CODE2 , - CASE + M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, + M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, + M.AT_DELAY_YN AS atDelayYn + FROM + (SELECT + MG.USER_ID + , MG.MSG_GROUP_ID + , MG.MSG_GROUP_CNT + , MG.SMS_TXT + , MG.SUBJECT + , MG.REGDATE + , MG.REQ_DATE + , MD.RSLT_DATE + , MG.CALL_FROM + , MG.TOT_PRICE + , MG.EACH_PRICE + , MG.DEL_FLAG + , MG.MSG_TYPE + , MG.FILE_CNT + , MG.AGENT_CODE + , MG.RESERVE_YN + , MG.RESERVE_C_YN + , MG.CANCELDATE + , MD.MSG_SEQ + , MD.CALL_TO + , MD.CUR_STATE + , MD.RSLT_CODE + , MD.RSLT_CODE2 + , CASE WHEN MG.MSG_TYPE = '8' THEN '알림톡' WHEN MG.MSG_TYPE = '9' THEN '친구톡' - END msgTypeName , - CASE + END msgTypeName + , CASE WHEN MG.MSG_TYPE = '8' THEN '1' ELSE '2' - END orderByCode , - ( + END orderByCode + , ( CASE WHEN MD.RSLT_CODE = '7000' THEN 'S' @@ -498,18 +503,24 @@ THEN 'W' ELSE 'F' END - ) AS result , - MSG_NOTICETALK_SENDER_KEY , - MSG_NOTICETALK_TMP_KEY, - MD.BIZ_UMID, - MD.BIZ_KAKAO_RESEND_YN - FROM MJ_MSG_DATA MD , - MJ_MSG_GROUP_DATA MG - WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID + ) AS result + , MSG_NOTICETALK_SENDER_KEY + , MSG_NOTICETALK_TMP_KEY + , MD.BIZ_UMID + , MD.BIZ_KAKAO_RESEND_YN + , MG.AT_DELAY_COMPLETE_YN + , MG.AT_DELAY_YN + FROM + MJ_MSG_DATA MD + , MJ_MSG_GROUP_DATA MG + WHERE 1=1 + AND MD.MSG_GROUP_ID = MG.MSG_GROUP_ID AND IFNULL(MG.DEL_FLAG, 'N') = 'N' AND MD.DEL_FLAG = 'N' - + AND MG.USER_ID = #userId# @@ -1058,6 +1069,9 @@ M2.msgNoticetalkTmpKey , M2.yellowId , M2.userNm , + M2.atSmishingYn, + M2.atDelayCompleteYn, + M2.atDelayYn, ( SELECT COUNT(0) FROM MJ_MSG_DATA C WHERE C.DEL_FLAG = 'N' @@ -1158,12 +1172,15 @@ orderByCode AS orderByCode , RESULT AS msgResult , MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey , - MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey , - MKPI.YELLOW_ID AS yellowId , - LTM.MBER_NM AS userNm , + MSG_NOTICETALK_TMP_KEY AS msgNoticetalkTmpKey , + MKPI.YELLOW_ID AS yellowId , + LTM.MBER_NM AS userNm , + LTM.AT_SMISHING_YN AS atSmishingYn, BIZ_UMID AS bizUmid, BL.CALL_STATUS AS callStatus, - M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn + M.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, + M.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, + M.AT_DELAY_YN AS atDelayYn FROM ( SELECT MG.USER_ID , MG.MSG_GROUP_ID , @@ -1207,16 +1224,19 @@ THEN 'W' ELSE 'F' END - ) AS result , - MSG_NOTICETALK_SENDER_KEY , - MSG_NOTICETALK_TMP_KEY, - MD.BIZ_UMID, - MD.BIZ_KAKAO_RESEND_YN + ) AS result + , MSG_NOTICETALK_SENDER_KEY + , MSG_NOTICETALK_TMP_KEY + , MD.BIZ_UMID + , MD.BIZ_KAKAO_RESEND_YN + , MG.AT_DELAY_COMPLETE_YN + , MG.AT_DELAY_YN FROM MJ_MSG_DATA MD , MJ_MSG_GROUP_DATA MG WHERE MD.MSG_GROUP_ID = MG.MSG_GROUP_ID AND IFNULL(MG.DEL_FLAG, 'N') = 'N' AND MD.DEL_FLAG = 'N' + AND MG.USER_ID = #userId# @@ -1386,7 +1406,7 @@ , B.SMS_TXT , B.SUBJECT , B.REGDATE - , B.REQ_DATE + , A.REQ_DATE , A.RSLT_DATE , B.CALL_FROM , B.TOT_PRICE diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index fde63259..0bfe25e1 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -5776,15 +5776,18 @@ - SELECT DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T' ) AS strReqDate - FROM MJ_MSG_GROUP_DATA + SELECT + DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T' ) AS strReqDate + FROM + MJ_MSG_GROUP_DATA WHERE 1=1 - AND USER_ID = #userId# + AND USER_ID = #userId# #msgGroupIdList[]# @@ -6597,28 +6602,42 @@ - UPDATE MJ_MSG_DATA SET - REQ_DATE = NOW() + REQ_DATE = + = 30 + THEN DATE_ADD(REQ_DATE, INTERVAL -30 MINUTE) + ELSE DATE_ADD(REQ_DATE, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE)) MINUTE) + END + ]]> WHERE 1=1 AND USER_ID = #userId# AND MSG_GROUP_ID = #msgGroupId# - - UPDATE MJ_MSG_GROUP_DATA SET - REQ_DATE = NOW() + REQ_DATE = + = 30 + THEN DATE_ADD(REQ_DATE, INTERVAL -30 MINUTE) + ELSE DATE_ADD(REQ_DATE, INTERVAL -(TIMESTAMPDIFF(MINUTE, NOW(), REQ_DATE)) MINUTE) + END + ]]> , AT_DELAY_COMPLETE_YN = 'Y' WHERE 1=1 AND USER_ID = #userId# AND MSG_GROUP_ID = #msgGroupId# - diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml index 34a52369..9c26d3d2 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml @@ -445,12 +445,17 @@ diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp index 6ae21063..0ca828eb 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATDetailList.jsp @@ -150,6 +150,7 @@ function fnSelectMber(mberId) { " /> + " />
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp index e6c22f6e..c1d5152a 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp @@ -351,10 +351,10 @@ function fnSmishingUpdate(flag) { if(checkedIds.length > 0) { var msg = ""; if(flag == 'on') { - document.listForm.smishingYn.value='Y'; + document.listForm.atSmishingYn.value='Y'; msg = "선택하신 사용자의 스미싱의심을 On 하시겠습니까?"; } else { - document.listForm.smishingYn.value='N'; + document.listForm.atSmishingYn.value='N'; msg = "선택하신 사용자의 스미싱의심을 Off 하시겠습니까?"; } if(confirm(msg)){ @@ -398,7 +398,7 @@ function fnSmishingUpdate(flag) { - +
@@ -484,9 +484,8 @@ function fnSmishingUpdate(flag) { - <%-- --%> - <%-- --%> + @@ -498,15 +497,12 @@ function fnSmishingUpdate(flag) { 번호 아이디 채널ID - 발송건수 - + 스미싱의심 요청시간 예약 내용 타입 - - @@ -516,7 +512,7 @@ function fnSmishingUpdate(flag) { " title="Check " type="checkbox"/> - + class="smishing"> @@ -524,23 +520,17 @@ function fnSmishingUpdate(flag) { - + class="smishing">
vip"> '); return false;"> ()
- - ', ''); return false;" style="cursor:pointer;"> - - - - <%-- class="smishing" style="cursor:pointer;"style="cursor:pointer;"> - - --%> - - ', ''); return false;" style="cursor:pointer;line-height:30px;text-align:right;"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> + + + ', ''); return false;" style="cursor:pointer;line-height:30px;text-align:right;" class="smishing"> (%) @@ -549,20 +539,50 @@ function fnSmishingUpdate(flag) { (%) - <%-- ','','');" value="문자" /> --%> - + <%-- ','','');" value="문자" /> --%> + - 안내완료 - + 안내완료 + - + - ', ''); return false;" style="cursor:pointer;" title=""> + class="smishing"> + + + + + + 온오프[이용정지] + "> + + + + + + + 온 + 오프[미처리] + + + + 온 + 오프[승인] + + + + + + - + + + + ', ''); return false;" style="cursor:pointer;" title="" class="smishing"> - + - + class="smishing"> 예약 @@ -572,25 +592,20 @@ function fnSmishingUpdate(flag) { - ', ''); return false;" style="cursor:pointer;"> + smishing" onclick="fn_detail_list('', ''); return false;" style="cursor:pointer;">

- ', ''); return false;" style="cursor:pointer;"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> - <%-- --%> - <%-- class="smishing"> - - --%> - <%-- --%> - - + +
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp index cb358b3d..d990a04e 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp @@ -456,7 +456,7 @@ function fnAtSmishingUpdate(flag) { <%-- --%> - <%-- --%> + @@ -468,15 +468,12 @@ function fnAtSmishingUpdate(flag) { 번호 아이디 채널ID - 발송건수 - + 스미싱의심 요청시간 예약 내용 타입 - - @@ -486,7 +483,7 @@ function fnAtSmishingUpdate(flag) { " title="Check " type="checkbox"/> - + class="smishing"> @@ -494,23 +491,17 @@ function fnAtSmishingUpdate(flag) { - + class="smishing">
vip"> '); return false;"> ()
- - ', ''); return false;" style="cursor:pointer;"> + ', ''); return false;" class="smishing"> - - - <%-- class="atSmishingYn" style="cursor:pointer;"style="cursor:pointer;"> - - --%> - - ', ''); return false;" style="cursor:pointer;line-height:30px;text-align:right;"> + + ', ''); return false;" class="smishing"> (%) @@ -519,20 +510,51 @@ function fnAtSmishingUpdate(flag) { (%) - <%-- ','','');" value="문자" /> --%> - + + - 안내완료 - + 안내완료 + - ', ''); return false;" style="cursor:pointer;" title=""> + class="smishing"> + + + + + + 온 + 오프[이용정지] + "> + + + + + + + 온 + 오프[미처리] + + + + 온 + 오프[승인] + + + + + + - + + + + ', ''); return false;" title="" class="smishing"> - '); return false;" style="cursor:pointer;"> + '); return false;" class="smishing"> 예약 @@ -542,20 +564,15 @@ function fnAtSmishingUpdate(flag) { - ', ''); return false;" style="cursor:pointer;"> + smishing" onclick="fn_detail_list('', ''); return false;" style="cursor:pointer;">

- ', ''); return false;" style="cursor:pointer;"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> - <%-- --%> - <%-- class="atSmishingYn"> - - --%> - <%-- --%>