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 7cafbab5..553470f4 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java
@@ -29,5 +29,11 @@ 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 1e412147..3bf64139 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
@@ -108,5 +108,10 @@ 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 037f6548..6cb6b266 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,6 +751,11 @@ 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;
}
@@ -765,6 +770,11 @@ 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/java/itn/let/schdlr/service/SchedulerUtil.java b/src/main/java/itn/let/schdlr/service/SchedulerUtil.java
index fe76af9a..e237281d 100644
--- a/src/main/java/itn/let/schdlr/service/SchedulerUtil.java
+++ b/src/main/java/itn/let/schdlr/service/SchedulerUtil.java
@@ -480,8 +480,10 @@ public class SchedulerUtil {
}
//대체문자 결과 반영
+ //환불처리도 3분마다 MJ_MSG_DATA를 UPDATE하기 때문에 락 이름을 동일하게하여 데드락 방지(환불 스케줄러 : runKakaoOneTime)
+ //@SchedulerLock(name = "updateKakaoResendResult", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
@Scheduled(cron = "0 0/2 * * * ?") // 2분마다 실행
- @SchedulerLock(name = "updateKakaoResendResult", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
+ @SchedulerLock(name = "runKakaoOneTime", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN)
public void runUpdateKakaoResendResult() throws Exception {
try {
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 752eec93..ebb0f482 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,6 +295,11 @@
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'
@@ -342,6 +347,9 @@
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/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 8cfd15eb..6da9a0a6 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){
-
+
|
-
+
|
-
+
|
|