diff --git a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java index a0148f75..4244ada4 100644 --- a/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/service/impl/SMSOracleServiceImpl.java @@ -640,8 +640,8 @@ public class SMSOracleServiceImpl extends EgovAbstractServiceImpl implements SM KakaoAtSendVO apiVO = new KakaoAtSendVO(); //msgTy별 템플릿 코드 가져오기 - String msgTy = (String) map.get("msgTy"); - String templateCode = msgMgrDAO.selectMsgMgrTemplateCode(msgTy); + String smsTy = (String) map.get("smsTy"); + String templateCode = msgMgrDAO.selectMsgMgrTemplateCode(smsTy); apiVO.setSendTo(rpplPhone); apiVO.setTemplateCode(templateCode); diff --git a/src/main/java/kcc/kccadr/message/SchedulerUtil.java b/src/main/java/kcc/kccadr/message/SchedulerUtil.java index 727a7b3e..e7543046 100644 --- a/src/main/java/kcc/kccadr/message/SchedulerUtil.java +++ b/src/main/java/kcc/kccadr/message/SchedulerUtil.java @@ -29,8 +29,8 @@ import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock; @Service("SchedulerUtil") @EnableScheduling -//@EnableSchedulerLock(defaultLockAtMostFor = "PT30S") // Scheduler Lock 사용 가능 설정 (기본 30초동안 Lock) -@EnableSchedulerLock(defaultLockAtMostFor = "PT1M") // Scheduler Lock 사용 가능 설정 +@EnableSchedulerLock(defaultLockAtMostFor = "PT30S") // Scheduler Lock 사용 가능 설정 (기본 30초동안 Lock) +//@EnableSchedulerLock(defaultLockAtMostFor = "PT1M") // Scheduler Lock 사용 가능 설정 public class SchedulerUtil { private static final Logger log = LoggerFactory.getLogger(LoggerAspect.class); @@ -44,7 +44,7 @@ public class SchedulerUtil { @Resource (name = "KakaoAtSendService") private KakaoAtSendService kakaoAtSendService; - private static final String NINE_MIN = "PT9M"; // 9분동안 LOCK + private static final String TWO_MIN = "PT2M"; // 2분동안 LOCK //로컬 테스트용 아이피 허용 private String myLocalIp = "192.168.0.40"; @@ -60,8 +60,8 @@ public class SchedulerUtil { private String dmzIp2 = "222.231.43.69"; //10분마다 실행 - @Scheduled(cron = "0 0/10 * * * *") - @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = NINE_MIN, lockAtLeastForString = NINE_MIN) + @Scheduled(cron = "0 0/2 * * * *") + @SchedulerLock(name = "kakaoAtSendPrcs", lockAtMostForString = TWO_MIN, lockAtLeastForString = TWO_MIN) public void kakaoAtSendPrcs() throws Exception { System.out.println("===========at scheduler run============"); log.error("===========at scheduler run============"); diff --git a/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java b/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java index 90d04768..4976fd7f 100644 --- a/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java +++ b/src/main/java/kcc/kccadr/msg/service/impl/MsgMgrDAO.java @@ -32,8 +32,8 @@ public class MsgMgrDAO extends EgovAbstractDAO { } //발송유형별 알림톡 템플릿 코드 가져오기 - public String selectMsgMgrTemplateCode(String msgTy) throws Exception{ - return (String) select("MsgMgrDAO.selectMsgMgrTemplateCode", msgTy); + public String selectMsgMgrTemplateCode(String smsTy) throws Exception{ + return (String) select("MsgMgrDAO.selectMsgMgrTemplateCode", smsTy); } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml index 5e26275f..f40398aa 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/msg/Msg_SQL_Mysql.xml @@ -75,7 +75,7 @@ TEMPLATE_CODE AS templateCode FROM ADR_MSG_MGR - WHERE MSG_TY = #msgTy# + WHERE MSG_TY = #smsTy#