Commit @d730bdd76eb1f5bfe772124c1eb27c729ffab955

이호영 2025-04-25

친구톡 발송속도 및 발송결과

@d730bdd76eb1f5bfe772124c1eb27c729ffab955

81d31fc

d730bdd

src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATVO.java

--- src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATVO.java

+++ src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATVO.java


 import java.util.List;
 
 import itn.com.cmm.ComDefaultVO;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class MjonKakaoATVO extends ComDefaultVO{
 	
 	private static final long serialVersionUID = 1L;

 	private String  msgKind; // '문자 종류 일반:N, 광고:A, 선거:C',
 	private String  msgPayCode; // '재전송 기능에 의한 최종전송콘텐트 종류 저장',
 	private String  contSeq; // COMMENT 'MMS의 콘텐츠 Key(MMS_CONTENTS_INFO의 CONT_SEQ)',
+	private String  contents; // BIZ_ATTACHMENTS -> COMMENT 
 	private String  msgTypeResend; // '재전송할 문자 타입. 값이 있으면 재전송. 없으면 단 건 전송',
 	private String  centerSeqResend; // '재전송할 센터. NPro 내부적으로 사용함.',
 	private String  msgNoticetalkSenderKey; // '카카오 알림톡에 등록된 사용자 고유키',

 	private String yellowId;
 	private String bizKakaoResendTypeCnt;
 	
-	public String getMsgDiv() {
-		return msgDiv;
-	}
-	public void setMsgDiv(String msgDiv) {
-		this.msgDiv = msgDiv;
-	}
-	public Float getAgentPrice() {
-		return agentPrice;
-	}
-	public void setAgentPrice(Float agentPrice) {
-		this.agentPrice = agentPrice;
-	}
 	private String registPnttm;	//통계등록일시
 	
-	public String getNowDate() {
-		return nowDate;
-	}
-	public void setNowDate(String nowDate) {
-		this.nowDate = nowDate;
-	}
-	public String getTodayYn() {
-		return todayYn;
-	}
-	public void setTodayYn(String todayYn) {
-		this.todayYn = todayYn;
-	}
-	public String getReserveType() {
-		return reserveType;
-	}
-	public void setReserveType(String reserveType) {
-		this.reserveType = reserveType;
-	}
-	public String getAtchFiles() {
-		return atchFiles;
-	}
-	public void setAtchFiles(String atchFiles) {
-		this.atchFiles = atchFiles;
-	}
-	public String getApprovalPnttm() {
-		return approvalPnttm;
-	}
-	public void setApprovalPnttm(String approvalPnttm) {
-		this.approvalPnttm = approvalPnttm;
-	}
-	public String getPayCnt() {
-		return payCnt;
-	}
-	public void setPayCnt(String payCnt) {
-		this.payCnt = payCnt;
-	}
-	public String getPayPct() {
-		return payPct;
-	}
-	public void setPayPct(String payPct) {
-		this.payPct = payPct;
-	}
-	public String getAdminSmsNoticeYn() {
-		return adminSmsNoticeYn;
-	}
-	public void setAdminSmsNoticeYn(String adminSmsNoticeYn) {
-		this.adminSmsNoticeYn = adminSmsNoticeYn;
-	}
-	
-	public String getSearchAdminSmsNoticeYn() {
-		return searchAdminSmsNoticeYn;
-	}
-	public void setSearchAdminSmsNoticeYn(String searchAdminSmsNoticeYn) {
-		this.searchAdminSmsNoticeYn = searchAdminSmsNoticeYn;
-	}
-	
-	public String getMaxRegDate() {
-		return maxRegDate;
-	}
-	public void setMaxRegDate(String maxRegDate) {
-		this.maxRegDate = maxRegDate;
-	}
-	public String getMinRegDate() {
-		return minRegDate;
-	}
-	public void setMinRegDate(String minRegDate) {
-		this.minRegDate = minRegDate;
-	}
 
 
 	private String resultCode;	//문자 결과 코드 정보

 	
 	private int totalCallCnt;	//수신자 전체 갯
 
-	public String getUserCallbackYn() {
-		return userCallbackYn;
-	}
-	public void setUserCallbackYn(String userCallbackYn) {
-		this.userCallbackYn = userCallbackYn;
-	}
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-	public String getCallbackYn() {
-		return callbackYn;
-	}
-	public void setCallbackYn(String callbackYn) {
-		this.callbackYn = callbackYn;
-	}
-
-	public int getCallRejectionCount() {
-		return callRejectionCount;
-	}
-	public void setCallRejectionCount(int callRejectionCount) {
-		this.callRejectionCount = callRejectionCount;
-	}
-	public int getSuccessCount() {
-		return successCount;
-	}
-	public void setSuccessCount(int successCount) {
-		this.successCount = successCount;
-	}
-
-
 	private int regCount;
-	public int getRegCount() {
-		return regCount;
-	}
-	public void setRegCount(int regCount) {
-		this.regCount = regCount;
-	}
-	public int getRegComCount() {
-		return regComCount;
-	}
-	public void setRegComCount(int regComCount) {
-		this.regComCount = regComCount;
-	}
-
-
 	private int regComCount;
-	
-	public String getAddrGrpId() {
-		return addrGrpId;
-	}
-	public void setAddrGrpId(String addrGrpId) {
-		this.addrGrpId = addrGrpId;
-	}
-	public String getAddrGrpNm() {
-		return addrGrpNm;
-	}
-	public void setAddrGrpNm(String addrGrpNm) {
-		this.addrGrpNm = addrGrpNm;
-	}
-
-	
 	private int orderByCode;		// 문자타입 정렬번호
 	private String detailType;
 	
-	public int getOrderByCode() {
-		return orderByCode;
-	}
-	public void setOrderByCode(int orderByCode) {
-		this.orderByCode = orderByCode;
-	}
-	public String getRegDate() {
-		return regDate;
-	}
-	public void setRegDate(String regDate) {
-		this.regDate = regDate;
-	}
-	public String getMsgId() {
-		return msgId;
-	}
-	public void setMsgId(String msgId) {
-		this.msgId = msgId;
-	}
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-	public String getAgentFlag() {
-		return agentFlag;
-	}
-	public void setAgentFlag(String agentFlag) {
-		this.agentFlag = agentFlag;
-	}
-	public String getUserData() {
-		return userData;
-	}
-	public void setUserData(String userData) {
-		this.userData = userData;
-	}
-	public String getMsgSeq() {
-		return msgSeq;
-	}
-	public void setMsgSeq(String msgSeq) {
-		this.msgSeq = msgSeq;
-	}
-	public String getCurState() {
-		return curState;
-	}
-	public void setCurState(String curState) {
-		this.curState = curState;
-	}
-	public String getSentDate() {
-		return sentDate;
-	}
-	public void setSentDate(String sentDate) {
-		this.sentDate = sentDate;
-	}
-	public String getRsltDate() {
-		return rsltDate;
-	}
-	public void setRsltDate(String rsltDate) {
-		this.rsltDate = rsltDate;
-	}
-	public String getReportDate() {
-		return reportDate;
-	}
-	public void setReportDate(String reportDate) {
-		this.reportDate = reportDate;
-	}
-	public String getReqDate() {
-		return reqDate;
-	}
-	public void setReqDate(String reqDate) {
-		this.reqDate = reqDate;
-	}
-	public String getRsltCode() {
-		return rsltCode;
-	}
-	public void setRsltCode(String rsltCode) {
-		this.rsltCode = rsltCode;
-	}
-	public String getRsltCode2() {
-		return rsltCode2;
-	}
-	public void setRsltCode2(String rsltCode2) {
-		this.rsltCode2 = rsltCode2;
-	}
-	public String getRsltNet() {
-		return rsltNet;
-	}
-	public void setRsltNet(String rsltNet) {
-		this.rsltNet = rsltNet;
-	}
-	public String getCallTo() {
-		return callTo;
-	}
-	public void setCallTo(String callTo) {
-		this.callTo = callTo;
-	}
-	public String getCallFrom() {
-		return callFrom;
-	}
-	public void setCallFrom(String callFrom) {
-		this.callFrom = callFrom;
-	}
-	public String getSmsTxt() {
-		return smsTxt;
-	}
-	public void setSmsTxt(String smsTxt) {
-		this.smsTxt = smsTxt;
-	}
-	public String getSmsTxtArea() {
-		return smsTxtArea;
-	}
-	public void setSmsTxtArea(String smsTxtArea) {
-		this.smsTxtArea = smsTxtArea;
-	}
-	public String getMsgType() {
-		return msgType;
-	}
-	public void setMsgType(String msgType) {
-		this.msgType = msgType;
-	}
-	public String getMsgKind() {
-		return msgKind;
-	}
-	public void setMsgKind(String msgKind) {
-		this.msgKind = msgKind;
-	}
-	public String getMsgPayCode() {
-		return msgPayCode;
-	}
-	public void setMsgPayCode(String msgPayCode) {
-		this.msgPayCode = msgPayCode;
-	}
-	public String getContSeq() {
-		return contSeq;
-	}
-	public void setContSeq(String contSeq) {
-		this.contSeq = contSeq;
-	}
-	public String getMsgTypeResend() {
-		return msgTypeResend;
-	}
-	public void setMsgTypeResend(String msgTypeResend) {
-		this.msgTypeResend = msgTypeResend;
-	}
-	public String getCenterSeqResend() {
-		return centerSeqResend;
-	}
-	public void setCenterSeqResend(String centerSeqResend) {
-		this.centerSeqResend = centerSeqResend;
-	}
-	public String getMsgNoticetalkSenderKey() {
-		return msgNoticetalkSenderKey;
-	}
-	public void setMsgNoticetalkSenderKey(String msgNoticetalkSenderKey) {
-		this.msgNoticetalkSenderKey = msgNoticetalkSenderKey;
-	}
-	public String getMsgNoticetalkTmpKey() {
-		return msgNoticetalkTmpKey;
-	}
-	public void setMsgNoticetalkTmpKey(String msgNoticetalkTmpKey) {
-		this.msgNoticetalkTmpKey = msgNoticetalkTmpKey;
-	}
-	public String getMsgResendCount() {
-		return msgResendCount;
-	}
-	public void setMsgResendCount(String msgResendCount) {
-		this.msgResendCount = msgResendCount;
-	}
-	public String getMsgResenddate() {
-		return msgResenddate;
-	}
-	public void setMsgResenddate(String msgResenddate) {
-		this.msgResenddate = msgResenddate;
-	}
-	public String getSentDatePre() {
-		return sentDatePre;
-	}
-	public void setSentDatePre(String sentDatePre) {
-		this.sentDatePre = sentDatePre;
-	}
-	public String getRsltDatePre() {
-		return rsltDatePre;
-	}
-	public void setRsltDatePre(String rsltDatePre) {
-		this.rsltDatePre = rsltDatePre;
-	}
-	public String getReportDatePre() {
-		return reportDatePre;
-	}
-	public void setReportDatePre(String reportDatePre) {
-		this.reportDatePre = reportDatePre;
-	}
-	public String getRsltCodePre() {
-		return rsltCodePre;
-	}
-	public void setRsltCodePre(String rsltCodePre) {
-		this.rsltCodePre = rsltCodePre;
-	}
-	public String getRsltCode2Pre() {
-		return rsltCode2Pre;
-	}
-	public void setRsltCode2Pre(String rsltCode2Pre) {
-		this.rsltCode2Pre = rsltCode2Pre;
-	}
-	public String getRsltNetPre() {
-		return rsltNetPre;
-	}
-	public void setRsltNetPre(String rsltNetPre) {
-		this.rsltNetPre = rsltNetPre;
-	}
-	public String getConectMthd() {
-		return conectMthd;
-	}
-	public void setConectMthd(String conectMthd) {
-		this.conectMthd = conectMthd;
-	}
-
-	public String getAgentCode() {
-		return agentCode;
-	}
-	public void setAgentCode(String agentCode) {
-		this.agentCode = agentCode;
-	}
-	public String getConectMthdTxt() {
-		return conectMthdTxt;
-	}
-	public void setConectMthdTxt(String conectMthdTxt) {
-		this.conectMthdTxt = conectMthdTxt;
-	}
-	public String getAgentCodeTxt() {
-		return agentCodeTxt;
-	}
-	public void setAgentCodeTxt(String agentCodeTxt) {
-		this.agentCodeTxt = agentCodeTxt;
-	}
-	public String getCurStateTxt() {
-		return curStateTxt;
-	}
-	public void setCurStateTxt(String curStateTxt) {
-		this.curStateTxt = curStateTxt;
-	}
-	public String getMsgTypeTxt() {
-		return msgTypeTxt;
-	}
-	public void setMsgTypeTxt(String msgTypeTxt) {
-		this.msgTypeTxt = msgTypeTxt;
-	}
-	public String getSentDateTxt() {
-		return sentDateTxt;
-	}
-	public void setSentDateTxt(String sentDateTxt) {
-		this.sentDateTxt = sentDateTxt;
-	}
-	public String getSearchCondition2() {
-		return searchCondition2;
-	}
-	public void setSearchCondition2(String searchCondition2) {
-		this.searchCondition2 = searchCondition2;
-	}
-	public String getDelFlag() {
-		return delFlag;
-	}
-	public void setDelFlag(String delFlag) {
-		this.delFlag = delFlag;
-	}
-	public String getDelFlagTxt() {
-		return delFlagTxt;
-	}
-	public void setDelFlagTxt(String delFlagTxt) {
-		this.delFlagTxt = delFlagTxt;
-	}
-	public String getSearchCondition3() {
-		return searchCondition3;
-	}
-	public void setSearchCondition3(String searchCondition3) {
-		this.searchCondition3 = searchCondition3;
-	}
-	public String getSearchCondition4() {
-		return searchCondition4;
-	}
-	public void setSearchCondition4(String searchCondition4) {
-		this.searchCondition4 = searchCondition4;
-	}
-	public String getMmsSubject() {
-		return mmsSubject;
-	}
-	public void setMmsSubject(String mmsSubject) {
-		this.mmsSubject = mmsSubject;
-	}
-	public String getFileCnt() {
-		return fileCnt;
-	}
-	public void setFileCnt(String fileCnt) {
-		this.fileCnt = fileCnt;
-	}
-	public String getFileType1() {
-		return fileType1;
-	}
-	public void setFileType1(String fileType1) {
-		this.fileType1 = fileType1;
-	}
-	public String getFileName1() {
-		return fileName1;
-	}
-	public void setFileName1(String fileName1) {
-		this.fileName1 = fileName1;
-	}
-	public String getFileType2() {
-		return fileType2;
-	}
-	public void setFileType2(String fileType2) {
-		this.fileType2 = fileType2;
-	}
-	public String getFileName2() {
-		return fileName2;
-	}
-	public void setFileName2(String fileName2) {
-		this.fileName2 = fileName2;
-	}
-	public String getFileType3() {
-		return fileType3;
-	}
-	public void setFileType3(String fileType3) {
-		this.fileType3 = fileType3;
-	}
-	public String getFileName3() {
-		return fileName3;
-	}
-	public void setFileName3(String fileName3) {
-		this.fileName3 = fileName3;
-	}
-	public String getSubject() {
-		return subject;
-	}
-	public void setSubject(String subject) {
-		this.subject = subject;
-	}
-	public String getMsgGroupId() {
-		return msgGroupId;
-	}
-	public void setMsgGroupId(String msgGroupId) {
-		this.msgGroupId = msgGroupId;
-	}
-	public String getMsgGroupCnt() {
-		return msgGroupCnt;
-	}
-	public void setMsgGroupCnt(String msgGroupCnt) {
-		this.msgGroupCnt = msgGroupCnt;
-	}
-	public String[] getCallToList() {
-		return callToList;
-	}
-	public void setCallToList(String[] strings) {
-		this.callToList = strings;
-	}
-	public String[] getImgFilePath() {
-		return imgFilePath;
-	}
-	public void setImgFilePath(String[] imgFilePath) {
-		this.imgFilePath = imgFilePath;
-	}
-	public String getNeoType() {
-		return neoType;
-	}
-	public void setNeoType(String neoType) {
-		this.neoType = neoType;
-	}
-	public int getMsgCnt() {
-		return msgCnt;
-	}
-	public void setMsgCnt(int msgCnt) {
-		this.msgCnt = msgCnt;
-	}
-	public String getSearchCondition5() {
-		return searchCondition5;
-	}
-	public void setSearchCondition5(String searchCondition5) {
-		this.searchCondition5 = searchCondition5;
-	}
-	public String getNtceBgnde() {
-		return ntceBgnde;
-	}
-	public void setNtceBgnde(String ntceBgnde) {
-		this.ntceBgnde = ntceBgnde;
-	}
-	public String getEachPrice() {
-		return eachPrice;
-	}
-	public void setEachPrice(String eachPrice) {
-		this.eachPrice = eachPrice;
-	}
-	public String getTotPrice() {
-		return totPrice;
-	}
-	public void setTotPrice(String totPrice) {
-		this.totPrice = totPrice;
-	}
-	public String getBeforeUrl() {
-		return beforeUrl;
-	}
-	public void setBeforeUrl(String beforeUrl) {
-		this.beforeUrl = beforeUrl;
-	}
-	public String getReserveYn() {
-		return reserveYn;
-	}
-	public void setReserveYn(String reserveYn) {
-		this.reserveYn = reserveYn;
-	}
-	public String getReserveCYn() {
-		return reserveCYn;
-	}
-	public void setReserveCYn(String reserveCYn) {
-		this.reserveCYn = reserveCYn;
-	}
-	public String getCancelDate() {
-		return cancelDate;
-	}
-	public void setCancelDate(String cancelDate) {
-		this.cancelDate = cancelDate;
-	}
-	public String[] getImgFileId() {
-		return imgFileId;
-	}
-	public void setImgFileId(String[] imgFileId) {
-		this.imgFileId = imgFileId;
-	}
-	public String[] getTemplateYn() {
-		return templateYn;
-	}
-	public void setTemplateYn(String[] templateYn) {
-		this.templateYn = templateYn;
-	}
-	public String getNtceEndde() {
-		return ntceEndde;
-	}
-	public void setNtceEndde(String ntceEndde) {
-		this.ntceEndde = ntceEndde;
-	}
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	public String getSendRate() {
-		return sendRate;
-	}
-	public void setSendRate(String sendRate) {
-		this.sendRate = sendRate;
-	}
-	public float getSendRateInfo() {
-		return sendRateInfo;
-	}
-	public void setSendRateInfo(float sendRateInfo) {
-		this.sendRateInfo = sendRateInfo;
-	}
-	public String getDivideChk() {
-		return divideChk;
-	}
-	public void setDivideChk(String divideChk) {
-		this.divideChk = divideChk;
-	}
-	public String getDivideCnt() {
-		return divideCnt;
-	}
-	public void setDivideCnt(String divideCnt) {
-		this.divideCnt = divideCnt;
-	}
-	public String getDivideTime() {
-		return divideTime;
-	}
-	public void setDivideTime(String divideTime) {
-		this.divideTime = divideTime;
-	}
-	public String getBefCash() {
-		return befCash;
-	}
-	public void setBefCash(String befCash) {
-		this.befCash = befCash;
-	}
-	public String getRecommId() {
-		return recommId;
-	}
-	public void setRecommId(String recommId) {
-		this.recommId = recommId;
-	}
-	public String getBefPoint() {
-		return befPoint;
-	}
-	public void setBefPoint(String befPoint) {
-		this.befPoint = befPoint;
-	}
-	public String[] getNameList() {
-		return nameList;
-	}
-	public void setNameList(String[] nameList) {
-		this.nameList = nameList;
-	}
-	public String[] getRep1List() {
-		return rep1List;
-	}
-	public void setRep1List(String[] rep1List) {
-		this.rep1List = rep1List;
-	}
-	public String[] getRep2List() {
-		return rep2List;
-	}
-	public void setRep2List(String[] rep2List) {
-		this.rep2List = rep2List;
-	}
-	public String[] getRep3List() {
-		return rep3List;
-	}
-	public void setRep3List(String[] rep3List) {
-		this.rep3List = rep3List;
-	}
-	public String[] getRep4List() {
-		return rep4List;
-	}
-	public void setRep4List(String[] rep4List) {
-		this.rep4List = rep4List;
-	}
-	public String getThisPoint() {
-		return thisPoint;
-	}
-	public void setThisPoint(String thisPoint) {
-		this.thisPoint = thisPoint;
-	}
-	public String getEndDate() {
-		return endDate;
-	}
-	public void setEndDate(String endDate) {
-		this.endDate = endDate;
-	}
-	public String getStartDate() {
-		return startDate;
-	}
-	public void setStartDate(String startDate) {
-		this.startDate = startDate;
-	}
-	public int getPhoneNumberCnt() {
-		return phoneNumberCnt;
-	}
-	public void setPhoneNumberCnt(int phoneNumberCnt) {
-		this.phoneNumberCnt = phoneNumberCnt;
-	}
-	public String getPhmAuthType() {
-		return phmAuthType;
-	}
-	public void setPhmAuthType(String phmAuthType) {
-		this.phmAuthType = phmAuthType;
-	}
-	public String getRefundYn() {
-		return refundYn;
-	}
-	public void setRefundYn(String refundYn) {
-		this.refundYn = refundYn;
-	}
-	public String getFilePath1() {
-		return filePath1;
-	}
-	public void setFilePath1(String filePath1) {
-		this.filePath1 = filePath1;
-	}
-	public String getFilePath2() {
-		return filePath2;
-	}
-	public void setFilePath2(String filePath2) {
-		this.filePath2 = filePath2;
-	}
-	public String getFilePath3() {
-		return filePath3;
-	}
-	public void setFilePath3(String filePath3) {
-		this.filePath3 = filePath3;
-	}
-	public String getResultCodeTxt() {
-		return resultCodeTxt;
-	}
-	public void setResultCodeTxt(String resultCodeTxt) {
-		this.resultCodeTxt = resultCodeTxt;
-	}
-	public String getTxtReplYn() {
-		return txtReplYn;
-	}
-	public void setTxtReplYn(String txtReplYn) {
-		this.txtReplYn = txtReplYn;
-	}
-	public String getsPrice() {
-		return sPrice;
-	}
-	public void setsPrice(String sPrice) {
-		this.sPrice = sPrice;
-	}
-	public String getmPrice() {
-		return mPrice;
-	}
-	public void setmPrice(String mPrice) {
-		this.mPrice = mPrice;
-	}
-	public String getpPrice() {
-		return pPrice;
-	}
-	public void setpPrice(String pPrice) {
-		this.pPrice = pPrice;
-	}
-	public String getP2Price() {
-		return p2Price;
-	}
-	public void setP2Price(String p2Price) {
-		this.p2Price = p2Price;
-	}
-	public String getP3Price() {
-		return p3Price;
-	}
-	public void setP3Price(String p3Price) {
-		this.p3Price = p3Price;
-	}
-	public String getShortMsgCnt() {
-		return shortMsgCnt;
-	}
-	public void setShortMsgCnt(String shortMsgCnt) {
-		this.shortMsgCnt = shortMsgCnt;
-	}
-	public String getLongMsgCnt() {
-		return longMsgCnt;
-	}
-	public void setLongMsgCnt(String longMsgCnt) {
-		this.longMsgCnt = longMsgCnt;
-	}
-	public String getAtchFileId1() {
-		return atchFileId1;
-	}
-	public void setAtchFileId1(String atchFileId1) {
-		this.atchFileId1 = atchFileId1;
-	}
-	public String getAtchFileId2() {
-		return atchFileId2;
-	}
-	public void setAtchFileId2(String atchFileId2) {
-		this.atchFileId2 = atchFileId2;
-	}
-	public String getAtchFileId3() {
-		return atchFileId3;
-	}
-	public void setAtchFileId3(String atchFileId3) {
-		this.atchFileId3 = atchFileId3;
-	}
-	public String getAtchFileSn1() {
-		return atchFileSn1;
-	}
-	public void setAtchFileSn1(String atchFileSn1) {
-		this.atchFileSn1 = atchFileSn1;
-	}
-	public String getAtchFileSn2() {
-		return atchFileSn2;
-	}
-	public void setAtchFileSn2(String atchFileSn2) {
-		this.atchFileSn2 = atchFileSn2;
-	}
-	public String getAtchFileSn3() {
-		return atchFileSn3;
-	}
-	public void setAtchFileSn3(String atchFileSn3) {
-		this.atchFileSn3 = atchFileSn3;
-	}
-	
-	public String getMsgTypeName() {
-		return msgTypeName;
-	}
-	public void setMsgTypeName(String msgTypeName) {
-		this.msgTypeName = msgTypeName;
-	}
-	public int getSendCount() {
-		return sendCount;
-	}
-	public void setSendCount(int sendCount) {
-		this.sendCount = sendCount;
-	}
-	public double getSupplyPrice() {
-		return supplyPrice;
-	}
-	public void setSupplyPrice(double supplyPrice) {
-		this.supplyPrice = supplyPrice;
-	}
-	public double getVatPrice() {
-		return vatPrice;
-	}
-	public void setVatPrice(double vatPrice) {
-		this.vatPrice = vatPrice;
-	}
-	public double getTotalPrice() {
-		return totalPrice;
-	}
-	public void setTotalPrice(double totalPrice) {
-		this.totalPrice = totalPrice;
-	}
-	public String getDetailType() {
-		return detailType;
-	}
-	public void setDetailType(String detailType) {
-		this.detailType = detailType;
-	}
-	public String getMsgGroupSCnt() {
-		return msgGroupSCnt;
-	}
-	public void setMsgGroupSCnt(String msgGroupSCnt) {
-		this.msgGroupSCnt = msgGroupSCnt;
-	}
-	public String getMsgGroupFWCnt() {
-		return MsgGroupFWCnt;
-	}
-	public void setMsgGroupFWCnt(String msgGroupFWCnt) {
-		MsgGroupFWCnt = msgGroupFWCnt;
-	}
-	public String getTotSPrice() {
-		return totSPrice;
-	}
-	public void setTotSPrice(String totSPrice) {
-		this.totSPrice = totSPrice;
-	}
-	public String getTotFWPrice() {
-		return totFWPrice;
-	}
-	public void setTotFWPrice(String totFWPrice) {
-		this.totFWPrice = totFWPrice;
-	}
-	public String getMsgGroupSCntSum() {
-		return msgGroupSCntSum;
-	}
-	public void setMsgGroupSCntSum(String msgGroupSCntSum) {
-		this.msgGroupSCntSum = msgGroupSCntSum;
-	}
-	public String getMsgGroupFWCntSum() {
-		return MsgGroupFWCntSum;
-	}
-	public void setMsgGroupFWCntSum(String msgGroupFWCntSum) {
-		MsgGroupFWCntSum = msgGroupFWCntSum;
-	}
-	public String getTotSPriceSum() {
-		return totSPriceSum;
-	}
-	public void setTotSPriceSum(String totSPriceSum) {
-		this.totSPriceSum = totSPriceSum;
-	}
-	public String getTotFWPriceSum() {
-		return totFWPriceSum;
-	}
-	public void setTotFWPriceSum(String totFWPriceSum) {
-		this.totFWPriceSum = totFWPriceSum;
-	}
-	public String getSmiId() {
-		return smiId;
-	}
-	public void setSmiId(String smiId) {
-		this.smiId = smiId;
-	}
-	public List<String> getDividDay() {
-		return dividDay;
-	}
-	public void setDividDay(List<String> dividDay) {
-		this.dividDay = dividDay;
-	}
-	public String getUserNm() {
-		return userNm;
-	}
-	public void setUserNm(String userNm) {
-		this.userNm = userNm;
-	}
-	public String getMbtlnum() {
-		return mbtlnum;
-	}
-	public void setMbtlnum(String mbtlnum) {
-		this.mbtlnum = mbtlnum;
-	}
-	public String getEmailAdres() {
-		return emailAdres;
-	}
-	public void setEmailAdres(String emailAdres) {
-		this.emailAdres = emailAdres;
-	}
-	public String getAuthorCode() {
-		return authorCode;
-	}
-	public void setAuthorCode(String authorCode) {
-		this.authorCode = authorCode;
-	}
-	public String getResultLogUpdtPnttm() {
-		return resultLogUpdtPnttm;
-	}
-	public void setResultLogUpdtPnttm(String resultLogUpdtPnttm) {
-		this.resultLogUpdtPnttm = resultLogUpdtPnttm;
-	}
-	public String getRepAgent() {
-		return repAgent;
-	}
-	public void setRepAgent(String repAgent) {
-		this.repAgent = repAgent;
-	}
-	public String getEventYn() {
-		return eventYn;
-	}
-	public void setEventYn(String eventYn) {
-		this.eventYn = eventYn;
-	}
-
-	public String getSpamKeyword() {
-		return spamKeyword;
-	}
-	public void setSpamKeyword(String spamKeyword) {
-		this.spamKeyword = spamKeyword;
-	}
-	public String getSpamMsgGroupId() {
-		return spamMsgGroupId;
-	}
-	public void setSpamMsgGroupId(String spamMsgGroupId) {
-		this.spamMsgGroupId = spamMsgGroupId;
-	}
-	public String getSpamStatus() {
-		return spamStatus;
-	}
-	public void setSpamStatus(String spamStatus) {
-		this.spamStatus = spamStatus;
-	}
-
-	public String getSmishingYn() {
-		return smishingYn;
-	}
-	public void setSmishingYn(String smishingYn) {
-		this.smishingYn = smishingYn;
-	}
-	public int getTotalCallCnt() {
-		return totalCallCnt;
-	}
-	public void setTotalCallCnt(int totalCallCnt) {
-		this.totalCallCnt = totalCallCnt;
-	}
-	public String getDelayYn() {
-		return delayYn;
-	}
-	public void setDelayYn(String delayYn) {
-		this.delayYn = delayYn;
-	}
-	public String getDelayCompleteYn() {
-		return delayCompleteYn;
-	}
-	public void setDelayCompleteYn(String delayCompleteYn) {
-		this.delayCompleteYn = delayCompleteYn;
-	}
-	public String getVipYn() {
-		return vipYn;
-	}
-	public void setVipYn(String vipYn) {
-		this.vipYn = vipYn;
-	}
-	public String getResultCode() {
-		return resultCode;
-	}
-	public void setResultCode(String resultCode) {
-		this.resultCode = resultCode;
-	}
-	public String getResultCode2() {
-		return resultCode2;
-	}
-	public void setResultCode2(String resultCode2) {
-		this.resultCode2 = resultCode2;
-	}
-	public String getRegistPnttm() {
-		return registPnttm;
-	}
-	public void setRegistPnttm(String registPnttm) {
-		this.registPnttm = registPnttm;
-	}
-	public String getBizKakaoResendData() {
-		return bizKakaoResendData;
-	}
-	public void setBizKakaoResendData(String bizKakaoResendData) {
-		this.bizKakaoResendData = bizKakaoResendData;
-	}
-	public String getBizKakaoTitle() {
-		return bizKakaoTitle;
-	}
-	public void setBizKakaoTitle(String bizKakaoTitle) {
-		this.bizKakaoTitle = bizKakaoTitle;
-	}
-	public String getSmsTxtTrans() {
-		return smsTxtTrans;
-	}
-	public void setSmsTxtTrans(String smsTxtTrans) {
-		this.smsTxtTrans = smsTxtTrans;
-	}
-	public String getBizKakaoTitle01() {
-		return bizKakaoTitle01;
-	}
-	public void setBizKakaoTitle01(String bizKakaoTitle01) {
-		this.bizKakaoTitle01 = bizKakaoTitle01;
-	}
-	public String getBizKakaoTitle02() {
-		return bizKakaoTitle02;
-	}
-	public void setBizKakaoTitle02(String bizKakaoTitle02) {
-		this.bizKakaoTitle02 = bizKakaoTitle02;
-	}
-	public String getBizKakaoResendOrgnlTxt() {
-		return bizKakaoResendOrgnlTxt;
-	}
-	public void setBizKakaoResendOrgnlTxt(String bizKakaoResendOrgnlTxt) {
-		this.bizKakaoResendOrgnlTxt = bizKakaoResendOrgnlTxt;
-	}
-	public String getBizKakaoResendYn() {
-		return bizKakaoResendYn;
-	}
-	public void setBizKakaoResendYn(String bizKakaoResendYn) {
-		this.bizKakaoResendYn = bizKakaoResendYn;
-	}
-	public String getBizKakaoResendType() {
-		return bizKakaoResendType;
-	}
-	public void setBizKakaoResendType(String bizKakaoResendType) {
-		this.bizKakaoResendType = bizKakaoResendType;
-	}
-	public String getBizKakaoJsonFile() {
-		return bizKakaoJsonFile;
-	}
-	public void setBizKakaoJsonFile(String bizKakaoJsonFile) {
-		this.bizKakaoJsonFile = bizKakaoJsonFile;
-	}
-	public String getYellowId() {
-		return yellowId;
-	}
-	public void setYellowId(String yellowId) {
-		this.yellowId = yellowId;
-	}
-	public String getBizKakaoResendTypeCnt() {
-		return bizKakaoResendTypeCnt;
-	}
-	public void setBizKakaoResendTypeCnt(String bizKakaoResendTypeCnt) {
-		this.bizKakaoResendTypeCnt = bizKakaoResendTypeCnt;
-	}
 	
 	
 	

81d31fc

d730bdd

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java


 		//사용자 현재 보유 금액 불러오기(문자 발송 금액 차감 이전 금액)
 //		String befCash = kakaoVO.getBefCash();
 		
-		log.info(" [{}]", kakaoVO.ftToString());		
+		log.info("kakaoVO.ftToString() ::  [{}]", kakaoVO.ftToString());		
 		
 		List<KakaoSendAdvcVO> kakaoSendAdvcListVO = new ArrayList<>();
 		Calendar calendar = setupBaseDate(kakaoVO, isNotified);

 		String templateContent = kakaoVO.getTemplateContent();
 		 // 실패 대체 문자
 		String subMsgTxt = kakaoVO.getSubMsgTxt();
+		log.info(" + StringUtils.isNotEmpty(subMsgTxt) :: [{}]", StringUtils.isNotEmpty(subMsgTxt));
+		if(StringUtils.isNotEmpty(subMsgTxt)) {
+			kakaoVO.setSubMsgSendYn("Y");
+		}
 		
 		// 시스템 기본 단가 정보 불러오기
 		JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();

 		Boolean replaceYN = MsgSendUtils.getReplaceYN(templateContent);
 		Boolean replaceSubYN = MsgSendUtils.getReplaceYN(subMsgTxt);
 
-		boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어
-		
 		
 		/** @MSGID KEY값 */
 		List<String> idList = mjonCommon.getNextCustomMsgCId(kakaoVO.getMjonFTSendVOList().size());

 
 
 		/** @jsonStr 필요유무 */
-		boolean hasTitleOrButtons =  CollectionUtils.isNotEmpty(kakaoVO.getButtonVOList());
+		boolean hasButtons =  CollectionUtils.isNotEmpty(kakaoVO.getButtonVOList());
 		String sharedJsonStr = null;
 		
 		
 
 		List<MjonFTSendVO> mjonFTSendVOList = kakaoVO.getMjonFTSendVOList();
 
-		// 분할 건수 카운터
-		int counter = 0;  
 		for (int i = 0; i < mjonFTSendVOList.size(); i++) {
 			MjonFTSendVO mjonFTSendVO = mjonFTSendVOList.get(i);
 

 			if(StringUtils.isNotEmpty(subMsgTxt)) {
 				subMsgTxtTemp = subMsgTxt;
 				
-				// 각 치환 구문을 확인하고 치환할 값이 없으면 오류 반환
-				for (Map.Entry<String, Function<MjonFTSendVO, String>> entry : placeholders.entrySet()) {
-					String placeholder = entry.getKey();
-					String value = entry.getValue().apply(mjonFTSendVO);
-					if (subMsgTxtTemp.contains(placeholder)) {
-						if (StringUtils.isEmpty(value)) {
-							statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
-							return null;
+				if(replaceSubYN) {
+					// 각 치환 구문을 확인하고 치환할 값이 없으면 오류 반환
+					for (Map.Entry<String, Function<MjonFTSendVO, String>> entry : placeholders.entrySet()) {
+						String placeholder = entry.getKey();
+						String value = entry.getValue().apply(mjonFTSendVO);
+						if (subMsgTxtTemp.contains(placeholder)) {
+							if (StringUtils.isEmpty(value)) {
+								statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
+								return null;
+							}
+							subMsgTxtTemp = subMsgTxtTemp.replace(placeholder, value);
 						}
-						subMsgTxtTemp = subMsgTxtTemp.replace(placeholder, value);
 					}
 				}
 			}

 	
 				boolean isMms = "MMS".equals(sendType);
 				sendVO.setEachPrice(isMms ? mmsPStr : shortPStr);
-				sendVO.setSubMsgTxt(subMsgTxt);// 실패 
 			}else {
 				kakaoFtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
 				sendVO.setEachPrice( Float.toString(kakaoFtPrice) );

 
 
 			// 타이틀과 버튼이 있고
-			if(hasTitleOrButtons) {
+			if(hasButtons) {
 				// 
 				if (StringUtils.isEmpty(sharedJsonStr)) {
 					// 치환 데이터가 없고 아직 생성되지 않았으면 한 번만 생성

 		sendVO.setTemplateCode(kakaoVO.getTemplateCode());
 		sendVO.setUserId(kakaoVO.getUserId());
 		sendVO.setCallFrom(kakaoVO.getCallFrom());
+		sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn());
 		return sendVO;
 	}
 	

 //		log.info(" + insertKakaoGroupDataTb_advc kakaoVO :: \n[{}]", kakaoVO.toString());;
 //		log.info(" + insertKakaoGroupDataTb_advc kakaoSendAdvcVOList :: \n[{}]", sendVO.toString());
 		
+		
+
+		sendVO.setTemplateContent(kakaoVO.getTemplateContent());
 		sendVO.setMsgGroupCnt(Integer.toString(instCnt));
 		sendVO.setReserveYn(kakaoVO.getReserveYn());
 		sendVO.setBefCash(priceAndPoint.getBefCash(sendVO.getUserId()));

81d31fc

d730bdd

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


 		
 		//전체 발송 리스트 불러오기
 		List<KakaoSentVO> resultAllSentList = kakaoSentService.selectAllKakaoSentList(kakaoSentVO);
-		System.out.println("??");
 		model.addAttribute("resultAllSentList", resultAllSentList);
 //		model.addAttribute("resultAllSentCnt", resultAllSentList.size());
 		

 		KakaoReturnVO returnVO = new KakaoReturnVO();
 		try {
 			
-			String tmpContent = kakaoATVO.getSmsTxtTrans();
-			String jsonFilePath = kakaoATVO.getBizKakaoJsonFile();
+			String jsonContents = kakaoATVO.getContents();
 			
 			//친구톡 이미지 또는 버튼 정보가 있다면 실행
-			if(jsonFilePath != null && jsonFilePath.length() > 0) {
+			if(jsonContents != null && jsonContents.length() > 0) {
 				
-				FileReader reader = new FileReader(jsonFilePath);         
+				/*FileReader reader = new FileReader(jsonFilePath);         
 				int ch;        
 				String resultStr = "";
 				while ((ch = reader.read()) != -1) {
 					 
 					resultStr = resultStr + (char)ch;
 				}
-				
+				*/
 				JSONParser parser = new JSONParser();
-				Object obj = parser.parse(resultStr);
+				Object obj = parser.parse(jsonContents);
 				JSONObject object = (JSONObject) obj;
 				
 				String image = (object.get("image") == null) ? null : object.get("image").toString();

 			}
 			
 			//친구톡 내용 셋팅
-			returnVO.setTemplateContent(tmpContent);
+			returnVO.setTemplateContent(kakaoATVO.getSmsTxt());
 
 		} catch (Exception e) {
 			e.printStackTrace();

 		
 		
 		
-		//발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA)
-		MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO);
-		// 대체문자 엔터키 치환
-		mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt()));  
-		model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
+		try {
 		
-		String msgType = mjonKakaoATResultVO.getMsgType();
+			//발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA)
+			MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO);
+			// 대체문자 엔터키 치환
+			if(StringUtils.isNotEmpty(mjonKakaoATResultVO.getSmsTxt())) {
+				mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt()));  
+			}
+			model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
+			
+			String msgType = mjonKakaoATResultVO.getMsgType();
+			
+			if(msgType.equals("8")) {//카카오 알림톡인 경우 상세정보 처리
+				
+				// 템플릿 api 가져오기
+				KakaoVO kakaoVO = new KakaoVO(); 
+				kakaoVO.setSenderKey(mjonKakaoATResultVO.getMsgNoticetalkSenderKey());
+				kakaoVO.setTemplateCode(mjonKakaoATResultVO.getMsgNoticetalkTmpKey());
+				
+				KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
+				
+				model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
+				// //템플릿 api 가져오기
+				
+			}else if(msgType.equals("9")) {//카카오 친구톡인 경우 상세정보 처리
+				
+				//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
+				
+				KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
+				//kakaoTemplateInfo.setTemplateContent(smsTxt);
+				
+				model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
+				
+			}else {
+				
+				model.addAttribute("kakaoTemplateInfo", "");
+				
+			}
+			model.addAttribute("msgType", msgType);		
 		
-		if(msgType.equals("8")) {//카카오 알림톡인 경우 상세정보 처리
-			
-			// 템플릿 api 가져오기
-			KakaoVO kakaoVO = new KakaoVO(); 
-			kakaoVO.setSenderKey(mjonKakaoATResultVO.getMsgNoticetalkSenderKey());
-			kakaoVO.setTemplateCode(mjonKakaoATResultVO.getMsgNoticetalkTmpKey());
-			
-			KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
-			
-			model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
-			// //템플릿 api 가져오기
-			
-		}else if(msgType.equals("9")) {//카카오 친구톡인 경우 상세정보 처리
-			
-			//String smsTxt = mjonKakaoATResultVO.getSmsTxt();
-			
-			KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
-			//kakaoTemplateInfo.setTemplateContent(smsTxt);
-			
-			model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
-			
-		}else {
-			
-			model.addAttribute("kakaoTemplateInfo", "");
-			
+		} catch (Exception e) {
+			e.printStackTrace();
+			// TODO: handle exception
 		}
-		
-		model.addAttribute("msgType", msgType);		
 		return "web/kakao/sent/KakaoSentDetailPopAjax";
 	}
 }

81d31fc

d730bdd

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


 	
 	<!-- 발신 내용 상세보기 조회 (상세보기 버튼 클릭시)-->
 	<select id="KakaoSentDAO.selectKakaoSentDetailDataAjax" parameterClass="mjonKakaoATVO" resultClass="mjonKakaoATVO">
-
+        /* KakaoSentDAO.selectKakaoSentDetailDataAjax */
 		SELECT
 		    MGD.MSG_GROUP_ID				as msgGroupId
 			, MGD.USER_ID					as userId

 			, 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 
 		FROM MJ_MSG_GROUP_DATA MGD
 				INNER JOIN MJ_MSG_DATA MD 
 					ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID
+                LEFT JOIN BIZ_ATTACHMENTS BA  
+                    ON MD.BIZ_KAKAO_JSON_FILE  = BA.MSG_KEY 
 				AND MGD.USER_ID = MD.USER_ID
 		WHERE
 			MGD.USER_ID				= #userId#

Add a comment

Open 0
Closed 0

List

...	...	@@ -300,7 +300,7 @@
300	300	//사용자 현재 보유 금액 불러오기(문자 발송 금액 차감 이전 금액)
301	301	// String befCash = kakaoVO.getBefCash();
302	302
303		- log.info(" [{}]", kakaoVO.ftToString());
	303	+ log.info("kakaoVO.ftToString() :: [{}]", kakaoVO.ftToString());
304	304
305	305	List<KakaoSendAdvcVO> kakaoSendAdvcListVO = new ArrayList<>();
306	306	Calendar calendar = setupBaseDate(kakaoVO, isNotified);
...	...	@@ -310,6 +310,10 @@
310	310	String templateContent = kakaoVO.getTemplateContent();
311	311	// 실패 대체 문자
312	312	String subMsgTxt = kakaoVO.getSubMsgTxt();
	313	+ log.info(" + StringUtils.isNotEmpty(subMsgTxt) :: [{}]", StringUtils.isNotEmpty(subMsgTxt));
	314	+ if(StringUtils.isNotEmpty(subMsgTxt)) {
	315	+ kakaoVO.setSubMsgSendYn("Y");
	316	+ }
313	317
314	318	// 시스템 기본 단가 정보 불러오기
315	319	JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
...	...	@@ -321,8 +325,6 @@
321	325	Boolean replaceYN = MsgSendUtils.getReplaceYN(templateContent);
322	326	Boolean replaceSubYN = MsgSendUtils.getReplaceYN(subMsgTxt);
323	327
324		- boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어
325		-
326	328
327	329	/** @MSGID KEY값 */
328	330	List<String> idList = mjonCommon.getNextCustomMsgCId(kakaoVO.getMjonFTSendVOList().size());
...	...	@@ -348,15 +350,13 @@
348	350
349	351
350	352	/** @jsonStr 필요유무 */
351		- boolean hasTitleOrButtons = CollectionUtils.isNotEmpty(kakaoVO.getButtonVOList());
	353	+ boolean hasButtons = CollectionUtils.isNotEmpty(kakaoVO.getButtonVOList());
352	354	String sharedJsonStr = null;
353	355
354	356
355	357
356	358	List<MjonFTSendVO> mjonFTSendVOList = kakaoVO.getMjonFTSendVOList();
357	359
358		- // 분할 건수 카운터
359		- int counter = 0;
360	360	for (int i = 0; i < mjonFTSendVOList.size(); i++) {
361	361	MjonFTSendVO mjonFTSendVO = mjonFTSendVOList.get(i);
362	362
...	...	@@ -394,16 +394,18 @@
394	394	if(StringUtils.isNotEmpty(subMsgTxt)) {
395	395	subMsgTxtTemp = subMsgTxt;
396	396
397		- // 각 치환 구문을 확인하고 치환할 값이 없으면 오류 반환
398		- for (Map.Entry<String, Function<MjonFTSendVO, String>> entry : placeholders.entrySet()) {
399		- String placeholder = entry.getKey();
400		- String value = entry.getValue().apply(mjonFTSendVO);
401		- if (subMsgTxtTemp.contains(placeholder)) {
402		- if (StringUtils.isEmpty(value)) {
403		- statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
404		- return null;
	397	+ if(replaceSubYN) {
	398	+ // 각 치환 구문을 확인하고 치환할 값이 없으면 오류 반환
	399	+ for (Map.Entry<String, Function<MjonFTSendVO, String>> entry : placeholders.entrySet()) {
	400	+ String placeholder = entry.getKey();
	401	+ String value = entry.getValue().apply(mjonFTSendVO);
	402	+ if (subMsgTxtTemp.contains(placeholder)) {
	403	+ if (StringUtils.isEmpty(value)) {
	404	+ statusResponseSet(statusResponse, HttpStatus.BAD_REQUEST, "치환 문구중 " + placeholder + " 데이터가 없습니다.");
	405	+ return null;
	406	+ }
	407	+ subMsgTxtTemp = subMsgTxtTemp.replace(placeholder, value);
405	408	}
406		- subMsgTxtTemp = subMsgTxtTemp.replace(placeholder, value);
407	409	}
408	410	}
409	411	}
...	...	@@ -423,7 +425,6 @@
423	425
424	426	boolean isMms = "MMS".equals(sendType);
425	427	sendVO.setEachPrice(isMms ? mmsPStr : shortPStr);
426		- sendVO.setSubMsgTxt(subMsgTxt);// 실패
427	428	}else {
428	429	kakaoFtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
429	430	sendVO.setEachPrice( Float.toString(kakaoFtPrice) );
...	...	@@ -431,7 +432,7 @@
431	432
432	433
433	434	// 타이틀과 버튼이 있고
434		- if(hasTitleOrButtons) {
	435	+ if(hasButtons) {
435	436	//
436	437	if (StringUtils.isEmpty(sharedJsonStr)) {
437	438	// 치환 데이터가 없고 아직 생성되지 않았으면 한 번만 생성
...	...	@@ -550,6 +551,7 @@
550	551	sendVO.setTemplateCode(kakaoVO.getTemplateCode());
551	552	sendVO.setUserId(kakaoVO.getUserId());
552	553	sendVO.setCallFrom(kakaoVO.getCallFrom());
	554	+ sendVO.setSubMsgSendYn(kakaoVO.getSubMsgSendYn());
553	555	return sendVO;
554	556	}
555	557
...	...	@@ -1576,6 +1578,9 @@
1576	1578	// log.info(" + insertKakaoGroupDataTb_advc kakaoVO :: \n[{}]", kakaoVO.toString());;
1577	1579	// log.info(" + insertKakaoGroupDataTb_advc kakaoSendAdvcVOList :: \n[{}]", sendVO.toString());
1578	1580
	1581	+
	1582	+
	1583	+ sendVO.setTemplateContent(kakaoVO.getTemplateContent());
1579	1584	sendVO.setMsgGroupCnt(Integer.toString(instCnt));
1580	1585	sendVO.setReserveYn(kakaoVO.getReserveYn());
1581	1586	sendVO.setBefCash(priceAndPoint.getBefCash(sendVO.getUserId()));

...	...	@@ -182,7 +182,6 @@
182	182
183	183	//전체 발송 리스트 불러오기
184	184	List<KakaoSentVO> resultAllSentList = kakaoSentService.selectAllKakaoSentList(kakaoSentVO);
185		- System.out.println("??");
186	185	model.addAttribute("resultAllSentList", resultAllSentList);
187	186	// model.addAttribute("resultAllSentCnt", resultAllSentList.size());
188	187
...	...	@@ -890,22 +889,21 @@
890	889	KakaoReturnVO returnVO = new KakaoReturnVO();
891	890	try {
892	891
893		- String tmpContent = kakaoATVO.getSmsTxtTrans();
894		- String jsonFilePath = kakaoATVO.getBizKakaoJsonFile();
	892	+ String jsonContents = kakaoATVO.getContents();
895	893
896	894	//친구톡 이미지 또는 버튼 정보가 있다면 실행
897		- if(jsonFilePath != null && jsonFilePath.length() > 0) {
	895	+ if(jsonContents != null && jsonContents.length() > 0) {
898	896
899		- FileReader reader = new FileReader(jsonFilePath);
	897	+ /*FileReader reader = new FileReader(jsonFilePath);
900	898	int ch;
901	899	String resultStr = "";
902	900	while ((ch = reader.read()) != -1) {
903	901
904	902	resultStr = resultStr + (char)ch;
905	903	}
906		-
	904	+ */
907	905	JSONParser parser = new JSONParser();
908		- Object obj = parser.parse(resultStr);
	906	+ Object obj = parser.parse(jsonContents);
909	907	JSONObject object = (JSONObject) obj;
910	908
911	909	String image = (object.get("image") == null) ? null : object.get("image").toString();
...	...	@@ -964,7 +962,7 @@
964	962	}
965	963
966	964	//친구톡 내용 셋팅
967		- returnVO.setTemplateContent(tmpContent);
	965	+ returnVO.setTemplateContent(kakaoATVO.getSmsTxt());
968	966
969	967	} catch (Exception e) {
970	968	e.printStackTrace();
...	...	@@ -1037,42 +1035,50 @@
1037	1035
1038	1036
1039	1037
1040		- //발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA)
1041		- MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO);
1042		- // 대체문자 엔터키 치환
1043		- mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt()));
1044		- model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
	1038	+ try {
1045	1039
1046		- String msgType = mjonKakaoATResultVO.getMsgType();
	1040	+ //발송 관리 문자발송 내용 상세보기 팝업 => 문자내용(MJ_MSG_DATA)
	1041	+ MjonKakaoATVO mjonKakaoATResultVO = kakaoSentService.selectKakaoSentDetailDataAjax(mjonKakaoATVO);
	1042	+ // 대체문자 엔터키 치환
	1043	+ if(StringUtils.isNotEmpty(mjonKakaoATResultVO.getSmsTxt())) {
	1044	+ mjonKakaoATResultVO.setSmsTxt(StringUtil2.replaceBR(mjonKakaoATResultVO.getSmsTxt()));
	1045	+ }
	1046	+ model.addAttribute("resultMsgDetail", mjonKakaoATResultVO);
	1047	+
	1048	+ String msgType = mjonKakaoATResultVO.getMsgType();
	1049	+
	1050	+ if(msgType.equals("8")) {//카카오 알림톡인 경우 상세정보 처리
	1051	+
	1052	+ // 템플릿 api 가져오기
	1053	+ KakaoVO kakaoVO = new KakaoVO();
	1054	+ kakaoVO.setSenderKey(mjonKakaoATResultVO.getMsgNoticetalkSenderKey());
	1055	+ kakaoVO.setTemplateCode(mjonKakaoATResultVO.getMsgNoticetalkTmpKey());
	1056	+
	1057	+ KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
	1058	+
	1059	+ model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
	1060	+ // //템플릿 api 가져오기
	1061	+
	1062	+ }else if(msgType.equals("9")) {//카카오 친구톡인 경우 상세정보 처리
	1063	+
	1064	+ //String smsTxt = mjonKakaoATResultVO.getSmsTxt();
	1065	+
	1066	+ KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
	1067	+ //kakaoTemplateInfo.setTemplateContent(smsTxt);
	1068	+
	1069	+ model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
	1070	+
	1071	+ }else {
	1072	+
	1073	+ model.addAttribute("kakaoTemplateInfo", "");
	1074	+
	1075	+ }
	1076	+ model.addAttribute("msgType", msgType);
1047	1077
1048		- if(msgType.equals("8")) {//카카오 알림톡인 경우 상세정보 처리
1049		-
1050		- // 템플릿 api 가져오기
1051		- KakaoVO kakaoVO = new KakaoVO();
1052		- kakaoVO.setSenderKey(mjonKakaoATResultVO.getMsgNoticetalkSenderKey());
1053		- kakaoVO.setTemplateCode(mjonKakaoATResultVO.getMsgNoticetalkTmpKey());
1054		-
1055		- KakaoReturnVO kakaoTemplateInfo =kakaoApiTemplate.selectKakaoApiTemplateDetail(kakaoVO);
1056		-
1057		- model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
1058		- // //템플릿 api 가져오기
1059		-
1060		- }else if(msgType.equals("9")) {//카카오 친구톡인 경우 상세정보 처리
1061		-
1062		- //String smsTxt = mjonKakaoATResultVO.getSmsTxt();
1063		-
1064		- KakaoReturnVO kakaoTemplateInfo = getKakaoFTSendTemplateInfo(mjonKakaoATResultVO);
1065		- //kakaoTemplateInfo.setTemplateContent(smsTxt);
1066		-
1067		- model.addAttribute("kakaoTemplateInfo", kakaoTemplateInfo);
1068		-
1069		- }else {
1070		-
1071		- model.addAttribute("kakaoTemplateInfo", "");
1072		-
	1078	+ } catch (Exception e) {
	1079	+ e.printStackTrace();
	1080	+ // TODO: handle exception
1073	1081	}
1074		-
1075		- model.addAttribute("msgType", msgType);
1076	1082	return "web/kakao/sent/KakaoSentDetailPopAjax";
1077	1083	}
1078	1084	}

...	...	@@ -909,7 +909,7 @@
909	909
910	910	<!-- 발신 내용 상세보기 조회 (상세보기 버튼 클릭시)-->
911	911	<select id="KakaoSentDAO.selectKakaoSentDetailDataAjax" parameterClass="mjonKakaoATVO" resultClass="mjonKakaoATVO">
912		-
	912	+ /* KakaoSentDAO.selectKakaoSentDetailDataAjax */
913	913	SELECT
914	914	MGD.MSG_GROUP_ID as msgGroupId
915	915	, MGD.USER_ID as userId
...	...	@@ -925,9 +925,12 @@
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
928	929	FROM MJ_MSG_GROUP_DATA MGD
929	930	INNER JOIN MJ_MSG_DATA MD
930	931	ON MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID
	932	+ LEFT JOIN BIZ_ATTACHMENTS BA
	933	+ ON MD.BIZ_KAKAO_JSON_FILE = BA.MSG_KEY
931	934	AND MGD.USER_ID = MD.USER_ID
932	935	WHERE
933	936	MGD.USER_ID = #userId#

Delete comment