diff --git a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java index 792bcfae..f797391b 100644 --- a/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java +++ b/src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java @@ -2,6 +2,7 @@ package itn.let.kakao.user.sent.web; import java.io.FileReader; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import itn.com.cmm.util.DateUtils; import java.text.SimpleDateFormat; @@ -38,6 +39,7 @@ import itn.com.cmm.LoginVO; import itn.com.cmm.util.StringUtil; import itn.com.cmm.util.StringUtil2; import itn.com.utl.fcc.service.EgovStringUtil; +import itn.let.cmm.vo.FileInfoVO; import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATVO; import itn.let.kakao.kakaoComm.KakaoButtonVO; import itn.let.kakao.kakaoComm.KakaoReturnVO; @@ -46,6 +48,8 @@ import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiTemplate; import itn.let.kakao.user.sent.service.KakaoSentDetailVO; import itn.let.kakao.user.sent.service.KakaoSentService; import itn.let.kakao.user.sent.service.KakaoSentVO; +import itn.let.mjo.msgsent.service.MjonMsgSentVO; +import itn.let.mjo.msgsent.service.impl.MjonMsgSentDAO; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -55,6 +59,9 @@ public class KakaoSentController { @Resource(name = "KakaoSentService") private KakaoSentService kakaoSentService; + @Resource(name="MjonMsgSentDAO") + private MjonMsgSentDAO mjonMsgSentDAO; + @Autowired KakaoApiTemplate kakaoApiTemplate; @@ -1067,9 +1074,28 @@ public class KakaoSentController { //String smsTxt = mjonKakaoATResultVO.getSmsTxt(); KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO); + model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo); + + if(StringUtils.isNotEmpty( mjonKakaoATResultVO.getFilePath1() )) { + List fileInfos = new ArrayList<>(); + + + // 확장자 제외한 파일명 + String fileId = FilenameUtils.getBaseName(mjonKakaoATResultVO.getFilePath1()); + + // 파일 정보 조회 + MjonMsgSentVO info = mjonMsgSentDAO.selectFileInfo(fileId); + + // FileInfo 객체 생성 및 추가 + FileInfoVO fileInfo = new FileInfoVO(); + fileInfo.setAtchFileId(info.getAtchFileId()); + fileInfo.setFileSn(info.getFileSn()); + + fileInfos.add(fileInfo); + model.addAttribute("fileInfos", fileInfos); + } //kakaoTemplateInfo.setTemplateContent(smsTxt); - model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo); }else { diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index f0d64209..7d65c091 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -925,8 +925,9 @@ , MD.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData /* 대체 문자 (치환O) */ , MGD.BIZ_KAKAO_RESEND_ORGNL_TXT as bizKakaoResendOrgnlTxt /* 대체 문자( 치환X ) */ , MD.BIZ_KAKAO_JSON_FILE as bizKakaoJsonFile /* Json 파일 경로 */ - , BA.CONTENTS as contents - , MGD.AD_FLAG as adFlag + , BA.CONTENTS as contents + , MGD.AD_FLAG as adFlag + , MD.FILE_PATH1 as filePath1 FROM MJ_MSG_GROUP_DATA MGD INNER JOIN MJ_MSG_DATA MD ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp index 744ba1da..b3a4a308 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp @@ -124,6 +124,15 @@ -->
+ +
+ +
+ &fileSn=" alt="발송된 그림문자 미리보기" style="width: 100%"> +
+
+
+