diff --git a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java index 44673c18..1a2e7682 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java +++ b/src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java @@ -119,11 +119,4 @@ public class KakaoSentVO extends UserDefaultVO{ private String yellowId; - //이지우 발송결과 테스트 - private int successCountTest; - private int waitCountTest; - private int failCountTest; - private int kakaoResendSuccCountTest; - private int kakaoResendFailCountTest; - //이지우 발송결과 테스트 끝 } diff --git a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java index f73c83fa..7f4e1e1e 100644 --- a/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java @@ -302,13 +302,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka result.setFailCount(eachCnt.getFailCount()); result.setKakaoResendSuccCount(eachCnt.getKakaoResendSuccCount()); result.setKakaoResendFailCount(eachCnt.getKakaoResendFailCount()); - //이지우 발송결과 테스트 - result.setSuccessCountTest(eachCnt.getSuccessCountTest()); - result.setWaitCountTest(eachCnt.getWaitCountTest()); - result.setFailCountTest(eachCnt.getFailCountTest()); - result.setKakaoResendSuccCountTest(eachCnt.getKakaoResendSuccCountTest()); - result.setKakaoResendFailCountTest(eachCnt.getKakaoResendFailCountTest()); - //이지우 발송결과 테스트 끝 + result.setMsgGroupCnt( Integer.valueOf(result.getSuccessCount() + result.getWaitCount() + result.getFailCount()).toString() ); 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 c115650f..76a9d0ea 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -73,9 +73,6 @@ import itn.com.cmm.util.MJUtil; import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; -//이지우 발송결과 테스트 -import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATVO; -//이지우 발송결과 테스트 끝 import itn.let.lett.service.HashConfVO; import itn.let.lett.service.LetterService; import itn.let.lett.service.LetterVO; @@ -6546,19 +6543,4 @@ public class MjonMsgDataController { return "web/msgdata/MsgSentListAjax"; } - - //이지우 발송결과 테스트 - @RequestMapping(value= {"/resendTest.do"}) - public String resendTest(@ModelAttribute("searchVO") MjonKakaoATVO mjonKakaoATVO, ModelMap model) throws Exception{ - - try { - System.out.println("=============SchedulerUtil=====runKakaoResendUpdate =============>"); - schdlrManageService.updateKakaoResendResult(); - }catch(Exception ex) { - ex.printStackTrace(); - } - - return "redirect:/web/kakao/sent/selectKakaoSentView.do"; - } - //이지우 발송결과 테스트 끝 } diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java index 553470f4..7cafbab5 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java @@ -29,11 +29,5 @@ public class MjonMsgSWFDTO implements Serializable { private int resultFValue; // 실패건수 private int resultWValue; // 대기건수 private String divideYN; // 분할여부 - /* 이지우 발송결과 테스트 */ - private int resultSValueTest; // 성공건수 - private int resultFValueTest; // 실패건수 - private int resultWValueTest; // 대기건수 - /* 이지우 발송결과 테스트 끝 */ - } diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index 3bf64139..1e412147 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -108,10 +108,5 @@ public class MjonMsgSentVO extends UserDefaultVO{ // 결과 리스트 select 할 떄 // TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin private int diffMin; - /* 이지우 발송결과 테스트 */ - private String resultSValueTest; - private String resultFValueTest; - private String resultWValueTest; - /* 이지우 발송결과 테스트 끝 */ } diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index 6cb6b266..037f6548 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -751,11 +751,6 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements t.setResultWValue(updatedVO.getResultWValue()); t.setDivideYN(updatedVO.getDivideYN()); t.setTotPrice(updatedVO.getTotPrice()); - /* 이지우 발송결과 테스트 */ - t.setResultSValueTest(updatedVO.getResultSValueTest()); - t.setResultFValueTest(updatedVO.getResultFValueTest()); - t.setResultWValueTest(updatedVO.getResultWValueTest()); - /* 이지우 발송결과 테스트 끝 */ }); return resultList; } @@ -770,11 +765,6 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements returnVO.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue())); // 성공건수 returnVO.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue())); // 실패건수 returnVO.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue())); // 대기건수 - /* 이지우 발송결과 테스트 */ - returnVO.setResultSValueTest(String.valueOf(mjonMsgSWFDTO.getResultSValueTest())); // 성공건수 - returnVO.setResultFValueTest(String.valueOf(mjonMsgSWFDTO.getResultFValueTest())); // 실패건수 - returnVO.setResultWValueTest(String.valueOf(mjonMsgSWFDTO.getResultWValueTest())); // 대기건수 - /*이지우 발송결과 테스트 끝*/ returnVO.setDivideYN(mjonMsgSWFDTO.getDivideYN()); diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 752385fa..c8930144 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1681,19 +1681,6 @@ , 0 AS successPrice , 0 AS kakaoResendSuccPrice - - , a.successCountTest - , a.waitCountTest - , a.failCountTest - - , a.kakaoResendSuccCountTest - , a.kakaoResendFailCountTest - - - , 0 AS kakaoResendSuccCountTest - , 0 AS kakaoResendFailCountTest - - FROM ( SELECT t1.MSG_GROUP_ID @@ -1710,16 +1697,6 @@ , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') AND t1.BIZ_KAKAO_RESEND_TYPE = 'SMS', 1, 0)) AS smsCnt , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') AND t1.BIZ_KAKAO_RESEND_TYPE = 'MMS', 1, 0)) AS mmsCnt - - , t1.MSG_RESULT AS msgResult - , SUM(IF(t1.MSG_RESULT = '10', 1, 0)) AS successCountTest - , SUM(IF(t1.MSG_RESULT IS NULL OR TRIM(t1.MSG_RESULT) ='',1,0)) AS waitCountTest - , SUM(IF(t1.MSG_RESULT = '20' OR t1.MSG_RESULT = '30' OR t1.MSG_RESULT = '40' OR t1.MSG_RESULT = '50', 1, 0)) AS failCountTest - - , SUM(IF(t1.MSG_RESULT = '40', 1, 0)) AS kakaoResendSuccCountTest - , SUM(IF(t1.MSG_RESULT = '50', 1, 0)) AS kakaoResendFailCountTest - - FROM mj_msg_data t1 FORCE INDEX (idx_msgdata_groupid_delfalg_msgtype_curstate) LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index ebb0f482..752eec93 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -295,11 +295,6 @@ SUM(IF(aa.result = 'S', 1, 0)) AS resultSValue, SUM(IF(aa.result = 'W', 1, 0)) AS resultWValue, SUM(IF(aa.result = 'F', 1, 0)) AS resultFValue, - - SUM(IF(aa.MSG_RESULT = '10', 1, 0)) AS resultSValueTest, - SUM(IF(aa.MSG_RESULT IS NULL OR TRIM(aa.MSG_RESULT) ='',1,0)) AS resultWValueTest, - SUM(IF(aa.MSG_RESULT = '20', 1, 0)) AS resultFValueTest, - CASE WHEN COUNT(DISTINCT REQ_DATE) > 1 THEN 'Y' ELSE 'N' @@ -347,9 +342,6 @@ else 'F' end as result /* common query */ , A.REQ_DATE - - , A.MSG_RESULT - from MJ_MSG_DATA A where diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp index 6e056f65..1e034a9f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp @@ -236,24 +236,7 @@ function pageUnitChg(obj){ <%-- --%> - -
- - -


- - -


- - -


- - -


- - - <%-- @@ -267,7 +250,7 @@ function pageUnitChg(obj){

- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 6da9a0a6..8cfd15eb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -290,13 +290,13 @@ function fnReservCancel(msgGroupId){

-


+

-


+

-


+