diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java b/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java index aeb02f0..4ad9237 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java @@ -10,7 +10,10 @@ public interface MjonKakaoATService { List selectMjonKakaoATGroupCompleteList(KakaoVO searchVO) throws Exception; //알림톡 전체 발송 리스트(대시보드용) - List selectMjonKakaoATGroupCompleteByUserList(KakaoVO searchVO) throws Exception; + List selectMjonKakaoATGroupCompleteByUserList(KakaoVO searchVO) throws Exception; + + //알림톡 전체 발송 리스트(대시보드용) - DB개선 전 임시 + List selectMjonKakaoATGroupCompleteByUserListTemp(KakaoVO searchVO) throws Exception; //알림톡 발송 상세 리스트 List selectMjonKakaoATGroupDtList(KakaoVO searchVO) throws Exception; @@ -54,5 +57,8 @@ public interface MjonKakaoATService { //알림톡 전송내역 상세 KakaoVO selectMjonKakaoATVO_advc(KakaoVO mjonKakaoATVO) throws Exception; + + //알림톡 전체 발송 리스트 건수 + int selectMjonKakaoATGroupCompleteByUserListCnt_advc(KakaoVO searchVO) throws Exception; } diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java index 6411969..3357918 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java @@ -21,6 +21,10 @@ public class MjonKakaoATDAO extends EgovAbstractDAO { public List selectMjonKakaoATGroupCompleteByUserList(KakaoVO p_mjonKakaoATVO) throws Exception{ return (List)list("mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserList", p_mjonKakaoATVO); } + @SuppressWarnings("unchecked") + public List selectMjonKakaoATGroupCompleteByUserListTemp(KakaoVO p_mjonKakaoATVO) throws Exception{ + return (List)list("mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserListTemp", p_mjonKakaoATVO); + } @SuppressWarnings("unchecked") public List selectMjonKakaoATGroupDtList(KakaoVO p_mjonKakaoATVO) throws Exception{ @@ -111,4 +115,8 @@ public class MjonKakaoATDAO extends EgovAbstractDAO { public KakaoVO selectMjonKakaoATVO_advc(KakaoVO p_mjonKakaoATVO) throws Exception{ return (KakaoVO) select("mjonKakaoATDAO.selectMjonKakaoATVO_advc", p_mjonKakaoATVO); } + + public int selectMjonKakaoATGroupCompleteByUserListCnt_advc(KakaoVO p_mjonKakaoATVO) throws Exception{ + return (int)select("mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserListCnt_advc", p_mjonKakaoATVO); + } } diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java index 53d4119..3335539 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java @@ -88,6 +88,22 @@ public class MjonKakaoATServiceImpl extends EgovAbstractServiceImpl implements M } + return result; + } + @Override + public List selectMjonKakaoATGroupCompleteByUserListTemp(KakaoVO p_mjonKakaoATVO) throws Exception { + + List result = new ArrayList(); + + try { + + result = mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserListTemp(p_mjonKakaoATVO); + + } catch (Exception e) { + System.out.println("selectMjonKakaoATGroupCompleteByUserListTemp ServiceImpl Error ::: " + e); + } + + return result; } @@ -250,4 +266,21 @@ public class MjonKakaoATServiceImpl extends EgovAbstractServiceImpl implements M return result; } + + @Override + public int selectMjonKakaoATGroupCompleteByUserListCnt_advc(KakaoVO p_mjonKakaoATVO) throws Exception { + + int totCnt = 0; + + try { + + totCnt = mjonKakaoATDAO.selectMjonKakaoATGroupCompleteByUserListCnt_advc(p_mjonKakaoATVO); + + } catch (Exception e) { + System.out.println("selectMjonKakaoATGroupCompleteByUserListCnt ServiceImpl Error ::: " + e); + } + + + return totCnt; + } } diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java index c91bd17..4de59b4 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java @@ -135,6 +135,7 @@ public class MjonKakaoATController { // resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(kakaoVO); resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(kakaoVO); + int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(kakaoVO); model.addAttribute("resultList", resultList); @@ -144,7 +145,7 @@ public class MjonKakaoATController { model.addAttribute("resultMsgCodeList", resultMsgCodeList); - paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((KakaoVO)resultList.get(0)).getTotCnt() : 0); + paginationInfo.setTotalRecordCount(totCnt); model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("searchVO", kakaoVO); @@ -1128,4 +1129,4 @@ public class MjonKakaoATController { //return "cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop"; } -} \ No newline at end of file +} diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index 82bbbc3..aafce44 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1454,7 +1454,15 @@ public class EgovUserManageController { sendKakaoVO.setFirstIndex(0); sendKakaoVO.setPageType("sand"); List kakaoResultList = new ArrayList(); - kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO); + //kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO); + + /*250620 - 회원 정보 팝업 내 최근 알림톡/친구톡 전송 내역을 조회하는 임시 쿼리 + * 기존 쿼리 성능으로 인하여 회원 정보 팝업 오픈 시 간헐적으로 에러 발생 + * 임시 쿼리는 화면에 필요한 최소한의 정보만 조회하며, USER_ID를 제외한 조건은 하드코딩 처리 + * DB 개선 작업 이후 알림톡/친구톡 관련 조회 공통 쿼리 생성 예정 + * */ + sendKakaoVO.setReserveYn("N"); + kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListTemp(sendKakaoVO); model.addAttribute("kakaoResultList", kakaoResultList); @@ -1474,8 +1482,15 @@ public class EgovUserManageController { reserveKakaoVO.setFirstIndex(0); reserveKakaoVO.setPageType("sand"); List kakaoReserveList = new ArrayList(); - kakaoReserveList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(reserveKakaoVO); + //kakaoReserveList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(reserveKakaoVO); + /*250620 - 회원 정보 팝업 내 최근 알림톡/친구톡 전송 내역을 조회하는 임시 쿼리 + * 기존 쿼리 성능으로 인하여 회원 정보 팝업 오픈 시 간헐적으로 에러 발생 + * 임시 쿼리는 화면에 필요한 최소한의 정보만 조회하며, USER_ID를 제외한 조건은 하드코딩 처리 + * DB 개선 작업 이후 알림톡/친구톡 관련 조회 공통 쿼리 생성 예정 + * */ + sendKakaoVO.setReserveYn("Y"); + kakaoReserveList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListTemp(sendKakaoVO); model.addAttribute("kakaoReserveList", kakaoReserveList); diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 873239f..49bd5f5 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -28,9 +28,7 @@ Globals.Env = local # mysql Globals.DriverClassName=com.mysql.jdbc.Driver -#Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon -#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon -Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon_advc +Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon Globals.UserName= mjonUr Globals.Password= mjon!@#$ #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 370b98c..9ac968a 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -28,6 +28,7 @@ Globals.Env = local # mysql Globals.DriverClassName=com.mysql.jdbc.Driver +#Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon #Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon Globals.UserName= mjonUr 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 b987321..a2de16f 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 @@ -641,6 +641,137 @@ ) M2 + + + - + <%-- --%> @@ -648,7 +648,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - + <%-- --%> @@ -661,7 +661,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { 번호 아이디 - 채널ID + 발송건수 스미싱의심 요청시간 @@ -692,9 +692,9 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - ', ''); return false;" style="cursor:pointer;" class="smishing"> + <%-- ', ''); return false;" style="cursor:pointer;" class="smishing"> - + --%> ', ''); return false;" style="cursor:pointer;" class="smishing"> @@ -781,7 +781,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - +