From 071fd2b35b101183a79f23a25f1eb9f3a869f86a Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Tue, 14 Jan 2025 10:25:10 +0900 Subject: [PATCH 01/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=83=81=EC=9C=84=20=ED=83=AD=20active=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/kakao/include/KakaoSentTopMentTap.jsp | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp index 930800d1..0e019972 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp @@ -25,16 +25,23 @@ function initMenuTab(){ console.log('uri:', uri); - if(uri.includes('selectMsgSentView')){ - $('.topTab').removeClass("active"); - $("#smsTab").addClass("active"); - }else if(uri.includes('selectKakaoSentView')){ - $('.topTab').removeClass("active"); - $("#kakaoTab").addClass("active"); - }else if(uri.includes('faxSendList')){ - $('.topTab').removeClass("active"); - $("#faxTab").addClass("active"); + // URI 키워드와 해당 탭 ID를 매핑 + const tabMapping = [ + { keyword: 'selectMsgSentView', tabId: '#smsTab' }, // 'selectMsgSentView' 키워드를 '#smsTab'으로 매핑 + { keyword: 'selectKakaoSentView', tabId: '#kakaoTab' }, // 'selectKakaoSentView' 키워드를 '#kakaoTab'으로 매핑 + { keyword: 'faxSendList', tabId: '#faxTab' } // 'faxSendList' 키워드를 '#faxTab'으로 매핑 + ]; + + // URI에 특정 키워드가 포함되어 있는지 확인하여 활성 탭 정보를 찾음 + const activeTab = tabMapping.find(mapping => uri.includes(mapping.keyword)); // 'uri'에 키워드가 포함된 첫 번째 매핑을 검색 + + // 매칭된 탭이 있으면 UI를 업데이트하여 해당 탭을 활성화 + if (activeTab) { + $('.topTab').removeClass("active"); // 모든 탭에서 "active" 클래스 제거 + $(activeTab.tabId).addClass("active"); // 매핑된 탭 ID에 "active" 클래스 추가 } + + } function fnLinkPageTab(tabInfo){ From d34f626aa08e2f98f93cdfdab6c2028124bdfb85 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 16 Jan 2025 10:56:01 +0900 Subject: [PATCH 02/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B0=8F=20=EC=86=8D=EB=8F=84?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EC=A7=84=ED=96=89=EC=A4=91=20-=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjo/msgsent/service/MjonMsgSWFDTO.java | 32 ++ .../msgsent/service/MjonMsgSentService.java | 6 + .../mjo/msgsent/service/MjonMsgSentVO.java | 399 +-------------- .../msgsent/service/impl/MjonMsgSentDAO.java | 17 + .../service/impl/MjonMsgSentServiceImpl.java | 56 ++ .../msgsent/web/MjonMsgSentController.java | 258 +++++++--- .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 217 +++++++- .../jsp/web/msgsent/MsgSentAllListAjax.jsp | 338 +++--------- ...sgSentAllListAjax_advc_backup_20250115.jsp | 479 ++++++++++++++++++ .../WEB-INF/jsp/web/msgsent/MsgSentView.jsp | 8 +- 10 files changed, 1047 insertions(+), 763 deletions(-) create mode 100644 src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java create mode 100644 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax_advc_backup_20250115.jsp diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java new file mode 100644 index 00000000..ede1b2a6 --- /dev/null +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSWFDTO.java @@ -0,0 +1,32 @@ +package itn.let.mjo.msgsent.service; + +import java.io.Serializable; + +import lombok.Getter; +import lombok.Setter; + +/** + * + * @author : 이호영 + * @fileName : MjonMsgSWFDTO.java + * @date : 2025.01.16 + * @description : 그룹ID로 성공 실패 대기 건수를 구해서 전달해주는 DTO + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2025.01.16 이호영 최초 생성 + * + * + * + */ +@Getter +@Setter +public class MjonMsgSWFDTO implements Serializable { + + private static final long serialVersionUID = 1L; // 선언 + + private int resultSValue; // 성공건수 + private int resultFValue; // 실패건수 + private int resultWValue; // 대기건수 + +} diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java index c0d73343..09eff10f 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java @@ -1,6 +1,7 @@ package itn.let.mjo.msgsent.service; import java.util.List; +import java.util.Map; import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.mjo.addr.service.AddrGroupVO; @@ -16,6 +17,8 @@ public interface MjonMsgSentService { //발송 관리 전체 발송 리스트 불러오기 public List selectAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception; + public Map selectAllMsgSentList_advc(MjonMsgSentVO mjonMsgSentVO) throws Exception; + //발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전 public List selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception; @@ -54,5 +57,8 @@ public interface MjonMsgSentService { //첨부파일 정보 불러오기 public MjonMsgSentVO selectFileInfo(String streFileId) throws Exception; + + public int countAllMsgSentList(MjonMsgSentVO mjonMsgSentVO); + } diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index f7478240..b9758511 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -4,7 +4,11 @@ import java.util.Date; import java.util.List; import itn.let.uss.umt.service.UserDefaultVO; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class MjonMsgSentVO extends UserDefaultVO{ private static final long serialVersionUID = 1L; @@ -86,399 +90,8 @@ public class MjonMsgSentVO extends UserDefaultVO{ private String successCount; private String resultSValue; + private String resultFValue; + private String resultWValue; private String resultWFValue; - public String getSuccessCount() { - return successCount; - } - public void setSuccessCount(String successCount) { - this.successCount = successCount; - } - public String getMsgSentType() { - return msgSentType; - } - public void setMsgSentType(String msgSentType) { - this.msgSentType = msgSentType; - } - public String getCallFromComma() { - return callFromComma; - } - public void setCallFromComma(String callFromComma) { - this.callFromComma = callFromComma; - } - public String getCallToComma() { - return callToComma; - } - public void setCallToComma(String callToComma) { - this.callToComma = callToComma; - } - - public String getAtchFiles() { - return atchFiles; - } - public void setAtchFiles(String atchFiles) { - this.atchFiles = atchFiles; - } - - public String getMsgId() { - return msgId; - } - public void setMsgId(String msgId) { - this.msgId = msgId; - } - public int getSuccessCnt() { - return successCnt; - } - public void setSuccessCnt(int successCnt) { - this.successCnt = successCnt; - } - public String getMsgTypeName() { - return msgTypeName; - } - public void setMsgTypeName(String msgTypeName) { - this.msgTypeName = msgTypeName; - } - public int getOrderByCode() { - return orderByCode; - } - public void setOrderByCode(int orderByCode) { - this.orderByCode = orderByCode; - } - public String getAtchFileId() { - return atchFileId; - } - public void setAtchFileId(String atchFileId) { - this.atchFileId = atchFileId; - } - public String getFileSn() { - return fileSn; - } - public void setFileSn(String fileSn) { - this.fileSn = fileSn; - } - public String getUserId() { - return userId; - } - public void setUserId(String userId) { - this.userId = userId; - } - public String getAddrNm() { - return addrNm; - } - public void setAddrNm(String addrNm) { - this.addrNm = addrNm; - } - public String getMsgSeq() { - return msgSeq; - } - public void setMsgSeq(String msgSeq) { - this.msgSeq = msgSeq; - } - public String getMsgGroupId() { - return msgGroupId; - } - public void setMsgGroupId(String msgGroupId) { - this.msgGroupId = msgGroupId; - } - public List getMsgGroupIdList() { - return msgGroupIdList; - } - public void setMsgGroupIdList(List msgGroupIdList) { - this.msgGroupIdList = msgGroupIdList; - } - public String getSmsTxt() { - return smsTxt; - } - public void setSmsTxt(String smsTxt) { - this.smsTxt = smsTxt; - } - public String getSubject() { - return subject; - } - public void setSubject(String subject) { - this.subject = subject; - } - public Date getRegdate() { - return regdate; - } - public void setRegdate(Date regdate) { - this.regdate = regdate; - } - public Date getReqdate() { - return reqdate; - } - public void setReqdate(Date reqdate) { - this.reqdate = reqdate; - } - public String getCallFrom() { - return callFrom; - } - public void setCallFrom(String callFrom) { - this.callFrom = callFrom; - } - public String getCallTo() { - return callTo; - } - public void setCallTo(String callTo) { - this.callTo = callTo; - } - public List getCallToList() { - return callToList; - } - public void setCallToList(List callToList) { - this.callToList = callToList; - } - public String getTotPrice() { - return totPrice; - } - public void setTotPrice(String totPrice) { - this.totPrice = totPrice; - } - public String getEachPrice() { - return eachPrice; - } - public void setEachPrice(String eachPrice) { - this.eachPrice = eachPrice; - } - public String getDelFlag() { - return delFlag; - } - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - public String getTotMsgPrice() { - return totMsgPrice; - } - public void setTotMsgPrice(String totMsgPrice) { - this.totMsgPrice = totMsgPrice; - } - 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 getMsgType() { - return msgType; - } - public void setMsgType(String msgType) { - this.msgType = msgType; - } - public String getMsgGroupCnt() { - return msgGroupCnt; - } - public void setMsgGroupCnt(String msgGroupCnt) { - this.msgGroupCnt = msgGroupCnt; - } - public String getFileCnt() { - return fileCnt; - } - public void setFileCnt(String fileCnt) { - this.fileCnt = fileCnt; - } - public String getTotMsgCnt() { - return totMsgCnt; - } - public void setTotMsgCnt(String totMsgCnt) { - this.totMsgCnt = totMsgCnt; - } - public String getCurState() { - return curState; - } - public void setCurState(String curState) { - this.curState = curState; - } - 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 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 Date getSentDate() { - return sentDate; - } - public void setSentDate(Date sentDate) { - this.sentDate = sentDate; - } - public String getAgentCode() { - return agentCode; - } - public void setAgentCode(String agentCode) { - this.agentCode = agentCode; - } - public String getUserData() { - return userData; - } - public void setUserData(String userData) { - this.userData = userData; - } - public List getUserDataList() { - return userDataList; - } - public void setUserDataList(List userDataList) { - this.userDataList = userDataList; - } - public Date getCancelDate() { - return cancelDate; - } - public void setCancelDate(Date cancelDate) { - this.cancelDate = cancelDate; - } - public String getStartDate() { - return startDate; - } - public void setStartDate(String startDate) { - this.startDate = startDate; - } - public String getEndDate() { - return endDate; - } - public void setEndDate(String endDate) { - this.endDate = endDate; - } - public String getSearchMsgType() { - return searchMsgType; - } - public void setSearchMsgType(String searchMsgType) { - this.searchMsgType = searchMsgType; - } - public String getTabType() { - return tabType; - } - public void setTabType(String tabType) { - this.tabType = tabType; - } - public String getStateType() { - return stateType; - } - public void setStateType(String stateType) { - this.stateType = stateType; - } - public String getListType() { - return listType; - } - public void setListType(String listType) { - this.listType = listType; - } - public String getResultType() { - return resultType; - } - public void setResultType(String resultType) { - this.resultType = resultType; - } - public String getMsgResultCnt() { - return msgResultCnt; - } - public void setMsgResultCnt(String msgResultCnt) { - this.msgResultCnt = msgResultCnt; - } - public String getMsgResultSts() { - return msgResultSts; - } - public void setMsgResultSts(String msgResultSts) { - this.msgResultSts = msgResultSts; - } - public String getAddrGrpNm() { - return addrGrpNm; - } - public void setAddrGrpNm(String addrGrpNm) { - this.addrGrpNm = addrGrpNm; - } - public int getOrderByrsltCode() { - return orderByrsltCode; - } - public void setOrderByrsltCode(int orderByrsltCode) { - this.orderByrsltCode = orderByrsltCode; - } - public String getMsgResult() { - return msgResult; - } - public void setMsgResult(String msgResult) { - this.msgResult = msgResult; - } - public String getNtceBgnde() { - return ntceBgnde; - } - public void setNtceBgnde(String ntceBgnde) { - this.ntceBgnde = ntceBgnde; - } - public String getNtceEndde() { - return ntceEndde; - } - public void setNtceEndde(String ntceEndde) { - this.ntceEndde = ntceEndde; - } - public String getMsgKind() { - return msgKind; - } - public void setMsgKind(String msgKind) { - this.msgKind = msgKind; - } - 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 getSendKind() { - return sendKind; - } - public void setSendKind(String sendKind) { - this.sendKind = sendKind; - } - public String getResultSValue() { - return resultSValue; - } - public void setResultSValue(String resultSValue) { - this.resultSValue = resultSValue; - } - public String getResultWFValue() { - return resultWFValue; - } - public void setResultWFValue(String resultWFValue) { - this.resultWFValue = resultWFValue; - } - public Date getDelayOrgTime() { - return delayOrgTime; - } - public void setDelayOrgTime(Date delayOrgTime) { - this.delayOrgTime = delayOrgTime; - } - } diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java index bb43a7f0..e749d110 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java @@ -9,6 +9,7 @@ import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.block.service.MjonBlockVO; +import itn.let.mjo.msgsent.service.MjonMsgSWFDTO; import itn.let.mjo.msgsent.service.MjonMsgSentVO; @Repository("MjonMsgSentDAO") @@ -56,6 +57,13 @@ public class MjonMsgSentDAO extends EgovAbstractDAO { return (List) list("MjonMsgSentDAO.selectAllMsgSentList",mjonMsgSentVO); } + //발송 관리 전체 발송 리스트 불러오기 + @SuppressWarnings("unchecked") + public List selectAllMsgSentList_advc(MjonMsgSentVO mjonMsgSentVO) throws Exception{ + + return (List) list("MjonMsgSentDAO.selectAllMsgSentList_advc",mjonMsgSentVO); + } + //발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전 @SuppressWarnings("unchecked") public List selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception{ @@ -158,5 +166,14 @@ public class MjonMsgSentDAO extends EgovAbstractDAO { public MjonMsgSentVO selectFileInfo(String streFileId) throws Exception{ return (MjonMsgSentVO) select("MjonMsgSentDAO.selectFileInfo", streFileId); } + + public int countAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) { + return (Integer)select("MjonMsgSentDAO.countAllMsgSentList", mjonMsgSentVO); + } + + public MjonMsgSWFDTO findBySWF(String msgGroupId) { + + return (MjonMsgSWFDTO) select("MjonMsgSentDAO.findBySWF", msgGroupId); + } } diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index f142d639..a8945faa 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -1,7 +1,12 @@ package itn.let.mjo.msgsent.service.impl; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -12,9 +17,12 @@ import egovframework.rte.fdl.idgnr.EgovIdGnrService; import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.block.service.MjonBlockVO; +import itn.let.mjo.msgsent.service.MjonMsgSWFDTO; import itn.let.mjo.msgsent.service.MjonMsgSentService; import itn.let.mjo.msgsent.service.MjonMsgSentVO; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Service("MjonMsgSentService") public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements MjonMsgSentService{ @@ -84,6 +92,54 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements return resultList; } + //발송 관리 전체 발송 리스트 불러오기 + public Map selectAllMsgSentList_advc(MjonMsgSentVO mjonMsgSentVO) throws Exception{ + + + Map resultMap = new HashMap(); + + // 목록 + List resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO); + + // MsgGroupId만 추출하여 리스트 생성 +// List msgGroupIdList = resultList.stream() +// .map(MjonMsgSentVO::getMsgGroupId) // MsgGroupId 추출 +// .collect(Collectors.toList()); // 리스트로 수집 + + + resultList.stream().forEach(t->{ + MjonMsgSWFDTO mjonMsgSWFDTO = mjonMsgSentDAO.findBySWF(t.getMsgGroupId()); + t.setResultSValue(String.valueOf(mjonMsgSWFDTO.getResultSValue())); + t.setResultFValue(String.valueOf(mjonMsgSWFDTO.getResultFValue())); + t.setResultWValue(String.valueOf(mjonMsgSWFDTO.getResultWValue())); + + BigDecimal eachPrice = new BigDecimal(t.getEachPrice()); + BigDecimal resultSValue = new BigDecimal(mjonMsgSWFDTO.getResultSValue()); + BigDecimal totalPrice = eachPrice.multiply(resultSValue); + // 소수점 한 자리로 설정 (반올림) + BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP); + t.setTotPrice(roundedTotalPrice.toPlainString()); // 결과를 String으로 설정 + }); + + + + + // 총 카운트 + int totalCnt = mjonMsgSentDAO.countAllMsgSentList(mjonMsgSentVO); +// int totalCnt = 0; + resultMap.put("resultList", resultList); + resultMap.put("totalCnt", totalCnt); + + + return resultMap; + } + + + @Override + public int countAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) { + return mjonMsgSentDAO.countAllMsgSentList(mjonMsgSentVO); + } + //발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전 public List selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception{ List resultList = new ArrayList(); diff --git a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java index 89898107..b4fed593 100644 --- a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java +++ b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java @@ -5,14 +5,17 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Font; @@ -47,7 +50,9 @@ import itn.let.mjo.apikey.service.ApiKeyVO; import itn.let.mjo.msgsent.service.MjonMsgSentCntVO; import itn.let.mjo.msgsent.service.MjonMsgSentService; import itn.let.mjo.msgsent.service.MjonMsgSentVO; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Controller public class MjonMsgSentController { @@ -234,22 +239,9 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll String startDate = mjonMsgSentVO.getStartDate(); String endDate = mjonMsgSentVO.getEndDate(); - if(startDate == null && endDate == null ) { - - -// -// Calendar cal = Calendar.getInstance(); -// Date now = new Date(); -// -// SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd"); -// -// //종료일은 오늘날짜 -// cal.setTime(now); -// endDate = format.format(cal.getTime()); -// -// //시작일은 전날로 셋팅 -// cal.add(Calendar.DATE, -1); -// startDate = format.format(cal.getTime()); + if(StringUtils.isEmpty(startDate) + && StringUtils.isEmpty(endDate)) + { mjonMsgSentVO.setStartDate(DateUtils.getDateMonthsAgo(3)); mjonMsgSentVO.setEndDate(DateUtils.getCurrentDate()); @@ -285,6 +277,7 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll //전체 발송 건수 통계 불러오기 mjonMsgSentVO.setMsgType(""); + log.info(" :: mjonMsgSentService.selectDetailMsgSentCntMix :: "); List totalMsgCnt = mjonMsgSentService.selectDetailMsgSentCntMix(mjonMsgSentVO); System.out.println("start"); @@ -302,8 +295,6 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll List A_lmsMsgCnt = new ArrayList(); List A_mmsMsgCnt = new ArrayList(); - System.out.println(" ::H_totalMsgCnt :: "+ H_totalMsgCnt.size()); - System.out.println(" ::A_totalMsgCnt :: "+ A_totalMsgCnt.size()); H_totalMsgCnt.forEach(t->{ if (Integer.parseInt(t.getFilePath1())>0) { @@ -325,8 +316,6 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll } }); - - //* 홈페이지에서 보낸 데이터 LIST //* SEND_KIND = "H" @@ -366,7 +355,6 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll apiKeyVO.setMberId(userId); model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false); - System.out.println("MsgSentView_HA_allSentAjax_end"); return "/web/msgsent/subcontent/MsgSentView_HA_allSentAjax"; @@ -421,89 +409,191 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll @RequestMapping(value= {"/web/mjon/msgsent/selectMsgSentListViewAjax.do"}) public String selectMsgSentListViewAjax(@ModelAttribute("searchVO") MjonMsgSentVO mjonMsgSentVO, ModelMap model) throws Exception{ + String pageUrl = ""; + try { + + + + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + mjonMsgSentVO.setUserId(userId); + + // 검색 리스트 불러오기 +// if(mjonMsgSentVO.getPageUnit() != 10) { +// mjonMsgSentVO.setPageUnit(mjonMsgSentVO.getPageUnit()); +// } + + //기본 내림차순 정렬 + if(mjonMsgSentVO.getSearchSortOrd().equals("")) { + + mjonMsgSentVO.setSearchSortOrd("desc"); + mjonMsgSentVO.setSearchSortCnd("regdate"); + } + + if(mjonMsgSentVO.getListType().equals("")) { + + mjonMsgSentVO.setListType("groupList"); + + } + + //선택 탭 정보 저장 + //mjonResvMsgVO.setSearchMsgType(mjonResvMsgVO.getTabType()); + + /** pageing */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(mjonMsgSentVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(mjonMsgSentVO.getPageUnit()); + paginationInfo.setPageSize(mjonMsgSentVO.getPageSize()); + + mjonMsgSentVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + mjonMsgSentVO.setLastIndex(paginationInfo.getLastRecordIndex()); + mjonMsgSentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + if(!DateUtils.dateChkAndValueChk(mjonMsgSentVO.getStartDate(),mjonMsgSentVO.getEndDate(), 3 )) { + mjonMsgSentVO.setStartDate(DateUtils.getDateMonthsAgo(3)); + mjonMsgSentVO.setEndDate(DateUtils.getCurrentDate()); + }; + + model.addAttribute("startDate", mjonMsgSentVO.getStartDate()); + model.addAttribute("endDate", mjonMsgSentVO.getEndDate()); + + //전체 발송 리스트 불러오기 + Map resultMap = mjonMsgSentService.selectAllMsgSentList_advc(mjonMsgSentVO); + + + model.addAttribute("resultAllSentList", resultMap.get("resultList")); + + + paginationInfo.setTotalRecordCount((Integer)resultMap.get("totalCnt")); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount()); + + model.addAttribute("mjonMsgSentVO", mjonMsgSentVO); + + String stateType = mjonMsgSentVO.getStateType(); + // String pageUrl = "web/msgsent/MsgSentAllListAjax"; + /* + pageUrl = "web/msgsent/MsgSentAllListAjax"; + if(stateType.equals("ready")) { + + pageUrl = "web/msgsent/MsgSentReadyListAjax"; + + }else if(stateType.equals("complete")) { + + pageUrl = "web/msgsent/MsgSentCompleteListAjax"; + + }else if(stateType.equals("fail")) { + + pageUrl = "web/msgsent/MsgSentFailListAjax"; + + }*/ + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + + return "web/msgsent/MsgSentAllListAjax"; + } + + @RequestMapping(value= {"/web/mjon/msgsent/selectMsgSentListViewAjax_backup.do"}) + public String selectMsgSentListViewAjax_backup(@ModelAttribute("searchVO") MjonMsgSentVO mjonMsgSentVO, ModelMap model) throws Exception{ + + + + //로그인 권한정보 불러오기 - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - - mjonMsgSentVO.setUserId(userId); - - // 검색 리스트 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + mjonMsgSentVO.setUserId(userId); + + // 검색 리스트 불러오기 if(mjonMsgSentVO.getPageUnit() != 10) { mjonMsgSentVO.setPageUnit(mjonMsgSentVO.getPageUnit()); } - //기본 내림차순 정렬 - if(mjonMsgSentVO.getSearchSortOrd().equals("")) { - - mjonMsgSentVO.setSearchSortOrd("desc"); - mjonMsgSentVO.setSearchSortCnd("regdate"); - } - - if(mjonMsgSentVO.getListType().equals("")) { - - mjonMsgSentVO.setListType("groupList"); - - } - - //선택 탭 정보 저장 - //mjonResvMsgVO.setSearchMsgType(mjonResvMsgVO.getTabType()); - + //기본 내림차순 정렬 + if(mjonMsgSentVO.getSearchSortOrd().equals("")) { + + mjonMsgSentVO.setSearchSortOrd("desc"); + mjonMsgSentVO.setSearchSortCnd("regdate"); + } + + if(mjonMsgSentVO.getListType().equals("")) { + + mjonMsgSentVO.setListType("groupList"); + + } + + //선택 탭 정보 저장 + //mjonResvMsgVO.setSearchMsgType(mjonResvMsgVO.getTabType()); + /** pageing */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(mjonMsgSentVO.getPageIndex()); paginationInfo.setRecordCountPerPage(mjonMsgSentVO.getPageUnit()); paginationInfo.setPageSize(mjonMsgSentVO.getPageSize()); - + mjonMsgSentVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); mjonMsgSentVO.setLastIndex(paginationInfo.getLastRecordIndex()); mjonMsgSentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - + if(!DateUtils.dateChkAndValueChk(mjonMsgSentVO.getStartDate(),mjonMsgSentVO.getEndDate(), 3 )) { mjonMsgSentVO.setStartDate(DateUtils.getDateMonthsAgo(3)); mjonMsgSentVO.setEndDate(DateUtils.getCurrentDate()); }; - - model.addAttribute("startDate", mjonMsgSentVO.getStartDate()); - model.addAttribute("endDate", mjonMsgSentVO.getEndDate()); - //전체 발송 리스트 불러오기 - List resultAllSentList = mjonMsgSentService.selectAllMsgSentList(mjonMsgSentVO); - model.addAttribute("resultAllSentList", resultAllSentList); - model.addAttribute("resultAllSentCnt", resultAllSentList.size()); - - model.addAttribute("searchKeyword", mjonMsgSentVO.getSearchKeyword()); - paginationInfo.setTotalRecordCount( resultAllSentList.size()> 0 ? (Integer.parseInt((resultAllSentList.get(0)).getTotMsgCnt())) : 0); - model.addAttribute("paginationInfo", paginationInfo); - model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount()); - - //발송 결과 성공 실패 건수 리스트 불러오기 - List resultMsgSucFailList = new ArrayList(); - - if(resultAllSentList.size() > 0) { - resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO); - } - model.addAttribute("resultMsgSucFailList", resultMsgSucFailList); - - model.addAttribute("mjonMsgSentVO", mjonMsgSentVO); - - String stateType = mjonMsgSentVO.getStateType(); - String pageUrl = "web/msgsent/MsgSentAllListAjax"; - - if(stateType.equals("ready")) { - - pageUrl = "web/msgsent/MsgSentReadyListAjax"; - - }else if(stateType.equals("complete")) { - - pageUrl = "web/msgsent/MsgSentCompleteListAjax"; - - }else if(stateType.equals("fail")) { - - pageUrl = "web/msgsent/MsgSentFailListAjax"; - - } + model.addAttribute("startDate", mjonMsgSentVO.getStartDate()); + model.addAttribute("endDate", mjonMsgSentVO.getEndDate()); + + //전체 발송 리스트 불러오기 + List resultAllSentList = mjonMsgSentService.selectAllMsgSentList(mjonMsgSentVO); + + + model.addAttribute("resultAllSentList", resultAllSentList); + model.addAttribute("resultAllSentCnt", resultAllSentList.size()); + + model.addAttribute("searchKeyword", mjonMsgSentVO.getSearchKeyword()); + paginationInfo.setTotalRecordCount( resultAllSentList.size()> 0 ? (Integer.parseInt((resultAllSentList.get(0)).getTotMsgCnt())) : 0); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount()); + + //발송 결과 성공 실패 건수 리스트 불러오기 + List resultMsgSucFailList = new ArrayList(); + + if(resultAllSentList.size() > 0) { + System.out.println("=====resultMsgSucFailList====="); + resultMsgSucFailList = mjonMsgSentService.selectAllMsgSentSucFailList(resultAllSentList, mjonMsgSentVO); + System.out.println("//=====resultMsgSucFailList====="); + } + model.addAttribute("resultMsgSucFailList", resultMsgSucFailList); + + model.addAttribute("mjonMsgSentVO", mjonMsgSentVO); + + String stateType = mjonMsgSentVO.getStateType(); + // String pageUrl = "web/msgsent/MsgSentAllListAjax"; + String pageUrl = "web/msgsent/MsgSentAllListAjax"; + + if(stateType.equals("ready")) { + + pageUrl = "web/msgsent/MsgSentReadyListAjax"; + + }else if(stateType.equals("complete")) { + + pageUrl = "web/msgsent/MsgSentCompleteListAjax"; + + }else if(stateType.equals("fail")) { + + pageUrl = "web/msgsent/MsgSentFailListAjax"; + + } + + log.info(" :: pageUrl [{}]", pageUrl); return pageUrl; } diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index a9209770..9dbd1628 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -3,8 +3,9 @@ ========= ======= ================================================= 2021.06.21 우영두 --> - + + @@ -222,6 +223,220 @@ + + + + + + + + + + + + + + -

총 건

+

총 건

- 발송일시 + 발송일시
- 형태 + 형태
- 발송방식 + + 내용 + + + 발송건수
- - 결과 - - 건수 - - 금액 + 결과 + 금액 + 예약관리 + + + + 대기 + 성공 + 실패 + 예약 - - - - - - - - - - - - - - + - - - - - - - - - - + + + - + @@ -205,7 +180,7 @@ $(document).ready(function(){ - +

@@ -220,239 +195,40 @@ $(document).ready(function(){

- -

- - - WEB - - - API - - - - - - -

+ + +<%-- --%> + + ... + - - - + +

- - - - - -

- - - - - - - - 외 명 -

- - -

- - -

- - - - - - -

- - -

- - - - + +

- -

+ +

- - -

+ +

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

정상수신

+ +

0

- - - -

- - -

- - - - - -

- - - - - - 0 - - -

+ + 원 + - + - - - -

정상수신

- - - -

- - - - - - 0 - - -

- - - - -

수신오류

- - - -

- - - - - - 0 - - -

- - - - -

결과대기

- - - -

- - - - - - 0 - - -

- - - - - - -

실패/대기

- - - - -

- / -

- - -

- / -

- - - - -

- - - - - - 0 - - -

- - - 발송 내역이 없습니다. - - - 발송 내역이 없습니다. - + 발송 내역이 없습니다. diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax_advc_backup_20250115.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax_advc_backup_20250115.jsp new file mode 100644 index 00000000..59faa545 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax_advc_backup_20250115.jsp @@ -0,0 +1,479 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page import="itn.com.cmm.LoginVO" %> + + + +
+ +

총 건

+
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + 발송일시 +
+ +
+ 		형태 +
+ +
+ 		발송방식 +
+ +
+ 		내용받는사람 +
+ +
+ 		발신번호 +
+ +
+ 		+ 발송건수 +
+ +
+ 		결과건수금액
+ + + + + + + + + + + + + + + + + + + + + + + + <%-- + 20240906 추가 + 발송 대기 상태일 때만 원래 발송시간을 보여주고, 발송이 완료되면 발송 처리 완료 시간(reqDate)을 보여준다. + 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 + --%> +

+ + +

+ + + + + +

+ + + 		+

+ + + 장문 + + + 그림 + + + 단문 + + +

+ 		+

+ + + WEB + + + API + + + - + + +

+ 		+ + + + + + + +

+ + + + + + + + 외 명 +

+ + +

+ + +

+ + + + + + +

+ + +

+ + + + + 		+

+ 		+

+ 		+

정상수신

+ 		+ + +

+ + +

+ + + 		+

+ + + + + + 0 + + +

+ 		+

정상수신

+ 		+

+ + + + + + 0 + + +

+ 		+

수신오류

+ 		+

+ + + + + + 0 + + +

+ 		+

결과대기

+ 		+

+ + + + + + 0 + + +

+
+

실패/대기

+ 		+ + +

+ / +

+ + +

+ / +

+ + + 		+

+ + + + + + 0 + + +

+
발송 내역이 없습니다.발송 내역이 없습니다.
+
+
+
+ + + + + +
+
+ + +
+
+ +
    + +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index 2769b35e..6021b6f0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -744,10 +744,10 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) } //발송결과 - 대기/성공/실패 -function subContent(p_content_no){ +function subContent(){ var sendData = $(document.listForm).serializeArray(); - var v_html_pre = '' + /* var v_html_pre = '
' + '' + '' + '' @@ -766,8 +766,8 @@ function subContent(p_content_no){ + '' + '' + '' - + '
구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표
LOADING...
'; - + + ''; + */ var v_html_pre = '' + '
' + '
' From 9e56bc1ee00be98322b74769ad71cfff7f66ec37 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Fri, 17 Jan 2025 18:25:28 +0900 Subject: [PATCH 03/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B0=9C=EC=84=A0=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/util/FileUtil.java | 79 ++- .../msgsent/service/MjonMsgDetailSentVO.java | 39 ++ .../msgsent/service/MjonMsgSentService.java | 4 + .../msgsent/service/impl/MjonMsgSentDAO.java | 11 + .../service/impl/MjonMsgSentServiceImpl.java | 73 ++- .../msgsent/web/MjonMsgSentController.java | 36 ++ .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 59 +++ .../jsp/web/msgsent/MsgSentAllListAjax.jsp | 44 +- .../jsp/web/msgsent/MsgSentDetailView.jsp | 463 ++++++++++++++++++ 9 files changed, 752 insertions(+), 56 deletions(-) create mode 100644 src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java create mode 100644 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp diff --git a/src/main/java/itn/com/cmm/util/FileUtil.java b/src/main/java/itn/com/cmm/util/FileUtil.java index 34a52cc1..319c8698 100644 --- a/src/main/java/itn/com/cmm/util/FileUtil.java +++ b/src/main/java/itn/com/cmm/util/FileUtil.java @@ -25,45 +25,44 @@ import org.apache.commons.lang3.StringUtils; */ public final class FileUtil { - /** - * @methodName : downLoad - * @author : 이호영 - * @date : 2023.04.06 - * @description : 파일 다운로드 - * @param response - * @param fileInfo - * @param fileName - * @throws Exception - */ - public static void downLoad(HttpServletResponse response, String fileInfo, String fileNameP) throws Exception { - - - try { - String path = fileInfo; // 경로에 접근할 때 역슬래시('\') 사용 - - File file = new File(path); - - String fileName = ""; - if(StringUtils.isNotEmpty(fileNameP)) - fileName = URLEncoder.encode(fileNameP,"UTF-8").replaceAll("\\+", "%20"); - else - fileName = file.getName(); - - response.setHeader("Content-Disposition", "attachment;filename=" + fileName); // 다운로드 되거나 로컬에 저장되는 용도로 쓰이는지를 알려주는 헤더 - - FileInputStream fileInputStream = new FileInputStream(path); // 파일 읽어오기 - OutputStream out = response.getOutputStream(); - - int read = 0; - byte[] buffer = new byte[1024]; - while ((read = fileInputStream.read(buffer)) != -1) { // 1024바이트씩 계속 읽으면서 outputStream에 저장, -1이 나오면 더이상 읽을 파일이 없음 - out.write(buffer, 0, read); - } - - } catch (Exception e) { - throw new Exception("download error"); - } + /** + * @methodName : downLoad + * @author : 이호영 + * @date : 2023.04.06 + * @description : 파일 다운로드 + * @param response + * @param fileInfo + * @param fileName + * @throws Exception + */ + public static void downLoad(HttpServletResponse response, String fileInfo, String fileNameP) throws Exception { + + + try { + String path = fileInfo; // 경로에 접근할 때 역슬래시('\') 사용 + + File file = new File(path); + + String fileName = ""; + if(StringUtils.isNotEmpty(fileNameP)) + fileName = URLEncoder.encode(fileNameP,"UTF-8").replaceAll("\\+", "%20"); + else + fileName = file.getName(); + + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); // 다운로드 되거나 로컬에 저장되는 용도로 쓰이는지를 알려주는 헤더 + + FileInputStream fileInputStream = new FileInputStream(path); // 파일 읽어오기 + OutputStream out = response.getOutputStream(); + + int read = 0; + byte[] buffer = new byte[1024]; + while ((read = fileInputStream.read(buffer)) != -1) { // 1024바이트씩 계속 읽으면서 outputStream에 저장, -1이 나오면 더이상 읽을 파일이 없음 + out.write(buffer, 0, read); + } + } catch (Exception e) { + throw new Exception("download error"); + } } - - + + } diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java new file mode 100644 index 00000000..d7c3c032 --- /dev/null +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java @@ -0,0 +1,39 @@ +package itn.let.mjo.msgsent.service; + +import java.io.Serializable; +import java.util.List; + +import itn.let.cmm.vo.FileInfoVO; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MjonMsgDetailSentVO implements Serializable{ + + private static final long serialVersionUID = 1L; + + + private String msgGroupId; + private String reqDate; + private String msgGroupCnt; + private String reserveYn; + private String callFrom; + private String userId; + private String smsTxt; + private String subject; + private String msgType; + private String fileCnt; + private String msgKind; + private String sentDate; + private String filePath1; + private String filePath2; + private String filePath3; + + private String callTo; + private String statusTxt; + + + // FileInfo 리스트 필드 추가 + private List fileInfos; +} diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java index 09eff10f..76300d39 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java @@ -60,5 +60,9 @@ public interface MjonMsgSentService { public int countAllMsgSentList(MjonMsgSentVO mjonMsgSentVO); + public Map selectAllMsgSentDetailView(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception; + + public List findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO); + } diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java index e749d110..724d74d0 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java @@ -9,6 +9,7 @@ import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.block.service.MjonBlockVO; +import itn.let.mjo.msgsent.service.MjonMsgDetailSentVO; import itn.let.mjo.msgsent.service.MjonMsgSWFDTO; import itn.let.mjo.msgsent.service.MjonMsgSentVO; @@ -175,5 +176,15 @@ public class MjonMsgSentDAO extends EgovAbstractDAO { return (MjonMsgSWFDTO) select("MjonMsgSentDAO.findBySWF", msgGroupId); } + + public MjonMsgDetailSentVO selectAllMsgSentDetailView(MjonMsgDetailSentVO mjonMsgDetailSentVO) { + // TODO Auto-generated method stub + return (MjonMsgDetailSentVO) select("MjonMsgSentDAO.selectAllMsgSentDetailView", mjonMsgDetailSentVO); + } + + public List findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) { + + return (List) list("MjonMsgSentDAO.findByMsgDetailListAjax", mjonMsgDetailSentVO); + } } diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index a8945faa..79931fe4 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -6,17 +6,21 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.annotation.Resource; +import org.apache.commons.io.FilenameUtils; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import itn.let.cmm.vo.FileInfoVO; import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.block.service.MjonBlockVO; +import itn.let.mjo.msgsent.service.MjonMsgDetailSentVO; import itn.let.mjo.msgsent.service.MjonMsgSWFDTO; import itn.let.mjo.msgsent.service.MjonMsgSentService; import itn.let.mjo.msgsent.service.MjonMsgSentVO; @@ -133,7 +137,66 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements return resultMap; } + + public Map selectAllMsgSentDetailView(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception{ + + Map resultMap = new HashMap(); + + // 목록 + MjonMsgDetailSentVO result = mjonMsgSentDAO.selectAllMsgSentDetailView(mjonMsgDetailSentVO); + + // 광고일떄 (광고)와 줄바꿈+무료거부 0808800858 삭제 + if("A".equals(result.getMsgKind())) { + result.setSmsTxt(result.getSmsTxt().replace("(광고)", "") + .replaceAll("\\s*무료거부 0808800858", "")); + } + + if(Integer.parseInt(result.getFileCnt()) > 0) + { + + List fileInfos = getFileInfo(result); + result.setFileInfos(fileInfos); + } + + + + + resultMap.put("result", result); + + return resultMap; + } + + + private List getFileInfo(MjonMsgDetailSentVO result) throws Exception { + + + List fileInfos = new ArrayList<>(); + + // 파일 경로 필드들을 배열로 관리 + String[] filePaths = { result.getFilePath1(), result.getFilePath2(), result.getFilePath3() }; + + for (String filePath : filePaths) { + if (filePath != null) { + // 파일 ID 추출 + + // 확장자 제외한 파일명 + String fileId = FilenameUtils.getBaseName(filePath); + + // 파일 정보 조회 + MjonMsgSentVO info = mjonMsgSentDAO.selectFileInfo(fileId); + + // FileInfo 객체 생성 및 추가 + FileInfoVO fileInfo = new FileInfoVO(); + fileInfo.setAtchFileId(info.getAtchFileId()); + fileInfo.setFileSn(info.getFileSn()); + + fileInfos.add(fileInfo); + } + } + return fileInfos; + + } @Override public int countAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) { @@ -299,4 +362,12 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements public MjonMsgSentVO selectFileInfo(String streFileId) throws Exception { return mjonMsgSentDAO.selectFileInfo(streFileId); } + + @Override + public List findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) { + + List list = mjonMsgSentDAO.findByMsgDetailListAjax(mjonMsgDetailSentVO); + + return list; + } } diff --git a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java index b4fed593..a97916c7 100644 --- a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java +++ b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java @@ -25,6 +25,8 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -41,12 +43,14 @@ import itn.com.cmm.service.EgovFileMngUtil; import itn.com.cmm.util.DateUtils; import itn.com.utl.fcc.service.EgovStringUtil; import itn.let.kakao.user.sent.service.KakaoSentService; +import itn.let.mail.service.StatusResponse; import itn.let.mjo.addr.service.AddrGroupService; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.addr.service.AddrService; import itn.let.mjo.addr.service.AddrVO; import itn.let.mjo.apikey.service.ApiKeyMngService; import itn.let.mjo.apikey.service.ApiKeyVO; +import itn.let.mjo.msgsent.service.MjonMsgDetailSentVO; import itn.let.mjo.msgsent.service.MjonMsgSentCntVO; import itn.let.mjo.msgsent.service.MjonMsgSentService; import itn.let.mjo.msgsent.service.MjonMsgSentVO; @@ -254,6 +258,35 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll return "web/msgsent/MsgSentView"; } + + + /** + * 발송관리 화면 + * @param searchVO + * @param model + * @return "/web/mjon/msgtxt/selectMsgTxtView.do" + * @throws Exception + */ + @RequestMapping(value= {"/web/mjon/msgsent/msgSentDetailView.do"}) + public String selectMsgSentDetailView(@ModelAttribute("searchVO") MjonMsgDetailSentVO mjonMsgDetailSentVO, + RedirectAttributes redirectAttributes, ModelMap model) throws Exception{ + + Map resultMap = mjonMsgSentService.selectAllMsgSentDetailView(mjonMsgDetailSentVO); + model.addAttribute("result", resultMap.get("result")); + + return "web/msgsent/MsgSentDetailView"; + } + + // 팩스 금일 발송통계 갱신 + @RequestMapping(value= {"/web/mjon/msgsent/findByMsgDetailListAjax.do"}) + public ResponseEntity findByMsgDetailListAjax(MjonMsgDetailSentVO mjonMsgDetailSentVO) throws Exception { + + + List resultList = mjonMsgSentService.findByMsgDetailListAjax(mjonMsgDetailSentVO); + + + return ResponseEntity.ok().body(new StatusResponse(HttpStatus.OK, "", resultList)); + } /** * 마이페이지 - 이용내역 - ajax @@ -712,6 +745,9 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll return "web/msgsent/MsgSentDetailPopAjax"; } + + + /** * 발송관리 문자 상세보기 내용 * @param searchVO diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index 9dbd1628..bb957cda 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -6,6 +6,7 @@ + @@ -283,6 +284,7 @@ + /* MjonMsgSentDAO.selectAllMsgSentDetailView */ + select + MGD.MSG_GROUP_ID as msgGroupId + , MGD.MSG_GROUP_CNT as msgGroupCnt + , MGD.RESERVE_YN as reserveYn + , MGD.CALL_FROM as callFrom + , MGD.USER_ID as userId + , MGD.SMS_TXT as smsTxt + , MGD.SUBJECT as subject + , MGD.REQ_DATE as reqdate + , MGD.MSG_TYPE as msgType + , MGD.MSG_KIND as msgKind + , MD.SENT_DATE as sentDate + , MD.FILE_CNT as fileCnt + , MD.FILE_PATH1 as filePath1 + , MD.FILE_PATH2 as filePath2 + , MD.FILE_PATH3 as filePath3 + from + MJ_MSG_GROUP_DATA MGD + inner join MJ_MSG_DATA MD on + MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID + and MGD.USER_ID = MD.USER_ID + where + MGD.MSG_GROUP_ID = #msgGroupId# + limit 1 + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index c251a4d9..201b5126 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -60,6 +60,19 @@ $(document).ready(function(){ }); + +function fn_sentDetailView(msgGroupId) { + // msgGroupId 값을 form에 설정 + $("#detailForm #msgGroupId").val(msgGroupId); + + // form을 해당 URL로 제출 + $("#detailForm").attr("action", "/web/mjon/msgsent/msgSentDetailView.do"); + $("#detailForm").submit(); +} + + + +

총 건

@@ -86,7 +99,6 @@ $(document).ready(function(){ - @@ -127,16 +139,15 @@ $(document).ready(function(){
- 결과 - 금액 - 예약관리 + 결과 + 금액(원) + 진행상황 대기 성공 실패 - 예약 @@ -196,10 +207,10 @@ $(document).ready(function(){

- -<%-- --%> - - ... +<%-- --%> + + + @@ -209,18 +220,17 @@ $(document).ready(function(){

-

+

-

- - -

0

+

원 - - + +

+ @@ -253,3 +263,7 @@ $(document).ready(function(){ + +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp new file mode 100644 index 00000000..18528c77 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -0,0 +1,463 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page import="itn.com.cmm.LoginVO" %> + + + + +
+ + +
+ +
+
+

발송결과 상세

+ +
+ + +
+ +
+ +
+
+
+

발송정보

+

+
+
+
+
발송일시
+
2024-07-18 15:25
+
+
+
형태
+
그림
+
+
+
발송건수
+
100건
+
+
+
발신번호
+
010-1234-5678
+
+
+
예약관리
+ +
+ +
+
+
+
+
발송요금
+
100원
+ +
+
+
+
+ + +
+
+
+

상세결과

+

+
+
+
+
+
전체건수
+
101건(100%)
+
+
+
+
+
성공건수
+
100건(100%)
+
+
+
+
+
+
+
대기건수
+
0건(0%)
+
+
+
+
+
실패건수
+
1건(100%)
+
+
+
+
+
+ + +
+
+ + +
+
+

* 전체 건수를 클릭하면 받는 사람 상세정보를 확인하실 수 있습니다.

+
+
+
+ + + +
+
+
+
+

미리보기

+ + +
+ + ${result.msgType == '4' + ? 'SMS' + : (result.fileCnt == '0' + ? 'LMS' + : 'MMS')} + + + + + +
+ +
+
+ +
+ &fileSn=" alt="발송된 그림문자 미리보기" style="width: 100%"> +
+ +
+
+ +

(광고)

+ +

+

+ +

무료 거부 080-0000-0000

+ +
+
+ +
+
+

※ 단말기 설정에 따라 다르게 보일 수 있습니다

+

+
+ +
+ + +
+ +
+ + +
+
+ +
+ + + + +
+
+
+

발송대상 리스트

+ +
+
+ +
+
+
발신번호
+
+
+
+ +
+ + + + + +
+ +
+ <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름 +
+ +
+ 		수신번호 +
+ +
+ 		상세결과 +
+ +
+
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
+ --%> +
+ +
+
+
+ + +
+
+ +
+
+ +
+ +
+
+ + From 01898701bf20ecc2ebd7cc8dad326f0966937ae3 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Fri, 17 Jan 2025 18:25:35 +0900 Subject: [PATCH 04/25] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/let/cmm/vo/FileInfoVO.java | 32 +++++++++++++++++++ .../jsp/web/msgsent/MsgSentDetailView.jsp | 30 ++--------------- 2 files changed, 34 insertions(+), 28 deletions(-) create mode 100644 src/main/java/itn/let/cmm/vo/FileInfoVO.java diff --git a/src/main/java/itn/let/cmm/vo/FileInfoVO.java b/src/main/java/itn/let/cmm/vo/FileInfoVO.java new file mode 100644 index 00000000..8c1b48c3 --- /dev/null +++ b/src/main/java/itn/let/cmm/vo/FileInfoVO.java @@ -0,0 +1,32 @@ +package itn.let.cmm.vo; + +import java.io.Serializable; + +import lombok.Getter; +import lombok.Setter; + +/** + * + * @author : 이호영 + * @fileName : FileInfoVO.java + * @date : 2025.01.17 + * @description : 파일 풀 경로에서 파일명만 가져와 ID 가져올때 사용하는 VO + * MjonMsgDetailSentVO 참고 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2025.01.17 이호영 최초 생성 + * + * + * + */ +@Getter +@Setter +public class FileInfoVO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String atchFileId; // 첨부파일 ID + private String fileSn; // 파일 순번 + +} diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp index 18528c77..81beb5a7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -6,30 +6,6 @@ <%@ page import="itn.com.cmm.LoginVO" %> - @@ -118,22 +189,7 @@ function fn_sentDetailView(msgGroupId) {
- 내용 - - 발송건수
@@ -154,51 +210,51 @@ function fn_sentDetailView(msgGroupId) { - + - - + + - + - + - + <%-- 20240906 추가 발송 대기 상태일 때만 원래 발송시간을 보여주고, 발송이 완료되면 발송 처리 완료 시간(reqDate)을 보여준다. 30분 딜레이 된 건으로 관리자 승인/취소 처리가 완료 되지 않은 건에 대해서 -30분 처리하여 원래 사용자가 보내려던 시간을 표시해줌 --%> -

+

-

+

-

+

- + 장문 - + 그림 @@ -208,34 +264,45 @@ function fn_sentDetailView(msgGroupId) {

-<%-- --%> -<%-- --%> -
- 예약 - 분할 - - + + 예약 + + + 분할 + + + +
-

+

-

+

-

+

-

+

- 원 + -

+ + + + + +

+ + + + @@ -244,7 +311,7 @@ function fn_sentDetailView(msgGroupId) { - 발송 내역이 없습니다. + 발송 내역이 없습니다. @@ -254,14 +321,14 @@ function fn_sentDetailView(msgGroupId) {
- - - - + + +<%-- --%> +<%-- --%>
- - + +<%-- --%>
@@ -273,3 +340,10 @@ function fn_sentDetailView(msgGroupId) {
+ + +
+ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp index 81beb5a7..5095a7c0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -16,7 +16,7 @@ $(document).ready(function(){ $tbDtailList = new Tabulator("#detailPopup", { height: "255px", width: "20%", - layout: "fitColumns", + layout: "fitDataStretch", // 데이터가 너비에 맞게 늘어나도록 설정 autoColumns: false, headerHozAlign: "center", validationMode: "highlight", @@ -24,6 +24,13 @@ $(document).ready(function(){ clipboardCopySelector: "table", clipboardPasteAction: "insert", // insert, update, replace columns: [ + { + title: "이름", + field: "addrNm", + hozAlign: "center", + headerHozAlign: "center", + width: 140 + }, { title: "휴대폰", field: "phone", @@ -43,12 +50,17 @@ $(document).ready(function(){ fn_getDetailList(); - /* - + $('#goPageBtn').click(function(){ + $("#goList").submit(); + }); + + + + + - */ }); @@ -90,6 +102,7 @@ function fn_setData(data){ data.forEach((row, index) => { resultData.push({ + // addrNm: row.addrNm, // 폰번호 phone: row.callTo, // 폰번호 result: row.statusTxt // 결과 메시지 추가 }); @@ -106,6 +119,17 @@ function fn_setData(data){
+
+ " /> + + + + + + + + +
@@ -290,7 +314,7 @@ function fn_setData(data){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index b788b73c..5be933e1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -15,7 +15,12 @@ var thisfuledtlday = ""; //당원 마지막일 $(document).ready(function(){ //초기 전체 리스트 페이지 보여주기 - linkPage(1); + linkPage($('#searchForm #pageIndex').val()); + + + fn_activateTab($('#searchForm #searchCondition01').val()) + fn_setActiveTab($('#searchForm #searchCondition02').val()) + var date = new Date() ; //이전달 첫날/마지막날 조회 @@ -28,12 +33,14 @@ $(document).ready(function(){ lastfuledday = lastfulstday + "/"+ new Date(date.getFullYear(), date.getMonth(), 0).getDate()+"" ; lastfulstday += "/01" ; } + console.log('lastfulstday: ', lastfulstday); //당월 첫날/마지막날 조회 thisfulstlday = date.getFullYear() + "/" ; thisfulstlday += date.getMonth()+1 < 10 ? "0"+ (date.getMonth()+1) : date.getMonth()+1+"" ; thisfuledtlday = thisfulstlday + "/"+ new Date(date.getFullYear(), date.getMonth()+1, 0).getDate()+""; thisfulstlday += "/01" ; + console.log('thisfulstlday: ', thisfulstlday); //3개월 이전 날짜 구해오기 @@ -55,6 +62,19 @@ $(document).ready(function(){ $(document).on('click', '.sort', function (){ listSortOrd(this); }); + + + // 탭 :: 전체 , 즉시, 예약 + $(document).on('click', '.sendKindBtn', function (){ + + // 클릭된 버튼의 data-info 값을 전달하여 함수 호출 + fn_activateTab($(this).data('info')); + + linkPage(1); + }); + + + //목록 정렬 항목 클릭 function listSortOrd(obj){ @@ -98,7 +118,18 @@ $(document).ready(function(){ }); - +//탭 활성화 처리 함수 +function fn_activateTab(tabInfo) { + // 1. data-info 값을 가진 버튼 요소 찾기 + var $button = $('.sendKindBtn[data-info="' + tabInfo + '"]'); + + // 2. 해당 버튼이 속한 탭 활성화 처리 + $button.closest('ul').find('.tab').removeClass('active'); + $button.closest('.tab').addClass('active'); + + // 3. hidden input 요소에 값 설정 + $('#searchCondition01').val(tabInfo); +} //캘린더에 날짜 입력해 주기 @@ -107,13 +138,13 @@ function setCalVal(val,targetObj){ } -//검색 버튼 실행 +//페이지 이동 실행 function linkPage(pageNo){ var form = document.searchForm; - var stateType = form.stateType.value; form.pageIndex.value = pageNo; - + console.log('form : ', form); + var sendData = $(document.searchForm).serializeArray(); $(".msgSentAllLoad").html('
LOADING...
'); $(".msgSentAllLoad").load("/web/mjon/msgsent/selectMsgSentListViewAjax.do", sendData ,function(response, status, xhr){ @@ -137,120 +168,73 @@ function fnDelete(){ } }); - if(msgId.length > 0){ + console.log('msgId : ', msgId); + + if(msgId.length < 1){ + alert("삭제할 문자를 선택해 주세요."); + return false; + } //22.04.25 구글 독스 alert 기준으로 이지우가 수정 /* if(confirm("선택한 발송문자를 삭제하시겠습니까? 삭제된 문자는 복구가 불가능 합니다.")) */ - if(confirm("선택한 목록을 삭제하시겠습니까?")){ + if(confirm("선택한 목록을 삭제하시겠습니까?\n삭제한 목록은 복구가 불가합니다.")){ document.searchForm.msgGroupIdList.value = msgId; var sendData = $(document.searchForm).serializeArray(); $(".msgSentAllLoad").load("/web/mjon/msgsent/deleteMsgSentDataAjax.do", sendData ,function(response, status, xhr){ }); - -// var form = document.searchForm; -// form.action="/web/mjon/msgsent/selectMsgSentView.do"; -// form.submit(); + + alert("삭제되었습니다."); + var form = document.searchForm; + form.action="/web/mjon/msgsent/selectMsgSentView.do"; + form.submit(); } - - }else{ - - alert("삭제할 문자를 선택해 주세요."); - return false; - - } - -} - -//상세보기 버튼 실행 -function fnRevDetailPop(msgGroupId, msgId, fileCnt){ - document.resPopForm.msgGroupId.value = msgGroupId; - document.resPopForm.msgId.value = msgId; - var sendData = $(document.resPopForm).serializeArray(); - - var form = document.searchForm; - if (form.listType.value == "privateList") { - $("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailData2Ajax.do", sendData ,function(response, status, xhr){ - }); - } - else { - $("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailDataAjax.do", sendData ,function(response, status, xhr){ - }); - } - -} - -function fnListLoad(pageType, tabNum){ - - var form = document.searchForm; - var $tab = $(".table_tab_wrap li").eq(tabNum); // - $tab.addClass("active"); - $tab.find("button").attr("title", "선택됨"); - $tab.siblings("li.tab").removeClass("active"); - $tab.siblings("li.btn_tab").removeClass("active"); - $tab.siblings("li.tab").find("button").removeAttr("title"); - - if(pageType == 'all'){ - - form.stateType.value = "all"; - $(".tab_depth1").show(); - - }else if(pageType == 'ready'){ - - form.stateType.value = "ready"; - $(".tab_depth1").show(); - - }else if(pageType == 'complete'){ - - form.stateType.value = "complete"; - $(".tab_depth1").show(); - - }else if(pageType == 'fail'){ - form.listType.value = "privateList"; - form.stateType.value = "fail"; - $(".tab_depth1").hide(); - - } - - /* if(pageType == 'fail'){//발송실패의 경우 모두 개인별 건수를 보여준다. - - form.listType.value = 'privateList'; - - } */ - - linkPage(1); } // 전체/단문/장문/그림 탭 선택 처리 -function fnTabLoad(tabType, tabNum){ +function fnTabLoad(tabType){ + + //즉시, 예약 탭은 전체로 바꿔야함 + fn_activateTab(''); + var form = document.searchForm; - - form.tabType.value = tabType; - - //해당 탭의 전체 리스트 내역으로 불러오기 - fnListLoad('all', '0'); - var n=tabNum+1; - - //탭 선택 CSS 처리 - var $tab = $(".list_tab_wrap2 li:nth-child("+n+")"); - var $tabPrev = $(".list_tab_wrap2 li:nth-child("+n+")").prev("li") - $tab.addClass("active"); - $tab.find("button").attr("title", "선택됨"); - $tab.siblings("li.tab").removeClass("active"); - $tab.siblings("li.tab").find("button").removeAttr("title"); - $tab.siblings("li:not(li:last-child)").find("button").css("border-right","1px solid #e5e5e5"); - $tabPrev.find("button").css("border-right","0"); + // 탭 선택 CSS 처리 + fn_setActiveTab(tabType); + linkPage(1); } +//fnTabLoad 함수에 대한 탭 선택 CSS 처리 함수 +function fn_setActiveTab(tabType) { + var $tabs = $(".list_tab_wrap2 li"); // 전체 탭 리스트 + $tabs.removeClass("active").find("button").removeAttr("title"); // 모든 탭 초기화 + + // tabType에 해당하는 탭 찾기 + $tabs.each(function() { + var buttonText = $(this).find("button").text(); + if ((tabType === '' && buttonText === "전체") || + (tabType === 'S' && buttonText === "단문(SMS)") || + (tabType === 'L' && buttonText === "장문(LMS)") || + (tabType === 'M' && buttonText === "그림(MMS)")) { + $(this).addClass("active").find("button").attr("title", "선택됨"); + } + }); + + $('#searchCondition02').val(tabType); +} + + function fnSearch(pageNo){ - /* if(!fn_G_cmndataValueChk("startDate", "endDate", 3)){ + /* if(!fn_G_cmndataValueChk("searchStartDate", "searchEndDate", 3)){ return; }; */ + + fn_activateTab('') + fn_setActiveTab('') console.log('fnSearch') var form = document.searchForm; @@ -274,27 +258,8 @@ function prevMonth(month) { function fnExcelDownLoad(pageType, tabType){ var form = document.searchForm; - var loginVO = '${LoginVO}'; - - form.stateType.value = pageType; - form.tabType.value = tabType; - - if(loginVO == "" || loginVO == null){ - alert("로그인 후 이용이 가능합니다."); - return false; - } // 기간검색 유효성 검사 - if ($("#startDate").val() == "" || $("#endDate").val() == "") { - alert("기간 설정을 먼저해주세요. 최근 3개월까지만 다운로드 가능합니다.") - return false; - } - else { - if ($("#startDate").val() < prevMonth(3)) { - alert("최근 3개월까지만 다운로드 가능합니다.") - return false; - } - } if(confirm("엑셀 다운로드를 하시겠습니까?")){ @@ -305,21 +270,6 @@ function fnExcelDownLoad(pageType, tabType){ } -$(document).on('click', '.msgGgoupList', function(){ - - var form = document.searchForm; - form.listType.value = "groupList"; - linkPage(1); - -}); - -$(document).on('click', '.msgPrivateList', function(){ - - var form = document.searchForm; - form.listType.value = "privateList"; - linkPage(1); - -}); function fnDeleteAddrNo(listType){ @@ -537,7 +487,7 @@ function fnMsgSFDetailList(msgGroupId, resultType){ } -/* 사용내역서 클릭 시 내역서 새창 팝업 오픈 */ +/* 사용내역서 클릭 시 내역서 새창 팝업 오픈 function fnShowPrintPopup(tabType, type) { //만들려는 팝업의 크기 var popup_wid = '840'; @@ -553,7 +503,7 @@ function fnShowPrintPopup(tabType, type) { $("#searchForm").attr({"action":"/web/mjon/msgsent/printMsgSentDataAjax.do", "method":"post"}).submit(); } - +*/ function addrGroupDuplCnt() { document.searchForm.addrGrpNm.value = $('#grpNm').val(); @@ -744,9 +694,10 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) } //발송결과 - 대기/성공/실패 -function subContent(p_content_no){ +function subContent(){ - var sendData = $(document.listForm).serializeArray(); + var sendData = $(document.searchForm).serializeArray(); + console.log('sendData :: ', sendData); var v_html_pre = '' + '' + '' @@ -891,15 +842,19 @@ function subContent(p_content_no){ --%> - + + " /> + " /> " /> - + + +
@@ -917,36 +872,20 @@ function subContent(p_content_no){
기간선택
- + ~ - +
- - - + + +
- <%-- - --%> - - - - - - +
@@ -962,10 +901,10 @@ function subContent(p_content_no){
    -
    • -
    • -
    • -
    • +
    • +
    • +
    • +
@@ -983,9 +922,15 @@ function subContent(p_content_no){
    -
    • -
    • -
    • +
  • + +
    • +
  • + +
    • +
  • + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp index 73127188..32d0ef40 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp @@ -25,14 +25,14 @@ $(document).ready(function(){ -
+

전체

- +

건

-
-

WEB건

+
+<%--

WEB건

--%>
대기
건
@@ -46,7 +46,7 @@ $(document).ready(function(){
건
- + <%--

API건

@@ -62,16 +62,16 @@ $(document).ready(function(){
건
- + --%>

단문(SMS)

- +

건

-
-

WEB건

+
+<%--

WEB건

--%>
대기
건
@@ -85,7 +85,7 @@ $(document).ready(function(){
건
- + <%--

API건

@@ -101,16 +101,16 @@ $(document).ready(function(){
건
- + --%>

장문(LMS)

- +

건

-
-

WEB건

+
+<%--

WEB건

--%>
대기
건
@@ -124,7 +124,7 @@ $(document).ready(function(){
건
- + <%--

API건

@@ -140,16 +140,16 @@ $(document).ready(function(){
건
- + --%>

그림(MMS)

- +

건

-
-

WEB건

+
+<%--

WEB건

--%>
대기
건
@@ -163,7 +163,7 @@ $(document).ready(function(){
건
- + <%--

API건

@@ -179,5 +179,5 @@ $(document).ready(function(){
건
- + --%>
\ No newline at end of file From ddc143714164756e26d2536cb29bdb7d7ac5f63a Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Fri, 31 Jan 2025 09:30:48 +0900 Subject: [PATCH 08/25] =?UTF-8?q?4891=5F=EB=B0=9C=EC=86=A1=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=5F=EC=86=8D=EB=8F=84=EA=B0=9C=EC=84=A0=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 8 ++++---- .../webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 59a92558..95824e6a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -215,12 +215,12 @@ function fnReservCancel(msgGroupId){
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp index 5095a7c0..071eaa74 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -241,7 +241,7 @@ function fn_setData(data){
-

미리보기

+

문자내용

구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표
- - + + - + - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
이름 -
- -
- 		수신번호 -
- -
- 		상세결과 -
- -
-
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
홍길동010-1234-5678성공
- --%> +
-
-
+
+ - +
-
From a021a3670e549830f9f89859adc3a369dd6fd735 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 5 Feb 2025 10:41:30 +0900 Subject: [PATCH 10/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgsent/service/MjonMsgDetailSentVO.java | 1 + .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 1 + .../jsp/web/msgsent/MsgSentAllListAjax.jsp | 2 - .../jsp/web/msgsent/MsgSentDetailView.jsp | 175 ++++++++++++++++-- 4 files changed, 162 insertions(+), 17 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java index 93d49f51..3bad5431 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java @@ -20,6 +20,7 @@ public class MjonMsgDetailSentVO extends UserDefaultVO{ private String msgGroupCnt; private String reserveYn; private String reserveCYn; + private String canceldate; private String callFrom; private String userId; private String smsTxt; diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index 204ff38f..55276a44 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -355,6 +355,7 @@ , MGD.MSG_GROUP_CNT as msgGroupCnt , MGD.RESERVE_YN as reserveYn , MGD.RESERVE_C_YN as reserveCYn + , DATE_FORMAT(MGD.CANCELDATE, '%Y-%m-%d %H:%i') as canceldate , MGD.CALL_FROM as callFrom , MGD.USER_ID as userId , MGD.SMS_TXT as smsTxt diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 95824e6a..68fff760 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -344,6 +344,4 @@ function fnReservCancel(msgGroupId){ - - diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp index 512cae4d..1e98deb2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -222,20 +222,136 @@ function fn_downloadFilteredExcel() { data: filteredData // 필터링된 데이터만 다운로드 }); } + +/** + * @ 예약 취소 + */ +function fnReservCancel(msgGroupId){ + + var form = document.resCancelForm; + var loginVO = '${LoginVO}'; + + form.msgGroupId.value = msgGroupId; + + if(loginVO == "" || loginVO == null){ + + alert("로그인 후 이용이 가능합니다."); + return false; + + } + console.log('msgGroupId : ', msgGroupId); + var data = new FormData(form); + url = "/web/mjon/reservmsg/deleteReservMsgCancelDataAjax.do"; + + if(confirm("정말 예약을 취소하시겠습니까?")){ + + $.ajax({ + type: "POST", + url: url, + data: data, + dataType:'json', + async: true, + processData: false, + contentType: false, + cache: false, + success: function (returnData, status) { + if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나 + if("fail"==returnData.result){ + alert(returnData.message); + return false; + } + + alert("예약 발송이 정상적으로 취소 되었습니다."); + + location.reload(true); + + } else if(status== 'fail'){ + alert(returnData.message); + } + }, + error: function (e) { + alert("예약 취소에 실패하였습니다."); console.log("ERROR : ", e); + }, + beforeSend : function(xmlHttpRequest) { + //로딩창 show + $('.loading_layer').addClass('active'); + }, + complete : function(xhr, textStatus) { + //로딩창 hide + $('.loading_layer').removeClass('active'); + } + }); + + } + +} + +/** + * @문자 재전송 + */ +function fnMjMsgReSendAll(msgGroupId + , replaceCnt, electionCnt, advertisementCnt + ) { + + + + var form = document.reSendAllForm; + form.msgResendAllFlag.value = "Y"; + form.msgResendAllGroupId.value = msgGroupId; + + if (replaceCnt > 0) { + if (confirm("특정문구 일괄변환 문자(치환문자)의 경우 문자내용은 재전송할 수 없고 받는 사람 목록만 불러올 수 있습니다.\n받는사람 목록을 불러올까요?")) { + // 광고문자 + form.msgResendAllReplaceYn.value = "Y"; + if (electionCnt > 0) { + form.action="/web/mjon/msgcampain/selectMsgDataView.do"; + } + else { + if (advertisementCnt > 0) { + // 광고문자 + form.msgResendAllAdvertiseYn.value = "Y"; + form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do"; + } + else + { + form.action="/web/mjon/msgdata/selectMsgDataView.do"; + } + } + form.submit(); + } + } + else { + var title = ""; + if (electionCnt > 0) { + title = "선거문자발송"; + } + else { + title = "문자발송"; + } + + if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는 사람 목록 확인후 발송해주세요.")) { + if (electionCnt > 0) { + form.action="/web/mjon/msgcampain/selectMsgDataView.do"; + } + else { + if (advertisementCnt > 0) { + // 광고문자 + form.msgResendAllAdvertiseYn.value = "Y"; + form.action="/web/mjon/msgdata/excel/selectMsgExcelDataView.do"; + } + else + { + form.action="/web/mjon/msgdata/selectMsgDataView.do"; + } + } + form.submit(); + } + } +} +
-
- " /> - - - - - - - - -
@@ -255,7 +371,7 @@ function fn_downloadFilteredExcel() {

발송정보

-

+

@@ -270,10 +386,12 @@ function fn_downloadFilteredExcel() {
${result.regDate }
+
제목
${result.subject }
+
형태
@@ -311,11 +429,12 @@ function fn_downloadFilteredExcel() { - -
+ + 예약취소() + @@ -526,5 +645,31 @@ function fn_downloadFilteredExcel() {
- + + + +
+ " /> + + + + + + + + +
+ + +
+ +
+ + +
+ + + + +
From d6bed63fec0236e78b6d21a9f1f81913f2872919 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 6 Feb 2025 11:56:54 +0900 Subject: [PATCH 11/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/addr/service/AddrService.java | 4 + .../let/mjo/addr/service/impl/AddrDAO.java | 4 + .../addr/service/impl/AddrServiceImpl.java | 55 ++ .../itn/let/mjo/addr/web/AddrController.java | 50 ++ .../msgdata/web/MjonMsgDataController.java | 4 +- .../msgsent/service/MjonMsgDetailSentVO.java | 1 + .../msgsent/service/impl/MjonMsgSentDAO.java | 4 + .../service/impl/MjonMsgSentServiceImpl.java | 84 ++- .../sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml | 15 +- .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 3 + .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 8 + .../jsp/web/msgsent/MsgSentDetailView.jsp | 522 +++++++++++++----- .../WEB-INF/jsp/web/msgsent/MsgSentView.jsp | 1 + 13 files changed, 599 insertions(+), 156 deletions(-) diff --git a/src/main/java/itn/let/mjo/addr/service/AddrService.java b/src/main/java/itn/let/mjo/addr/service/AddrService.java index ea1179a2..ad8f1b03 100644 --- a/src/main/java/itn/let/mjo/addr/service/AddrService.java +++ b/src/main/java/itn/let/mjo/addr/service/AddrService.java @@ -109,4 +109,8 @@ public interface AddrService { void deleteAddr_advc(AddrGroupVO addrGroupVO) throws Exception; int getAddrCount(AddrGroupVO addrGroupVO) throws Exception; + + StatusResponse insertByAddrGrpDataAndAddrDataAjax(AddrVO addrVO) throws Exception; + + StatusResponse deleteAddrNoDataAjax(AddrVO addrVO) throws Exception; } diff --git a/src/main/java/itn/let/mjo/addr/service/impl/AddrDAO.java b/src/main/java/itn/let/mjo/addr/service/impl/AddrDAO.java index 7e5a1bd2..d3be405f 100644 --- a/src/main/java/itn/let/mjo/addr/service/impl/AddrDAO.java +++ b/src/main/java/itn/let/mjo/addr/service/impl/AddrDAO.java @@ -292,5 +292,9 @@ public class AddrDAO extends EgovAbstractDAO { return (Integer)select("AddrDAO.getAddrCount", addrVO); } + public int deleteAddrPhoneNo(AddrVO addrVO) { + return update("AddrDAO.deleteAddrPhoneNo", addrVO); + } + } diff --git a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java index f1437a01..777fa0a8 100644 --- a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java +++ b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java @@ -34,6 +34,8 @@ import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.addr.service.AddrService; import itn.let.mjo.addr.service.AddrTransHistVO; import itn.let.mjo.addr.service.AddrVO; +import itn.let.mjo.msgsent.service.MjonMsgSentVO; +import lombok.extern.slf4j.Slf4j; /** * 주소록 관리를 위한 서비스 구현 클래스 @@ -49,6 +51,7 @@ import itn.let.mjo.addr.service.AddrVO; * 2021.04.08 ITN 최초 생성 * */ +@Slf4j @Service("AddrService") public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrService { @@ -644,5 +647,57 @@ public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrSer return aa; } + + @Override + public StatusResponse insertByAddrGrpDataAndAddrDataAjax(AddrVO addrVO) throws Exception { + + String userId = addrVO.getMberId(); + + AddrGroupVO addrGroupVO = new AddrGroupVO(); + addrGroupVO.setAddrGrpNm(addrVO.getAddrGrpNm()); + addrGroupVO.setMberId(userId); + addrGroupVO.setFrstRegisterId(userId); + + int usedCnt = addrGroupDAO.selectDuplAddrGroupCnt(addrGroupVO); + if(usedCnt > 0) { + return new StatusResponse(HttpStatus.BAD_REQUEST, "이미 등록되어있는 그룹이름입니다.", LocalDateTime.now()); + } + + String addrGrpId = addrGroupDAO.insertAddrGroup(addrGroupVO); + + + + List addrDataInfo = new ArrayList(); + + for(String phone : addrVO.getAddrPhones()) { + AddrVO addrTempVO = new AddrVO(); + addrTempVO.setAddrPhoneNo(phone); + addrTempVO.setAddrGrpId(addrGrpId); + addrTempVO.setBookmark("N"); //북마크 : N + addrTempVO.setFrstRegisterId(userId); + addrTempVO.setMberId(userId); + addrDataInfo.add(addrTempVO); + } + + int resultCnt = addrDAO.insertAddrList(addrDataInfo); + + + + return new StatusResponse(HttpStatus.OK, "총" + resultCnt + "건의 주소록 등록이 완료되었습니다.", addrVO); + + } + + @Override + public StatusResponse deleteAddrNoDataAjax(AddrVO addrVO) throws Exception { + +// AddrPhones + //아이디 저장 + + //주소록 디비에서 연락처 정보를 delete 시킴 + int resultCnt = addrDAO.deleteAddrPhoneNo(addrVO); + + + return new StatusResponse(HttpStatus.OK, "총 " + resultCnt + "건의 주소록을 삭제하였습니다.", addrVO); + } } diff --git a/src/main/java/itn/let/mjo/addr/web/AddrController.java b/src/main/java/itn/let/mjo/addr/web/AddrController.java index 2f04ae77..2e0f2ef9 100644 --- a/src/main/java/itn/let/mjo/addr/web/AddrController.java +++ b/src/main/java/itn/let/mjo/addr/web/AddrController.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.OutputStream; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -31,10 +32,13 @@ import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; @@ -52,12 +56,14 @@ import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; import itn.let.fax.addr.service.FaxAddrVO; +import itn.let.mail.service.StatusResponse; import itn.let.mjo.addr.service.AddrGroupService; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.addr.service.AddrService; import itn.let.mjo.addr.service.AddrTransHistVO; import itn.let.mjo.addr.service.AddrVO; import itn.let.mjo.msgdata.service.PhoneVO; +import lombok.extern.slf4j.Slf4j; /** * 주소록 관한 controller 클래스를 정의한다. @@ -75,6 +81,7 @@ import itn.let.mjo.msgdata.service.PhoneVO; * * */ +@Slf4j @Controller public class AddrController { @@ -2223,6 +2230,49 @@ public class AddrController { return modelAndView; } + + @RequestMapping(value = {"/web/mjon/addr/insertByAddrGrpDataAndAddrDataAjax.do"}) + public ResponseEntity insertByAddrGrpDataAndAddrDataAjax(@RequestBody AddrVO addrVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(userId == null) { + if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + } + + log.info(" + addrVO.getAddrPhones() :: [{}]", addrVO.getAddrPhones().length); + log.info(" + addrVO.getAddrGrpNm() :: [{}]", addrVO.getAddrGrpNm()); + addrVO.setMberId(userId); + + + return ResponseEntity.ok().body(addrService.insertByAddrGrpDataAndAddrDataAjax(addrVO)); + } + + @RequestMapping(value = {"/web/mjon/addr/deleteAddrNoDataAjax.do"}) + public ResponseEntity deleteAddrNoDataAjax(@RequestBody AddrVO addrVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(userId == null) { + if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + } + + addrVO.setMberId(userId); + + return ResponseEntity.ok().body(addrService.deleteAddrNoDataAjax(addrVO)); + } + + public boolean getNameRepLenChk(String type, String value) { diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 79b24d41..77e3c526 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -114,8 +114,9 @@ import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.MberManageVO; import itn.let.uss.umt.service.UserManageVO; import itn.let.utl.sim.service.EgovClntInfo; +import lombok.extern.slf4j.Slf4j; - +@Slf4j @Controller public class MjonMsgDataController { @@ -816,6 +817,7 @@ public class MjonMsgDataController { mjonMsgDataVO.setMsgSeqList(tempList); + log.info("==================================================="); List resultList = mjonMsgDataService.selectReSendMsgDataList(mjonMsgDataVO); //문자발송 이미지 처리 - 사용하지 않아서 주석처리함. diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java index 3bad5431..8e1a53ac 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgDetailSentVO.java @@ -53,6 +53,7 @@ public class MjonMsgDetailSentVO extends UserDefaultVO{ private String statusCd; // 진행상태 코드 private String divideYN; + private String divideText; private int diffMin; private String totPrice; diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java index 724d74d0..7e1e84ae 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java @@ -186,5 +186,9 @@ public class MjonMsgSentDAO extends EgovAbstractDAO { return (List) list("MjonMsgSentDAO.findByMsgDetailListAjax", mjonMsgDetailSentVO); } + + public List findByReqDateWhereMsgGroupId(String msgGroupId) { + return (List) list("MjonMsgSentDAO.findByReqDateWhereMsgGroupId", msgGroupId); + } } diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index 9e044cfe..bbc5f3f1 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -4,9 +4,12 @@ import java.io.OutputStream; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -126,13 +129,21 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements Map resultMap = new HashMap(); - System.out.println("mjonMsgSentVO.getSearchConditionSite() :: "+ mjonMsgSentVO.getSearchConditionSite()); // 목록 List resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO); + // 내용이 없고 이미지만 있을 경우 + resultList.stream().forEach(t->{ + log.info("+ t.getMsgKind() : [{}]",t.getMsgType()); + if("6".equals(t.getMsgType()) + && StringUtils.isEmpty(t.getSmsTxt()) + && !"0".equals(t.getFileCnt()) + ) { + t.setSmsTxt("이미지"); + } + }); + // groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴 - // TODO : 분할여부는 예약일 때만 가져오게 해야되는지 검토 필요 - resultList = makeDetailFunction(resultList); /* @@ -169,8 +180,8 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements resultVO.setResultSValue(updatedVO.getResultSValue()); // 성공건수 resultVO.setResultWValue(updatedVO.getResultWValue()); // 대기건수 resultVO.setResultFValue(updatedVO.getResultFValue()); // 실패건수 - resultVO.setTotPrice(updatedVO.getTotPrice()); - resultVO.setDivideYN(updatedVO.getDivideYN()); + resultVO.setTotPrice(updatedVO.getTotPrice()); // 총 발송 금액 (성공건수 * 개별금액) + resultVO.setDivideYN(updatedVO.getDivideYN()); // 분할 여부 // 퍼센트 계산 실행 @@ -182,21 +193,21 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements // 진행상태 코드화 String statusCode = getStatusCode(MjonMsgSentVO.builder() - .reserveCYn(resultVO.getReserveCYn()) - .reserveYn(resultVO.getReserveYn()) - .msgGroupCnt(resultVO.getMsgGroupCnt()) - .resultSValue(resultVO.getResultSValue()) - .resultWValue(resultVO.getResultWValue()) - .resultFValue(resultVO.getResultFValue()) - .diffMin(resultVO.getDiffMin()) - .build()); - log.info(" ++ statusCode :: [{}]" ,statusCode); + .reserveCYn(resultVO.getReserveCYn()) + .reserveYn(resultVO.getReserveYn()) + .msgGroupCnt(resultVO.getMsgGroupCnt()) + .resultSValue(resultVO.getResultSValue()) + .resultWValue(resultVO.getResultWValue()) + .resultFValue(resultVO.getResultFValue()) + .diffMin(resultVO.getDiffMin()) + .build()); + resultVO.setStatusCd(statusCode); // 결과 출력 - System.out.println("성공률: " + returnMap.get("successPct")); - System.out.println("대기율: " + returnMap.get("waitingPct")); - System.out.println("실패율: " + returnMap.get("failedPct")); +// log.info("성공률: [{}]", returnMap.get("successPct")); +// log.info("대기율: [{}]", returnMap.get("waitingPct")); +// log.info("실패율: [{}]", returnMap.get("failedPct")); // 광고일떄 (광고)와 줄바꿈+무료거부 0808800858 삭제 @@ -205,13 +216,19 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements .replaceAll("\\s*무료거부 0808800858", "")); } + // 그림문자일 경우 그림정보 가져오기 if(StringUtils.isNotEmpty(resultVO.getFileCnt()) && Integer.parseInt(resultVO.getFileCnt()) > 0) { - List fileInfos = getFileInfo(resultVO); resultVO.setFileInfos(fileInfos); } + // 분할문자인 경우 + if("Y".equals(resultVO.getDivideYN())) { + String divideText = calculateBatchInfo(resultVO); + resultVO.setDivideText(divideText); + } + @@ -221,6 +238,37 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements } + private String calculateBatchInfo(MjonMsgDetailSentVO resultVO) { + + String msgGroupId = resultVO.getMsgGroupId(); + + + List requestTimes = mjonMsgSentDAO.findByReqDateWhereMsgGroupId(msgGroupId); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S"); + Map timeCountMap = new LinkedHashMap<>(); + + // REQ_DATE 그룹화 (같은 시간대 몇 건인지) + for (String timeStr : requestTimes) { + LocalDateTime time = LocalDateTime.parse(timeStr, formatter); + timeCountMap.put(time, timeCountMap.getOrDefault(time, 0) + 1); + } + + // 가장 첫 번째 시간 & 간격 계산 + List sortedKeys = new ArrayList<>(timeCountMap.keySet()); + if (sortedKeys.size() < 2) { + return "데이터 부족 (분석 불가)"; + } + + int batchSize = timeCountMap.get(sortedKeys.get(0)); // 한 번에 보낸 건수 + int intervalMinutes = sortedKeys.get(1).getMinute() - sortedKeys.get(0).getMinute(); // 시간 간격 계산 +// int batchCount = sortedKeys.size(); // 총 몇 번 보냈는지 + +// return String.format("%,d건씩 %d분 간격 (%d회 발송)", batchSize, intervalMinutes, batchCount); + return String.format("%,d건씩 %d분 간격", batchSize, intervalMinutes); + + } + private List getFileInfo(MjonMsgDetailSentVO result) throws Exception { diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml index b43a863a..a20ea414 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml @@ -933,7 +933,7 @@ - + /* AddrDAO.insertAddrList */ INSERT INTO MJ_ADDR ( @@ -967,7 +967,18 @@ ) - + + + + + DELETE FROM MJ_ADDR + + WHERE MBER_ID = #mberId# + + #addrPhones[]# + + + + /* MjonMsgDataDAO.selectReSendMsgDataList */ + SELECT MSG_ID AS msgId, USER_ID AS userId, USERDATA AS msgSeq, @@ -7936,6 +7938,7 @@ + + + - + + + + +
@@ -421,7 +648,8 @@ function fnMjMsgReSendAll(msgGroupId
- 100,000건씩 35분 간격 + ${result.divideText } +
@@ -562,7 +790,7 @@ function fnMjMsgReSendAll(msgGroupId

(광고)

 -

+

무료 거부 080-0000-0000

@@ -596,31 +824,28 @@ function fnMjMsgReSendAll(msgGroupId

발송대상 리스트

- +
-
-
-
발신번호
-
-
-
+ + + +<%--
--%> + + -
+
- +
수신번호
- +
    -
    • +
    • @@ -634,19 +859,45 @@ function fnMjMsgReSendAll(msgGroupId
    - - + +
- +
+
+
+
+

그룹등록

+ +
+
+
+

선택된 발송내역 전화번호를 그룹으로 등록합니다.

+
+
그룹이름
+
+ + +
+
+
+ + +
+
+
+
+
+ +
" /> @@ -658,6 +909,7 @@ function fnMjMsgReSendAll(msgGroupId +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index ee4676b8..1e770571 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -844,6 +844,7 @@ function subContent(){
" /> + " /> " /> From 3848fb61b067a579598990f4b46995a57a84e0e1 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 6 Feb 2025 17:50:00 +0900 Subject: [PATCH 12/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20>?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=20>=20=EC=A3=BC=EC=86=8C=EB=A1=9D?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EA=B7=B8=EB=A3=B9=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addr/service/impl/AddrServiceImpl.java | 45 ++++++-- .../itn/let/mjo/addr/web/AddrController.java | 2 - .../jsp/web/msgsent/MsgSentDetailView.jsp | 102 ++++++++++++++++-- 3 files changed, 129 insertions(+), 20 deletions(-) diff --git a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java index 777fa0a8..6395f483 100644 --- a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java +++ b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java @@ -653,19 +653,42 @@ public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrSer String userId = addrVO.getMberId(); - AddrGroupVO addrGroupVO = new AddrGroupVO(); - addrGroupVO.setAddrGrpNm(addrVO.getAddrGrpNm()); - addrGroupVO.setMberId(userId); - addrGroupVO.setFrstRegisterId(userId); + log.info("addrVO.getAddrGrpId() :: [{}]", addrVO.getAddrGrpId()); - int usedCnt = addrGroupDAO.selectDuplAddrGroupCnt(addrGroupVO); - if(usedCnt > 0) { - return new StatusResponse(HttpStatus.BAD_REQUEST, "이미 등록되어있는 그룹이름입니다.", LocalDateTime.now()); + if ("NEW".equals(addrVO.getAddrGrpId())) { + + + AddrGroupVO addrGroupVO = new AddrGroupVO(); + addrGroupVO.setMberId(userId); + addrGroupVO.setAddrGrpNm(addrVO.getAddrGrpNm()); + addrGroupVO.setFrstRegisterId(userId); + + int usedCnt = addrGroupDAO.selectDuplAddrGroupCnt(addrGroupVO); + if(usedCnt > 0) { + return new StatusResponse(HttpStatus.BAD_REQUEST, "이미 등록되어있는 그룹이름입니다.", LocalDateTime.now()); + } + + int nextOrderNumber = addrGroupDAO.selectMaxOrderNumber(addrGroupVO); + addrGroupVO.setGrpOrder(nextOrderNumber); + + String addrGrpIdTemp = addrGroupDAO.insertAddrGroup(addrGroupVO); + + + addrVO.setAddrGrpId(addrGrpIdTemp); + } + else if ("bookmark".equals(addrVO.getAddrGrpId())) + { + addrVO.setBookmark("Y"); + addrVO.setAddrGrpId("0"); + } + else + { + addrVO.setBookmark("N"); + } - String addrGrpId = addrGroupDAO.insertAddrGroup(addrGroupVO); - - + String bookmark = addrVO.getBookmark(); + String addrGrpId = addrVO.getAddrGrpId(); List addrDataInfo = new ArrayList(); @@ -673,7 +696,7 @@ public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrSer AddrVO addrTempVO = new AddrVO(); addrTempVO.setAddrPhoneNo(phone); addrTempVO.setAddrGrpId(addrGrpId); - addrTempVO.setBookmark("N"); //북마크 : N + addrTempVO.setBookmark(bookmark); //북마크 : N addrTempVO.setFrstRegisterId(userId); addrTempVO.setMberId(userId); addrDataInfo.add(addrTempVO); diff --git a/src/main/java/itn/let/mjo/addr/web/AddrController.java b/src/main/java/itn/let/mjo/addr/web/AddrController.java index 2e0f2ef9..dd4f014d 100644 --- a/src/main/java/itn/let/mjo/addr/web/AddrController.java +++ b/src/main/java/itn/let/mjo/addr/web/AddrController.java @@ -2245,8 +2245,6 @@ public class AddrController { if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); } - log.info(" + addrVO.getAddrPhones() :: [{}]", addrVO.getAddrPhones().length); - log.info(" + addrVO.getAddrGrpNm() :: [{}]", addrVO.getAddrGrpNm()); addrVO.setMberId(userId); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp index e844c45b..2179ea23 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp @@ -32,6 +32,8 @@ $(document).ready(function(){ // 탭별 하위 버튼 활성화 fn_rowBtnSH('전체'); + // 주소록 그룹 불러오기 + getAddrGroupList(); //Tabulator AJAX Data Loading $tbDtailList = new Tabulator("#detailPopup", { @@ -127,6 +129,13 @@ $(document).ready(function(){ $('#grpNm').val('') }); + + $(document).on('change', '#addrGrpIdInfo', function() { + if ($("#addrGrpIdInfo option:selected").val() != "NEW") { + $("#grpNm").val(""); // 새그룹명 Clear; + } + }); + }); //검색 실행 함수 @@ -443,6 +452,14 @@ function fnAddAddrNo(){ let url = "/web/mjon/addr/insertByAddrGrpDataAndAddrDataAjax.do"; + console.log($("#addrGrpIdInfo option:selected").val()); + console.log($("#grpNm").val()); + if ($("#addrGrpIdInfo option:selected").val() == "NEW" + && $("#grpNm").val() == "") { + alert("저장할 그룹을 선택하거나 새 그룹명을 입력해주세요."); + return false; + } + // 필터링된 데이터 가져오기 (탭 필터 적용) let filteredData = getFilteredDataByTab(); @@ -450,7 +467,7 @@ function fnAddAddrNo(){ // phone 필드 데이터만 추출 let addrPhones = filteredData.map(row => row.phone); - console.log('addrPhones : ', addrPhones) +// console.log('addrPhones : ', addrPhones) if(addrPhones.length < 1){ alert('해당 탭에 데이터가 없습니다.'); @@ -459,11 +476,13 @@ function fnAddAddrNo(){ // 주소록 그룹명 가져오기 let addrGrpNm = $('#grpNm').val(); + let addrGrpId = $("#addrGrpIdInfo option:selected").val(); // 데이터 객체 생성 let data = { - addrPhones: addrPhones, - addrGrpNm: addrGrpNm + addrPhones : addrPhones + , addrGrpNm : addrGrpNm + , addrGrpId : addrGrpId }; if(!confirm("연락처 정보를 주소록에 등록 하시겠습니까?")){ @@ -509,8 +528,6 @@ function fnDelAddrNo(){ // 필터링된 데이터 가져오기 (탭 필터 적용) let filteredData = getFilteredDataByTab(); - console.log('filteredData : ', filteredData) - // phone 필드 데이터만 추출 let addrPhones = filteredData.map(row => row.phone); console.log('addrPhones : ', addrPhones) @@ -574,6 +591,42 @@ function getFilteredDataByTab() { return allData.filter(row => tabFilter ? row.result.includes(tabFilter.value) : true); } + + +//주소록 그룹정보 불러오기 +function getAddrGroupList() { + $.ajax({ + type : "POST", + async : false, + url : "/web/mjon/addr/addrGroupListAjax.do", + data : {}, + dataType:'json', + success : function(data) { + //alert(JSON.stringify(data.addrGroupList)); + + // Show Html + getAddrGroupListShow(data.addrGroupList); + }, + error : function(xhr, status, error) { + alert(error); + return false; + } + }); +} + +//Show Html +function getAddrGroupListShow(jsonList) { + var sHtml = ""; + sHtml += ""; + sHtml += ""; + sHtml += ""; + for (var j = 0; j < jsonList.length; j++) { + sHtml += " "; + } + + $("#addrGrpIdInfo").html(sHtml); +} +
@@ -871,7 +924,7 @@ function getFilteredDataByTab() {
- + + +
+
+
+

주소록에 등록

+ +
+
+ + + + + + + + + + + + +
주소록 그룹선택 표
그룹 선택 + + + + +
+
+ + +
+
+
+
+ From 50f49445da8c49fbe24bcf93390ca903e7d35783 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 6 Feb 2025 17:53:15 +0900 Subject: [PATCH 13/25] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java index 6395f483..0fb6d3dc 100644 --- a/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java +++ b/src/main/java/itn/let/mjo/addr/service/impl/AddrServiceImpl.java @@ -655,6 +655,7 @@ public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrSer log.info("addrVO.getAddrGrpId() :: [{}]", addrVO.getAddrGrpId()); + // 새로운 그룹 생성 if ("NEW".equals(addrVO.getAddrGrpId())) { @@ -678,7 +679,7 @@ public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrSer } else if ("bookmark".equals(addrVO.getAddrGrpId())) - { + {// 자주 보내는 그룹 addrVO.setBookmark("Y"); addrVO.setAddrGrpId("0"); } @@ -696,7 +697,7 @@ public class AddrServiceImpl extends EgovAbstractServiceImpl implements AddrSer AddrVO addrTempVO = new AddrVO(); addrTempVO.setAddrPhoneNo(phone); addrTempVO.setAddrGrpId(addrGrpId); - addrTempVO.setBookmark(bookmark); //북마크 : N + addrTempVO.setBookmark(bookmark); addrTempVO.setFrstRegisterId(userId); addrTempVO.setMberId(userId); addrDataInfo.add(addrTempVO); From 03da959c4f6a76d363ce8b36d1e6fccac9a2d977 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Mon, 10 Feb 2025 17:39:55 +0900 Subject: [PATCH 14/25] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=86=8D=EB=8F=84=EA=B3=84=EC=86=8D=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=A7=84=ED=96=89=EC=A4=91=204891?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjo/msgsent/service/MjonMsgSentVO.java | 1 + .../service/impl/MjonMsgSentServiceImpl.java | 31 +++++++++++++------ .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 1 + .../jsp/web/msgsent/MsgSentAllListAjax.jsp | 21 +++++++++---- 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index 4d6571ea..af114ee2 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -26,6 +26,7 @@ public class MjonMsgSentVO extends UserDefaultVO{ private List msgGroupIdList; //문자 그룹아이디 리스트 private String smsTxt; //문자 내용 private String subject; //문자 제목 + private String subjectChkYn; //문자 제목 private Date regdate; //문자 등록일자 private Date reqdate; //문자 예약 발송 일자 private String callFrom; //발신번호 diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index bbc5f3f1..ced8202c 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -132,16 +132,6 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements // 목록 List resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO); - // 내용이 없고 이미지만 있을 경우 - resultList.stream().forEach(t->{ - log.info("+ t.getMsgKind() : [{}]",t.getMsgType()); - if("6".equals(t.getMsgType()) - && StringUtils.isEmpty(t.getSmsTxt()) - && !"0".equals(t.getFileCnt()) - ) { - t.setSmsTxt("이미지"); - } - }); // groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴 resultList = makeDetailFunction(resultList); @@ -154,6 +144,27 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements t.setStatusCd(code); }); + + resultList.stream().forEach(t->{ + + // 내용이 없고 이미지만 있을 경우 + // 내용에 "이미지"표시 + if("6".equals(t.getMsgType()) + && StringUtils.isEmpty(t.getSmsTxt()) + && !"0".equals(t.getFileCnt()) + ) { + t.setSmsTxt("이미지"); + } + + // 예약 취소일 시 대기건도 0으로 표시 + if( t.getReserveCYn().equals(("Y")) ) { + t.setResultSValue("0"); + t.setResultFValue("0"); + t.setResultWValue("0"); + } + }); + + // 총 카운트 diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index 75b48484..e2e0bfeb 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -428,6 +428,7 @@ , B.MSG_GROUP_CNT as msgGroupCnt , B.SMS_TXT as smsTxt , B.SUBJECT as subject + , B.SUBJECT_CHK_YN as subjectChkYn , DATE_FORMAT(B.REGDATE, '%Y-%m-%d %T') AS regdate , DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T') AS reqDate , ( diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 68fff760..dd839b70 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -8,6 +8,7 @@