diff --git a/WebContent/jsp/onl/apim/messagerequest/messageRequestMan.jsp b/WebContent/jsp/onl/apim/messagerequest/messageRequestMan.jsp
index 3f8d066..603aa47 100644
--- a/WebContent/jsp/onl/apim/messagerequest/messageRequestMan.jsp
+++ b/WebContent/jsp/onl/apim/messagerequest/messageRequestMan.jsp
@@ -192,7 +192,6 @@
-
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java
index 322990f..2c65a83 100644
--- a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java
+++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java
@@ -41,6 +41,7 @@ public class UmsService {
private static final String SYS_DVCD = "API"; //시스템코드
private static final String BZWK_DVCD = "99"; //업무구분코드
+ private static final String BZWK_CD = "999"; //업무코드
private static final String BZWK_DCLS_DVCD = "9019"; //세부구분코드
private static final String SUB_BZWK_CD = "999"; //서브업무코드 TODO: 변경할것
private static final String TEAM_DVCD = "99"; //팀구분코드 TODO: 변경해야함
@@ -200,36 +201,31 @@ public class UmsService {
+ " }\r\n" + " }\r\n" + " ]\r\n" + "}";
}
- else if ("SMS".equals(messageRequest.getMessageType())
- || "KAKAO".equals(messageRequest.getMessageType())) {
-
+ else if ("SMS".equals(messageRequest.getMessageType())) {
+
// Sms 데이터
SmsDataVO dataVO = new SmsDataVO();
dataVO.setSnd_dman_dt(jsonData[0]);
dataVO.setSnd_dman_id(this.getSndDmanId(messageRequest.getMessageType()));
dataVO.setSnd_dvcd("EAI");
- dataVO.setMsg_titl(StringUtil.chunkString(messageRequest.getSubject(), 40, false)); // MS949 40byte 초과시 절단
- dataVO.setMsg_ctnt(messageRequest.getMessage());
+ dataVO.setSms_msg_titl(StringUtil.chunkString(messageRequest.getSubject(), 40, false)); // MS949 40byte 초과시 절단
+ dataVO.setSms_msg_ctnt(messageRequest.getMessage());
dataVO.setRecvr_no(PhoneNumberUtil.digitsOnly(messageRequest.getPhone()));
dataVO.setSndn_no("15880079"); //발신번호
dataVO.setSnd_empno("APIM"); //요청자
dataVO.setSnd_emp_dprm_cd("132"); //요청부서코드
- if ("SMS".equals(messageRequest.getMessageType())) {
- dataVO.setLtrs_snd_tycd("1"); // 1:SMS 2:LMS/MMS
- dataVO.setMsg_snd_tycd("0000"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, ....
- } else if ("KAKAO".equals(messageRequest.getMessageType())) {
- dataVO.setLtrs_snd_tycd("2"); // 1:SMS 2:LMS/MMS
- dataVO.setMsg_snd_tycd("1008"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, ....
- //ADMIN으로 시작하면 제주은행 임직원, 나머지는 제주은행 고객용
- if (messageRequest.getMessageCode().name().startsWith("ADMIN")) {
- dataVO.setAlmtk_snd_prfl_key(propertyService.getPropertyValue("Monitoring", "djb.ums.sms.almtk_snd_prtl_key.intra", "")); // 제주은행 임직원 플러스친구아이디
- } else {
- dataVO.setAlmtk_snd_prfl_key(propertyService.getPropertyValue("Monitoring", "djb.ums.sms.almtk_snd_prtl_key.public", "")); // 제주은행 플러스친구아이디
- }
- dataVO.setAlmtk_tmplt_cd(BZWK_DVCD + TEAM_DVCD + BZWK_DCLS_DVCD + "001"); // 템플릿코드
- dataVO.setAlmtk_err_ltrs_snd_yn("Y"); // 오류자문자발송여부
- dataVO.setAlmtk_btn_trnm_tycd("2"); // 카카오버튼전송방식 1-format string 2-JSON 3-XML
- }
+ dataVO.setLtrs_snd_tycd("2"); // 1:SMS 2:LMS/MMS
+ dataVO.setMsg_snd_tycd("1008"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, ....
+ //ADMIN으로 시작하면 제주은행 임직원, 나머지는 제주은행 고객용
+ if (messageRequest.getMessageCode().name().startsWith("ADMIN")) {
+ dataVO.setAlmtk_snd_prfl_key(propertyService.getPropertyValue("Monitoring", "djb.ums.sms.almtk_snd_prtl_key.intra", "")); // 제주은행 임직원 플러스친구아이디
+ } else {
+ dataVO.setAlmtk_snd_prfl_key(propertyService.getPropertyValue("Monitoring", "djb.ums.sms.almtk_snd_prtl_key.public", "")); // 제주은행 플러스친구아이디
+ }
+ dataVO.setAlmtk_tmplt_cd(BZWK_DVCD + TEAM_DVCD + BZWK_DCLS_DVCD + "001"); // 템플릿코드
+ dataVO.setAlmtk_err_ltrs_snd_yn("Y"); // 오류자문자발송여부
+ dataVO.setAlmtk_btn_trnm_tycd("2"); // 카카오버튼전송방식 1-format string 2-JSON 3-XML
+
dataVO.setSms_trnm_bzwk_dvcd(BZWK_DVCD); //업무구분코드
dataVO.setSms_bzwk_dcls_dvcd(BZWK_DCLS_DVCD); //업무세분코드
dataVO.setSms_sys_dvcd("83"); //시스템코드
@@ -245,8 +241,8 @@ public class UmsService {
// 헤더 + 데이터
rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n"
+ " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n"
- + " \"ums_if_data_ncnt\":1, \r\n"
- + " \"ums_if_data\":" + data
+ + " \"ums_if_data_ccnt\":1, \r\n"
+ + " \"ltrsAlmtkSndLnkdInputDto\":" + data
+ " }\r\n" + " }\r\n" + " ]\r\n" + "}";
}
@@ -269,8 +265,8 @@ public class UmsService {
dataVO.setTmplt_mpng_rptt_info(""); // 탬플릿매핑반복정보
dataVO.setSnd_empno("APIM"); // 발신자ID(필수)
dataVO.setSnd_emp_dprm_cd("132"); // 발신자부서코드(필수)
- dataVO.setBzwk_cd(BZWK_DVCD); // 업무구분코드
- dataVO.setSub_bzwk_cd(SUB_BZWK_CD); // 업무세부코드
+ dataVO.setBzwk_cd(BZWK_CD); // 업무코드
+ dataVO.setSub_bzwk_cd(SUB_BZWK_CD); // 서브업무코드
dataVO.setSys_dvcd(SYS_DVCD); // 시스템구분코드
dataVO.setTx_dt(jsonData[0]); // 거래일자
dataVO.setTx_tktm(jsonData[1].substring(0,6)); // 거래시간
@@ -284,8 +280,8 @@ public class UmsService {
// 헤더 + 데이터
rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n"
+ " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n"
- + " \"ums_if_data_ncnt\":1, \r\n"
- + " \"ums_if_data\":" + data
+ + " \"ums_if_data_ccnt\":1, \r\n"
+ + " \"eMAILSndLnkdInputDto\":" + data
+ " }\r\n" + " }\r\n" + " ]\r\n" + "}";
}
@@ -353,24 +349,16 @@ public class UmsService {
String uuid = "";
if ("EMAIL".equals(messageType)) {
- uuid = SYS_DVCD + BZWK_DVCD + SUB_BZWK_CD + yyyymmdd + "O" + "E" ;
+ uuid = SYS_DVCD + BZWK_CD + SUB_BZWK_CD + yyyymmdd + "O" + "E" ;
long seq = messageRequestService.countEmailRequestsOnDate(LocalDate.now()) + 1;
uuid += String.format("%013d", seq);
- } else {
- uuid = SYS_DVCD + BZWK_DVCD + BZWK_DCLS_DVCD + yyyymmdd + "O" ;
-
- if ("SMS".equals(messageType)) {
- uuid += "S";
- } else if ("LMS".equals(messageType)) {
- uuid += "L";
- } else if ("KAKAO".equals(messageType)) {
- uuid += "K";
- }
+ } else if ("SMS".equals(messageType)) { //kakao 알림톡
+ uuid = SYS_DVCD + BZWK_DVCD + BZWK_DCLS_DVCD + yyyymmdd + "O" + "K";
long seq = messageRequestService.countSmsKakaoRequestsOnDate(LocalDate.now()) + 1;
- uuid += String.format("%014d", seq);
+ uuid += String.format("%013d", seq);
}
return uuid;
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java
index a2f822c..b23e7f7 100644
--- a/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java
+++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/vo/SmsDataVO.java
@@ -18,10 +18,10 @@ public class SmsDataVO {
private String ltrs_snd_tycd;
/** LMS 제목 */
- private String msg_titl;
+ private String sms_msg_titl;
/** 메세지 */
- private String msg_ctnt;
+ private String sms_msg_ctnt;
/** 수신자번호 */
private String recvr_no;