nuri2 버전 변경(2.1.0)에 따른 수정(RCS 브랜드 아이디 필수)

src/main/java/cokr/xit/interfaces/message/MessageEntity.java

@@ -295,6 +295,11 @@ public class MessageEntity extends AbstractEntity {
      */
 	private String altJson;
 
+	/**
+     * RCS 브랜드 아이디
+     */
+	private String rcsBrandId;
+
 	/**
      * RCS 브랜드 키
      */

src/main/java/cokr/xit/interfaces/message/web/MessageInterfaceController.java

@@ -156,13 +156,15 @@ public class MessageInterfaceController extends AbstractController {
 			}
 		}
 
-		//RCS브랜드아이디 찾기
+		//RCS브랜드아이디 및 RCS브랜드키 찾기
+		String rcsBrandId = "";
 		String rcsBrandKey = "";
 		String rcsTemplate = "";
 		messageQuery = new MessageQuery().setSggCd(sggCd).setStngInfoType("03").setMsgPrps(msgPrps)
 				.setTaskSeCd(taskSeCd).setSvcType("RCS");
 		stng = messageMapper.selectStng(messageQuery);
 		if(stng != null && !stng.isEmpty()) {
+			rcsBrandId = stng.string("SVC_USER_PREV_ID");
 			rcsBrandKey = stng.string("SVC_USER_ID");
 			if(!EgovStringUtil.null2void(rcsBrandKey).equals("")) {
 				//RCS템플릿찾기
@@ -399,6 +401,7 @@ public class MessageInterfaceController extends AbstractController {
 			}
 
 			if(able_rcs) {
+				messageEntity.setRcsBrandId(rcsBrandId);
 				messageEntity.setRcsBrandKey(rcsBrandKey);
 				messageEntity.setRcsMessageBaseId(rcsBaseId);
 				messageEntity.setRcsJson(rcsJsonComplete);

src/main/resources/sql/mapper/interfaces/message-mapper.xml

@@ -140,6 +140,7 @@ INSERT
      , ALT_JSON
 </if>
 <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(rcsBrandKey)">
+     , RCS_BRAND_ID
      , RCS_BRAND_KEY
      , RCS_MESSAGE_BASE_ID
      , RCS_JSON
@@ -201,6 +202,7 @@ VALUES (
      , #{altJson}
 </if>
 <if test="@org.egovframe.rte.fdl.string.EgovStringUtil@isNotEmpty(rcsBrandKey)">
+     , #{rcsBrandId}
      , #{rcsBrandKey}
      , #{rcsMessageBaseId}
      , #{rcsJson}
@@ -235,6 +237,7 @@ SELECT A.MSG_STNG_ID
      , A.MODULE_ID
      , A.TELNO
      , A.SVC_TYPE
+     , A.SVC_USER_PREV_ID
      , A.SVC_USER_ID
      , A.TMPLAT_ID
      , A.TMPLT_CN