JIWOO
2025-07-24
이지우 - 트리거 변경 작업(MSG_RESULT) 테스트 소스 원복
@824a49b7a077b2af625f8f1349d85901db720935
--- src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
+++ src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
... | ... | @@ -119,11 +119,4 @@ |
| 119 | 119 |
|
| 120 | 120 |
private String yellowId; |
| 121 | 121 |
|
| 122 |
- //이지우 발송결과 테스트 |
|
| 123 |
- private int successCountTest; |
|
| 124 |
- private int waitCountTest; |
|
| 125 |
- private int failCountTest; |
|
| 126 |
- private int kakaoResendSuccCountTest; |
|
| 127 |
- private int kakaoResendFailCountTest; |
|
| 128 |
- //이지우 발송결과 테스트 끝 |
|
| 129 | 122 |
} |
--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
... | ... | @@ -302,13 +302,7 @@ |
| 302 | 302 |
result.setFailCount(eachCnt.getFailCount()); |
| 303 | 303 |
result.setKakaoResendSuccCount(eachCnt.getKakaoResendSuccCount()); |
| 304 | 304 |
result.setKakaoResendFailCount(eachCnt.getKakaoResendFailCount()); |
| 305 |
- //이지우 발송결과 테스트 |
|
| 306 |
- result.setSuccessCountTest(eachCnt.getSuccessCountTest()); |
|
| 307 |
- result.setWaitCountTest(eachCnt.getWaitCountTest()); |
|
| 308 |
- result.setFailCountTest(eachCnt.getFailCountTest()); |
|
| 309 |
- result.setKakaoResendSuccCountTest(eachCnt.getKakaoResendSuccCountTest()); |
|
| 310 |
- result.setKakaoResendFailCountTest(eachCnt.getKakaoResendFailCountTest()); |
|
| 311 |
- //이지우 발송결과 테스트 끝 |
|
| 305 |
+ |
|
| 312 | 306 |
result.setMsgGroupCnt( |
| 313 | 307 |
Integer.valueOf(result.getSuccessCount() + result.getWaitCount() + result.getFailCount()).toString() |
| 314 | 308 |
); |
--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
... | ... | @@ -73,9 +73,6 @@ |
| 73 | 73 |
import itn.com.cmm.util.RedirectUrlMaker; |
| 74 | 74 |
import itn.com.cmm.util.StringUtil; |
| 75 | 75 |
import itn.com.utl.fcc.service.EgovStringUtil; |
| 76 |
-//이지우 발송결과 테스트 |
|
| 77 |
-import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATVO; |
|
| 78 |
-//이지우 발송결과 테스트 끝 |
|
| 79 | 76 |
import itn.let.lett.service.HashConfVO; |
| 80 | 77 |
import itn.let.lett.service.LetterService; |
| 81 | 78 |
import itn.let.lett.service.LetterVO; |
... | ... | @@ -6546,19 +6543,4 @@ |
| 6546 | 6543 |
|
| 6547 | 6544 |
return "web/msgdata/MsgSentListAjax"; |
| 6548 | 6545 |
} |
| 6549 |
- |
|
| 6550 |
- //이지우 발송결과 테스트 |
|
| 6551 |
- @RequestMapping(value= {"/resendTest.do"})
|
|
| 6552 |
- public String resendTest(@ModelAttribute("searchVO") MjonKakaoATVO mjonKakaoATVO, ModelMap model) throws Exception{
|
|
| 6553 |
- |
|
| 6554 |
- try {
|
|
| 6555 |
- System.out.println("=============SchedulerUtil=====runKakaoResendUpdate =============>");
|
|
| 6556 |
- schdlrManageService.updateKakaoResendResult(); |
|
| 6557 |
- }catch(Exception ex) {
|
|
| 6558 |
- ex.printStackTrace(); |
|
| 6559 |
- } |
|
| 6560 |
- |
|
| 6561 |
- return "redirect:/web/kakao/sent/selectKakaoSentView.do"; |
|
| 6562 |
- } |
|
| 6563 |
- //이지우 발송결과 테스트 끝 |
|
| 6564 | 6546 |
} |
--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java
+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java
... | ... | @@ -29,11 +29,5 @@ |
| 29 | 29 |
private int resultFValue; // 실패건수 |
| 30 | 30 |
private int resultWValue; // 대기건수 |
| 31 | 31 |
private String divideYN; // 분할여부 |
| 32 |
- /* 이지우 발송결과 테스트 */ |
|
| 33 |
- private int resultSValueTest; // 성공건수 |
|
| 34 |
- private int resultFValueTest; // 실패건수 |
|
| 35 |
- private int resultWValueTest; // 대기건수 |
|
| 36 |
- /* 이지우 발송결과 테스트 끝 */ |
|
| 37 |
- |
|
| 38 | 32 |
|
| 39 | 33 |
} |
--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
... | ... | @@ -108,10 +108,5 @@ |
| 108 | 108 |
// 결과 리스트 select 할 떄 |
| 109 | 109 |
// TIMESTAMPDIFF(minute, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T'), DATE_FORMAT(NOW(), '%Y-%m-%d %T')) as diffMin |
| 110 | 110 |
private int diffMin; |
| 111 |
- /* 이지우 발송결과 테스트 */ |
|
| 112 |
- private String resultSValueTest; |
|
| 113 |
- private String resultFValueTest; |
|
| 114 |
- private String resultWValueTest; |
|
| 115 |
- /* 이지우 발송결과 테스트 끝 */ |
|
| 116 | 111 |
|
| 117 | 112 |
} |
--- src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
+++ src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
... | ... | @@ -751,11 +751,6 @@ |
| 751 | 751 |
t.setResultWValue(updatedVO.getResultWValue()); |
| 752 | 752 |
t.setDivideYN(updatedVO.getDivideYN()); |
| 753 | 753 |
t.setTotPrice(updatedVO.getTotPrice()); |
| 754 |
- /* 이지우 발송결과 테스트 */ |
|
| 755 |
- t.setResultSValueTest(updatedVO.getResultSValueTest()); |
|
| 756 |
- t.setResultFValueTest(updatedVO.getResultFValueTest()); |
|
| 757 |
- t.setResultWValueTest(updatedVO.getResultWValueTest()); |
|
| 758 |
- /* 이지우 발송결과 테스트 끝 */ |
|
| 759 | 754 |
}); |
| 760 | 755 |
return resultList; |
| 761 | 756 |
} |
... | ... | @@ -770,11 +765,6 @@ |
| 770 | 765 |
returnVO.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue())); // 성공건수 |
| 771 | 766 |
returnVO.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue())); // 실패건수 |
| 772 | 767 |
returnVO.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue())); // 대기건수 |
| 773 |
- /* 이지우 발송결과 테스트 */ |
|
| 774 |
- returnVO.setResultSValueTest(String.valueOf(mjonMsgSWFDTO.getResultSValueTest())); // 성공건수 |
|
| 775 |
- returnVO.setResultFValueTest(String.valueOf(mjonMsgSWFDTO.getResultFValueTest())); // 실패건수 |
|
| 776 |
- returnVO.setResultWValueTest(String.valueOf(mjonMsgSWFDTO.getResultWValueTest())); // 대기건수 |
|
| 777 |
- /*이지우 발송결과 테스트 끝*/ |
|
| 778 | 768 |
returnVO.setDivideYN(mjonMsgSWFDTO.getDivideYN()); |
| 779 | 769 |
|
| 780 | 770 |
|
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
... | ... | @@ -1681,19 +1681,6 @@ |
| 1681 | 1681 |
, 0 AS successPrice |
| 1682 | 1682 |
, 0 AS kakaoResendSuccPrice |
| 1683 | 1683 |
</isNotEqual> |
| 1684 |
- <!-- 이지우 발송결과 테스트 --> |
|
| 1685 |
- , a.successCountTest |
|
| 1686 |
- , a.waitCountTest |
|
| 1687 |
- , a.failCountTest |
|
| 1688 |
- <isEqual property="bizKakaoResendYn" compareValue="Y"> |
|
| 1689 |
- , a.kakaoResendSuccCountTest |
|
| 1690 |
- , a.kakaoResendFailCountTest |
|
| 1691 |
- </isEqual> |
|
| 1692 |
- <isNotEqual property="bizKakaoResendYn" compareValue="Y"> |
|
| 1693 |
- , 0 AS kakaoResendSuccCountTest |
|
| 1694 |
- , 0 AS kakaoResendFailCountTest |
|
| 1695 |
- </isNotEqual> |
|
| 1696 |
- <!-- 이지우 발송결과 테스트 끝--> |
|
| 1697 | 1684 |
FROM ( |
| 1698 | 1685 |
SELECT |
| 1699 | 1686 |
t1.MSG_GROUP_ID |
... | ... | @@ -1710,16 +1697,6 @@ |
| 1710 | 1697 |
, 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
|
| 1711 | 1698 |
, 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
|
| 1712 | 1699 |
</isEqual> |
| 1713 |
- <!-- 이지우 발송결과 테스트 --> |
|
| 1714 |
- , t1.MSG_RESULT AS msgResult |
|
| 1715 |
- , SUM(IF(t1.MSG_RESULT = '10', 1, 0)) AS successCountTest |
|
| 1716 |
- , SUM(IF(t1.MSG_RESULT IS NULL OR TRIM(t1.MSG_RESULT) ='',1,0)) AS waitCountTest |
|
| 1717 |
- , 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 |
|
| 1718 |
- <isEqual property="bizKakaoResendYn" compareValue="Y"> |
|
| 1719 |
- , SUM(IF(t1.MSG_RESULT = '40', 1, 0)) AS kakaoResendSuccCountTest |
|
| 1720 |
- , SUM(IF(t1.MSG_RESULT = '50', 1, 0)) AS kakaoResendFailCountTest |
|
| 1721 |
- </isEqual> |
|
| 1722 |
- <!-- 이지우 발송결과 테스트 끝--> |
|
| 1723 | 1700 |
FROM mj_msg_data t1 FORCE INDEX (idx_msgdata_groupid_delfalg_msgtype_curstate) |
| 1724 | 1701 |
<isEqual property="bizKakaoResendYn" compareValue="Y"> |
| 1725 | 1702 |
LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
... | ... | @@ -295,11 +295,6 @@ |
| 295 | 295 |
SUM(IF(aa.result = 'S', 1, 0)) AS resultSValue, |
| 296 | 296 |
SUM(IF(aa.result = 'W', 1, 0)) AS resultWValue, |
| 297 | 297 |
SUM(IF(aa.result = 'F', 1, 0)) AS resultFValue, |
| 298 |
- <!-- 이지우 발송결과 테스트 --> |
|
| 299 |
- SUM(IF(aa.MSG_RESULT = '10', 1, 0)) AS resultSValueTest, |
|
| 300 |
- SUM(IF(aa.MSG_RESULT IS NULL OR TRIM(aa.MSG_RESULT) ='',1,0)) AS resultWValueTest, |
|
| 301 |
- SUM(IF(aa.MSG_RESULT = '20', 1, 0)) AS resultFValueTest, |
|
| 302 |
- <!-- 이지우 발송결과 테스트 끝--> |
|
| 303 | 298 |
CASE |
| 304 | 299 |
WHEN COUNT(DISTINCT REQ_DATE) > 1 THEN 'Y' |
| 305 | 300 |
ELSE 'N' |
... | ... | @@ -347,9 +342,6 @@ |
| 347 | 342 |
else 'F' |
| 348 | 343 |
end as result /* common query */ |
| 349 | 344 |
, A.REQ_DATE |
| 350 |
- <!-- 이지우 발송결과 테스트 --> |
|
| 351 |
- , A.MSG_RESULT |
|
| 352 |
- <!-- 이지우 발송결과 테스트 끝--> |
|
| 353 | 345 |
from |
| 354 | 346 |
MJ_MSG_DATA A |
| 355 | 347 |
where |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
... | ... | @@ -236,24 +236,7 @@ |
| 236 | 236 |
<fmt:formatNumber value="${resultAllSentList.msgGroupCnt}" type="number" groupingUsed="true" />
|
| 237 | 237 |
<%-- <c:out value="${resultAllSentList.msgGroupCnt}"/> --%>
|
| 238 | 238 |
</td> |
| 239 |
- <!-- 이지우 발송결과 테스트 --> |
|
| 240 | 239 |
<td> |
| 241 |
- <fmt:formatNumber value="${resultAllSentList.waitCount}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${resultAllSentList.waitCountTest}" type="number" groupingUsed="true" />
|
|
| 242 |
- </td> |
|
| 243 |
- <td> |
|
| 244 |
- <p class="c_002c9a"><fmt:formatNumber value="${resultAllSentList.successCount}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${resultAllSentList.successCountTest}" type="number" groupingUsed="true" /></p>
|
|
| 245 |
- </td> |
|
| 246 |
- <td> |
|
| 247 |
- <p class="c_e40000"><fmt:formatNumber value="${resultAllSentList.failCount}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${resultAllSentList.failCountTest}" type="number" groupingUsed="true" /></p>
|
|
| 248 |
- </td> |
|
| 249 |
- <td> |
|
| 250 |
- <p class="c_002c9a"><fmt:formatNumber value="${resultAllSentList.kakaoResendSuccCount}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${resultAllSentList.kakaoResendSuccCountTest}" type="number" groupingUsed="true" /></p>
|
|
| 251 |
- </td> |
|
| 252 |
- <td> |
|
| 253 |
- <p class="c_e40000"><fmt:formatNumber value="${resultAllSentList.kakaoResendFailCount}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${resultAllSentList.kakaoResendFailCountTest}" type="number" groupingUsed="true" /></p>
|
|
| 254 |
- </td> |
|
| 255 |
- <!-- 이지우 발송결과 테스트 끝--> |
|
| 256 |
- <%-- <td> |
|
| 257 | 240 |
<fmt:formatNumber value="${resultAllSentList.waitCount}" type="number" groupingUsed="true" />
|
| 258 | 241 |
</td> |
| 259 | 242 |
<td> |
... | ... | @@ -267,7 +250,7 @@ |
| 267 | 250 |
</td> |
| 268 | 251 |
<td> |
| 269 | 252 |
<p class="c_e40000"><fmt:formatNumber value="${resultAllSentList.kakaoResendFailCount}" type="number" groupingUsed="true" /></p>
|
| 270 |
- </td> --%> |
|
| 253 |
+ </td> |
|
| 271 | 254 |
<td> |
| 272 | 255 |
<c:if test="${resultAllSentList.totPrice ne '-'}">
|
| 273 | 256 |
<fmt:formatNumber value="${resultAllSentList.totPrice}" type="number" groupingUsed="true" minFractionDigits="0" maxFractionDigits="1" />
|
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
... | ... | @@ -290,13 +290,13 @@ |
| 290 | 290 |
<p><fmt:formatNumber value="${result.msgGroupCnt}" type="number" groupingUsed="true" /> </p>
|
| 291 | 291 |
</td> |
| 292 | 292 |
<td> |
| 293 |
- <p><fmt:formatNumber value="${result.resultWValue}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${result.resultWValueTest}" type="number" groupingUsed="true" /></p>
|
|
| 293 |
+ <p><fmt:formatNumber value="${result.resultWValue}" type="number" groupingUsed="true" /> </p>
|
|
| 294 | 294 |
</td> |
| 295 | 295 |
<td> |
| 296 |
- <p class="c_002c9a"><fmt:formatNumber value="${result.resultSValue}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${result.resultSValueTest}" type="number" groupingUsed="true" /> </p>
|
|
| 296 |
+ <p class="c_002c9a"><fmt:formatNumber value="${result.resultSValue}" type="number" groupingUsed="true" /> </p>
|
|
| 297 | 297 |
</td> |
| 298 | 298 |
<td> |
| 299 |
- <p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /><br/><fmt:formatNumber value="${result.resultFValueTest}" type="number" groupingUsed="true" /></p>
|
|
| 299 |
+ <p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /> </p>
|
|
| 300 | 300 |
</td> |
| 301 | 301 |
<td> |
| 302 | 302 |
<c:choose> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?