Commit @86d94c545d18f653fdbb36b8d92558babd474373

이호영 2025-07-28

친구톡 발송결과 대체분자 이미지 추가

@86d94c545d18f653fdbb36b8d92558babd474373

5247ad6

86d94c5

src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java


 
 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;

 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;

 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

 	@Resource(name = "KakaoSentService")
 	private KakaoSentService kakaoSentService;
 
+	@Resource(name="MjonMsgSentDAO")
+	private MjonMsgSentDAO mjonMsgSentDAO;
+	
 	@Autowired
 	KakaoApiTemplate kakaoApiTemplate;
 	

 				//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
 				
 				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);
 				
-				model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
 				
 			}else {
 				

5247ad6

86d94c5

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml


 			, 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

5247ad6

86d94c5

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp


 						</div> -->
 					</div>
 	                <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">
 	                    
 							<c:if test="${resultMsgDetail.adFlag eq 'Y'}">

Add a comment

Open 0
Closed 0

List

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import java.io.FileReader;
4	4
	5	+import org.apache.commons.io.FilenameUtils;
5	6	import org.apache.commons.lang3.StringUtils;
6	7	import itn.com.cmm.util.DateUtils;
7	8	import java.text.SimpleDateFormat;
...	...	@@ -38,6 +39,7 @@
38	39	import itn.com.cmm.util.StringUtil;
39	40	import itn.com.cmm.util.StringUtil2;
40	41	import itn.com.utl.fcc.service.EgovStringUtil;
	42	+import itn.let.cmm.vo.FileInfoVO;
41	43	import itn.let.kakao.admin.kakaoAt.service.MjonKakaoATVO;
42	44	import itn.let.kakao.kakaoComm.KakaoButtonVO;
43	45	import itn.let.kakao.kakaoComm.KakaoReturnVO;
...	...	@@ -46,6 +48,8 @@
46	48	import itn.let.kakao.user.sent.service.KakaoSentDetailVO;
47	49	import itn.let.kakao.user.sent.service.KakaoSentService;
48	50	import itn.let.kakao.user.sent.service.KakaoSentVO;
	51	+import itn.let.mjo.msgsent.service.MjonMsgSentVO;
	52	+import itn.let.mjo.msgsent.service.impl.MjonMsgSentDAO;
49	53	import lombok.extern.slf4j.Slf4j;
50	54
51	55	@Slf4j
...	...	@@ -55,6 +59,9 @@
55	59	@Resource(name = "KakaoSentService")
56	60	private KakaoSentService kakaoSentService;
57	61
	62	+ @Resource(name="MjonMsgSentDAO")
	63	+ private MjonMsgSentDAO mjonMsgSentDAO;
	64	+
58	65	@Autowired
59	66	KakaoApiTemplate kakaoApiTemplate;
60	67
...	...	@@ -1067,9 +1074,28 @@
1067	1074	//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
1068	1075
1069	1076	KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
	1077	+ model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
	1078	+
	1079	+ if(StringUtils.isNotEmpty( mjonKakaoATResultVO.getFilePath1() )) {
	1080	+ List<FileInfoVO> fileInfos = new ArrayList<>();
	1081	+
	1082	+
	1083	+ // 확장자 제외한 파일명
	1084	+ String fileId = FilenameUtils.getBaseName(mjonKakaoATResultVO.getFilePath1());
	1085	+
	1086	+ // 파일 정보 조회
	1087	+ MjonMsgSentVO info = mjonMsgSentDAO.selectFileInfo(fileId);
	1088	+
	1089	+ // FileInfo 객체 생성 및 추가
	1090	+ FileInfoVO fileInfo = new FileInfoVO();
	1091	+ fileInfo.setAtchFileId(info.getAtchFileId());
	1092	+ fileInfo.setFileSn(info.getFileSn());
	1093	+
	1094	+ fileInfos.add(fileInfo);
	1095	+ model.addAttribute("fileInfos", fileInfos);
	1096	+ }
1070	1097	//kakaoTemplateInfo.setTemplateContent(smsTxt);
1071	1098
1072		- model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
1073	1099
1074	1100	}else {
1075	1101

...	...	@@ -925,8 +925,9 @@
925	925	, MD.BIZ_KAKAO_RESEND_DATA as bizKakaoResendData /* 대체 문자 (치환O) */
926	926	, MGD.BIZ_KAKAO_RESEND_ORGNL_TXT as bizKakaoResendOrgnlTxt /* 대체 문자( 치환X ) */
927	927	, MD.BIZ_KAKAO_JSON_FILE as bizKakaoJsonFile /* Json 파일 경로 */
928		- , BA.CONTENTS as contents
929		- , MGD.AD_FLAG as adFlag
	928	+ , BA.CONTENTS as contents
	929	+ , MGD.AD_FLAG as adFlag
	930	+ , MD.FILE_PATH1 as filePath1
930	931	FROM MJ_MSG_GROUP_DATA MGD
931	932	INNER JOIN MJ_MSG_DATA MD
932	933	ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID

...	...	@@ -124,6 +124,15 @@
124	124	</div> -->
125	125	</div>
126	126	<div class="text_preview">
	127	+ <c:if test="${not empty fileInfos}">
	128	+ <div class="preiew_img">
	129	+ <c:forEach var="fileInfo" items="${fileInfos}">
	130	+ <div class="img_box">
	131	+ <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%">
	132	+ </div>
	133	+ </c:forEach>
	134	+ </div>
	135	+ </c:if>
127	136	<div class="preview_auto">
128	137
129	138	<c:if test="${resultMsgDetail.adFlag eq 'Y'}">

Delete comment