친구톡 발송결과 대체분자 이미지 추가
This commit is contained in:
parent
5247ad68d7
commit
86d94c545d
@ -2,6 +2,7 @@ package itn.let.kakao.user.sent.web;
|
|||||||
|
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
|
|
||||||
|
import org.apache.commons.io.FilenameUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import itn.com.cmm.util.DateUtils;
|
import itn.com.cmm.util.DateUtils;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
@ -38,6 +39,7 @@ import itn.com.cmm.LoginVO;
|
|||||||
import itn.com.cmm.util.StringUtil;
|
import itn.com.cmm.util.StringUtil;
|
||||||
import itn.com.cmm.util.StringUtil2;
|
import itn.com.cmm.util.StringUtil2;
|
||||||
import itn.com.utl.fcc.service.EgovStringUtil;
|
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.admin.kakaoAt.service.MjonKakaoATVO;
|
||||||
import itn.let.kakao.kakaoComm.KakaoButtonVO;
|
import itn.let.kakao.kakaoComm.KakaoButtonVO;
|
||||||
import itn.let.kakao.kakaoComm.KakaoReturnVO;
|
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.KakaoSentDetailVO;
|
||||||
import itn.let.kakao.user.sent.service.KakaoSentService;
|
import itn.let.kakao.user.sent.service.KakaoSentService;
|
||||||
import itn.let.kakao.user.sent.service.KakaoSentVO;
|
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;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@ -55,6 +59,9 @@ public class KakaoSentController {
|
|||||||
@Resource(name = "KakaoSentService")
|
@Resource(name = "KakaoSentService")
|
||||||
private KakaoSentService kakaoSentService;
|
private KakaoSentService kakaoSentService;
|
||||||
|
|
||||||
|
@Resource(name="MjonMsgSentDAO")
|
||||||
|
private MjonMsgSentDAO mjonMsgSentDAO;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
KakaoApiTemplate kakaoApiTemplate;
|
KakaoApiTemplate kakaoApiTemplate;
|
||||||
|
|
||||||
@ -1067,9 +1074,28 @@ public class KakaoSentController {
|
|||||||
//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
|
//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
|
||||||
|
|
||||||
KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
|
KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
|
||||||
|
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
|
||||||
|
|
||||||
|
if(StringUtils.isNotEmpty( mjonKakaoATResultVO.getFilePath1() )) {
|
||||||
|
List<FileInfoVO> 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);
|
//kakaoTemplateInfo.setTemplateContent(smsTxt);
|
||||||
|
|
||||||
model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
|
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
|
|
||||||
|
|||||||
@ -925,8 +925,9 @@
|
|||||||
, MD.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData /* 대체 문자 (치환O) */
|
, MD.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData /* 대체 문자 (치환O) */
|
||||||
, MGD.BIZ_KAKAO_RESEND_ORGNL_TXT as bizKakaoResendOrgnlTxt /* 대체 문자( 치환X ) */
|
, MGD.BIZ_KAKAO_RESEND_ORGNL_TXT as bizKakaoResendOrgnlTxt /* 대체 문자( 치환X ) */
|
||||||
, MD.BIZ_KAKAO_JSON_FILE as bizKakaoJsonFile /* Json 파일 경로 */
|
, MD.BIZ_KAKAO_JSON_FILE as bizKakaoJsonFile /* Json 파일 경로 */
|
||||||
, BA.CONTENTS as contents
|
, BA.CONTENTS as contents
|
||||||
, MGD.AD_FLAG as adFlag
|
, MGD.AD_FLAG as adFlag
|
||||||
|
, MD.FILE_PATH1 as filePath1
|
||||||
FROM MJ_MSG_GROUP_DATA MGD
|
FROM MJ_MSG_GROUP_DATA MGD
|
||||||
INNER JOIN MJ_MSG_DATA MD
|
INNER JOIN MJ_MSG_DATA MD
|
||||||
ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID
|
ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID
|
||||||
|
|||||||
@ -124,6 +124,15 @@
|
|||||||
</div> -->
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
<div class="text_preview">
|
<div class="text_preview">
|
||||||
|
<c:if test="${not empty fileInfos}">
|
||||||
|
<div class="preiew_img">
|
||||||
|
<c:forEach var="fileInfo" items="${fileInfos}">
|
||||||
|
<div class="img_box">
|
||||||
|
<img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${fileInfo.atchFileId}"/>&fileSn=<c:out value="${fileInfo.fileSn}"/>" alt="발송된 그림문자 미리보기" style="width: 100%">
|
||||||
|
</div>
|
||||||
|
</c:forEach>
|
||||||
|
</div>
|
||||||
|
</c:if>
|
||||||
<div class="preview_auto">
|
<div class="preview_auto">
|
||||||
|
|
||||||
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user