Commit @4169e61f617d22d2599acee1dccdd05508155478

name 2023-08-02

Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git

@4169e61f617d22d2599acee1dccdd05508155478

23b4d25

4169e61

src/main/java/itn/com/cmm/util/PdfUtil.java

--- src/main/java/itn/com/cmm/util/PdfUtil.java

+++ src/main/java/itn/com/cmm/util/PdfUtil.java


             File imgFiles = new File(imgDir + "." +extsn);
             Image img = ImageIO.read(imgFiles);
             
-           PDPage page = new PDPage(PDRectangle.A4);   
+           PDPage page = new PDPage(PDRectangle.A2);   
             doc.addPage(page);
              
             PDImageXObject pdImage = PDImageXObject.createFromFile(imgFiles.toString(), doc);

             contents.drawImage(pdImage, pageWidthPosition, pageHeightPosition, imgWidth, imgHeight);
             contents.close();
             doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf");
+            //doc.save("C:/TEST/" + uuid + ".pdf");
             
         } catch (Exception e) {
             System.out.println("Exception! : " + e.getMessage());

23b4d25

4169e61

src/main/java/itn/com/cmm/web/EgovFileDownloadController.java

--- src/main/java/itn/com/cmm/web/EgovFileDownloadController.java

+++ src/main/java/itn/com/cmm/web/EgovFileDownloadController.java


 import java.net.URLEncoder;
 import java.util.Map;
 
-import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
-import itn.com.cmm.service.EgovFileMngService;
-import itn.com.cmm.service.FileVO;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import itn.com.cmm.service.EgovFileMngService;
+import itn.com.cmm.service.FileVO;
 
 /**
  * 파일 다운로드를 위한 컨트롤러 클래스

 				
 			
 			File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
+			//File uFile = new File("C:/TEST/", fileNm);
+			
 			long fSize = uFile.length();
 
 			if (fSize > 0) {

23b4d25

4169e61

src/main/java/itn/com/cmm/web/EgovFileMngController.java

--- src/main/java/itn/com/cmm/web/EgovFileMngController.java

+++ src/main/java/itn/com/cmm/web/EgovFileMngController.java

...	...	@@ -227,6 +227,33 @@
227	227	* @return
228	228	* @throws Exception
229	229	*/
	230	+ @RequestMapping("/cmm/fms/selectMberFileInfs.do")
	231	+ public String selectMberFileInfs(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map<String, Object> commandMap, ModelMap model) throws Exception {
	232	+ String atchFileId = (String) commandMap.get("param_atchFileId");
	233	+ String pdfView = (String) commandMap.get("pdf_view"); //'Y' 이면 pdf 직접 보여주기
	234	+
	235	+ fileVO.setAtchFileId(atchFileId);
	236	+ List<FileVO> result = fileService.selectFileInfs(fileVO);
	237	+ model.addAttribute("fileList", result);
	238	+ model.addAttribute("updateFlag", "N");
	239	+ model.addAttribute("fileListCnt", result.size());
	240	+ model.addAttribute("atchFileId", atchFileId);
	241	+ if("Y".equals(pdfView)){
	242	+ model.addAttribute("pdfView", pdfView);
	243	+ }
	244	+
	245	+ return "cmm/fms/EgovMberFileList";
	246	+ }
	247	+
	248	+ /**
	249	+ * 게시판 첨부파일에 대한 목록을 조회한다.
	250	+ *
	251	+ * @param fileVO
	252	+ * @param commandMap
	253	+ * @param model
	254	+ * @return
	255	+ * @throws Exception
	256	+ */
230	257	@RequestMapping("/cmm/fms/selectBBSFileInfsMjon.do")
231	258	public String selectBBSFileInfsMjon(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map<String, Object> commandMap, ModelMap model) throws Exception {
232	259	String atchFileId = (String) commandMap.get("param_atchFileId");

23b4d25

4169e61

src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java

--- src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java

+++ src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java


 import itn.com.cmm.service.EgovFileMngUtil;
 import itn.com.cmm.service.FileVO;
 import itn.com.cmm.service.ReadService;
+import itn.com.cmm.util.EgovDoubleSubmitHelper;
 import itn.com.cmm.util.StringUtil;
 import itn.com.cmm.util.WebUtil;
 import itn.com.uss.ion.cnf.service.ProhibitMngService;

 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.setViewName("jsonView");
 		
+		
+		if (!EgovDoubleSubmitHelper.checkAndSaveToken("someKey", multiRequest)) {  
+			modelAndView.addObject("message", "너무많은 글쓰기가 시도되었습니다.");
+			modelAndView.addObject("result", "fail");
+			return modelAndView;
+		}
 		// Start => bbsId를 변조해서 공지사항에 글 등록 방지 처리
 		//boardVO.setBbsId("BBSMSTR_000000000651");	// 공지사항
 		List<BoardVO> userBbsWriteList = bbsMngService.selectUserBbsWriteList(boardVO);

23b4d25

4169e61

src/main/java/itn/let/fax/admin/web/FaxAdmController.java

--- src/main/java/itn/let/fax/admin/web/FaxAdmController.java

+++ src/main/java/itn/let/fax/admin/web/FaxAdmController.java

...	...	@@ -128,6 +128,32 @@
128	128	return "/uss/ion/fax/faxAdmSendList";
129	129	}
130	130
	131	+ // 팩스 금일/금월/금년 통계
	132	+ @RequestMapping(value = "/uss/ion/fax/selectFaxSendThisSumAjax.do")
	133	+ public ModelAndView FaxSendThisSumAjax(
	134	+ @ModelAttribute("faxGroupDataVO") FaxGroupDataVO faxGroupDataVO) throws Exception {
	135	+
	136	+ ModelAndView modelAndView = new ModelAndView();
	137	+ modelAndView.setViewName("jsonView");
	138	+
	139	+ boolean isSuccess = true;
	140	+ String msg = "";
	141	+ FaxGroupDataVO result = null;
	142	+
	143	+ try {
	144	+ result = faxService.selectFaxSendThisSum(faxGroupDataVO);
	145	+ }
	146	+ catch(Exception e) {
	147	+ isSuccess = false;
	148	+ msg = e.getMessage();
	149	+ }
	150	+
	151	+ modelAndView.addObject("result", result);
	152	+ modelAndView.addObject("isSuccess", isSuccess);
	153	+ modelAndView.addObject("msg", msg);
	154	+
	155	+ return modelAndView;
	156	+ }
131	157
132	158	/**
133	159	* @methodName : faxAdmSendDetailList

23b4d25

4169e61

src/main/java/itn/let/fax/user/service/FaxGroupDataVO.java

--- src/main/java/itn/let/fax/user/service/FaxGroupDataVO.java

+++ src/main/java/itn/let/fax/user/service/FaxGroupDataVO.java


 
 import java.io.Serializable;
 
-import itn.com.cmm.ComDefaultVO;
-
 
 /**
  * 

 	private String searchMonth;
 	private String searchQuarter;
 	
+	private String successDay;
+	private String successMonth;
+	private String successYear;
+	private String successCntDay;
+	private String successCntMonth;
+	private String successCntYear;
+
+	public String getSuccessDay() {
+		return successDay;
+	}
+
+	public void setSuccessDay(String successDay) {
+		this.successDay = successDay;
+	}
+
+	public String getSuccessMonth() {
+		return successMonth;
+	}
+
+	public void setSuccessMonth(String successMonth) {
+		this.successMonth = successMonth;
+	}
+
+	public String getSuccessYear() {
+		return successYear;
+	}
+
+	public void setSuccessYear(String successYear) {
+		this.successYear = successYear;
+	}
+
+	public String getSuccessCntDay() {
+		return successCntDay;
+	}
+
+	public void setSuccessCntDay(String successCntDay) {
+		this.successCntDay = successCntDay;
+	}
+
+	public String getSuccessCntMonth() {
+		return successCntMonth;
+	}
+
+	public void setSuccessCntMonth(String successCntMonth) {
+		this.successCntMonth = successCntMonth;
+	}
+
+	public String getSuccessCntYear() {
+		return successCntYear;
+	}
+
+	public void setSuccessCntYear(String successCntYear) {
+		this.successCntYear = successCntYear;
+	}
+
 
 	public FaxGroupDataVO() {};
 	

23b4d25

4169e61

src/main/java/itn/let/fax/user/service/FaxService.java

--- src/main/java/itn/let/fax/user/service/FaxService.java

+++ src/main/java/itn/let/fax/user/service/FaxService.java


 
 	FaxGroupDataVO selectFaxSendDetailInfo(FaxGroupDataVO faxGroupDataVO);
 	
+	// 팩스 금일/금월/금년 통계
+	FaxGroupDataVO selectFaxSendThisSum(FaxGroupDataVO faxGroupDataVO);
+	
 	List<FaxGroupDataVO> selectMyFaxSendList(FaxGroupDataVO faxGroupDataVO);
 
 

23b4d25

4169e61

src/main/java/itn/let/fax/user/service/impl/FaxDAO.java

--- src/main/java/itn/let/fax/user/service/impl/FaxDAO.java

+++ src/main/java/itn/let/fax/user/service/impl/FaxDAO.java


 		return (FaxGroupDataVO)select("faxDAO.selectFaxSendDetailInfo", faxGroupDataVO);
 	}
 	
+	// 팩스 금일/금월/금년 통계
+	public FaxGroupDataVO selectFaxSendThisSum(FaxGroupDataVO faxGroupDataVO) {
+		return (FaxGroupDataVO)select("faxDAO.selectFaxSendThisSum", faxGroupDataVO);
+	}
+	
 	public List<?> selectBookMarkMsgList(MjonMsgDataVO mjonMsgDataVO) throws Exception{
 		return list("faxDAO.selectBookMarkMsgList", mjonMsgDataVO);
 	}

23b4d25

4169e61

src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java

--- src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java

+++ src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java


 
 import java.io.File;
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;

 import java.util.Map;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import itn.com.cmm.util.DateUtil;
 import itn.com.cmm.util.FaxUtil;
-import itn.com.cmm.util.MJUtil;
 import itn.let.fax.user.service.FaxConvertMngVO;
 import itn.let.fax.user.service.FaxConvertVO;
 import itn.let.fax.user.service.FaxGroupDataVO;

 import itn.let.fax.user.service.FaxService;
 import itn.let.fax.user.service.FaxTranVO;
 import itn.let.mail.service.StatusResponse;
-import itn.let.mjo.msg.service.MjonMsgVO;
 import itn.let.mjo.msgdata.service.MjonMsgDataVO;
 import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
 import itn.let.mjo.pay.service.MjonPayVO;
 import itn.let.mjo.pay.service.impl.MjonPayDAO;
 import itn.let.module.base.PriceAndPoint;
 import itn.let.sym.site.service.JoinSettingVO;
-import itn.let.uss.umt.service.MberManageVO;
 import itn.let.utl.fcc.service.EgovStringUtil;
 
 

 		return faxDao.selectFaxSendDetailInfo(faxGroupDataVO);
 	}
 
+	// 팩스 금일/금월/금년 통계
+	@Override
+	public FaxGroupDataVO selectFaxSendThisSum(FaxGroupDataVO faxGroupDataVO) {
+		return faxDao.selectFaxSendThisSum(faxGroupDataVO);
+	}
+	
 	@Override
 	public List<FaxGroupDataVO> selectMyFaxSendList(FaxGroupDataVO faxGroupDataVO) {
 		return faxDao.selectMyFaxSendList(faxGroupDataVO);

23b4d25

4169e61

src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java

--- src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java

+++ src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java


 	
 	// 알림톡 금일/금월/금년 통계
 	@RequestMapping(value = "/uss/umt/user/selectMjonKakaoAtThisSumAjax.do")
-	public ModelAndView DashBoardAdminLogAjax(
+	public ModelAndView MjonKakaoAtThisSumAjax(
 			@ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception {
 
 		ModelAndView modelAndView = new ModelAndView();

23b4d25

4169e61

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

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

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


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

23b4d25

4169e61

src/main/java/itn/let/mjo/apikey/service/ApiKeyMngService.java

--- src/main/java/itn/let/mjo/apikey/service/ApiKeyMngService.java

+++ src/main/java/itn/let/mjo/apikey/service/ApiKeyMngService.java


 
 	//REST API 신청상태
 	public List<ApiKeyVO> selectApiKeyApplyStatus(ApiKeyVO apiKeyVO) throws Exception;
+
+	public int selectMberApiKeyChk(ApiKeyVO apiKeyVO) throws Exception;
 	
 }

23b4d25

4169e61

src/main/java/itn/let/mjo/apikey/service/impl/ApiKeyMngDAO.java

--- src/main/java/itn/let/mjo/apikey/service/impl/ApiKeyMngDAO.java

+++ src/main/java/itn/let/mjo/apikey/service/impl/ApiKeyMngDAO.java


 	public List<ApiKeyVO> selectApiKeyApplyStatus(ApiKeyVO apiKeyVO){
         return (List<ApiKeyVO>) list("ApiKeyMngDAO.selectApiKeyApplyStatus", apiKeyVO);
     }
+
+	public int selectMberApiKeyChk(ApiKeyVO apiKeyVO) {
+		return (int) select("ApiKeyMngDAO.selectMberApiKeyChk", apiKeyVO);
+	}
 	
 }

23b4d25

4169e61

src/main/java/itn/let/mjo/apikey/service/impl/ApiKeyMngServiceImpl.java

--- src/main/java/itn/let/mjo/apikey/service/impl/ApiKeyMngServiceImpl.java

+++ src/main/java/itn/let/mjo/apikey/service/impl/ApiKeyMngServiceImpl.java


 	}
 	
 	@Override
+	public int selectMberApiKeyChk(ApiKeyVO apiKeyVO) throws Exception {
+		return apiKeyMngDAO.selectMberApiKeyChk(apiKeyVO);
+	}
+	
+	@Override
 	public void deleteApiKey(ApiKeyVO apiKeyVO) throws Exception {
 		apiKeyMngDAO.deleteApiKey(apiKeyVO);
 		

23b4d25

4169e61

src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

--- src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

+++ src/main/java/itn/let/mjo/msg/web/MjonMsgController.java


 package itn.let.mjo.msg.web;
 
-import java.io.File;
 import java.io.OutputStream;
 import java.net.URL;
 import java.text.SimpleDateFormat;

     }
     
     @RequestMapping(value = {"/uss/ion/msg/pdfView.do"})
-   	public String pdfView(FileVO fileVO, ModelMap model) throws Exception {
+   	public String pdfView(FileVO fileVO
+   			, ModelMap model
+   			, HttpServletRequest request) throws Exception {
+    	
+		FileVO fvo = fileService.selectFileInf(fileVO);
+		String path = "";
+		
+		if(fvo != null) {
+			if("pdf".equals(fvo.getFileExtsn())) {
+				path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
+			}else {
+				String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
+				path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
+			}
+		}
+		
+		String mberNm = request.getParameter("mberNm");
+		String bizNo = request.getParameter("bizNo");
+		String ceoNm = request.getParameter("ceoNm");
+		String hstManagerNm = request.getParameter("hstManagerNm");
+		String hstMbtlNum = request.getParameter("hstMbtlNum");
+		
+		model.addAttribute("pdfPath", path);
+		model.addAttribute("mberNm", mberNm);
+		model.addAttribute("bizNo", bizNo);
+		model.addAttribute("ceoNm", ceoNm);
+		model.addAttribute("hstManagerNm", hstManagerNm);
+		model.addAttribute("hstMbtlNum", hstMbtlNum);		
+    	
+    	return "/uss/ion/msg/pdfView";
+    }
+	
+    @RequestMapping(value = {"/uss/ion/msg/pdfViewAjax.do"})
+   	public String pdfViewAjax(FileVO fileVO, ModelMap model) throws Exception {
     	
 		FileVO fvo = fileService.selectFileInf(fileVO);
 		String path = "";

 		model.addAttribute("pdfPath", path);
     	
     	return "/uss/ion/msg/pdfView";
-    }
-	
-	
+    }	
 	
 }

4169e61

src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentCntVO.java (added)

+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentCntVO.java

...	...	@@ -0,0 +1,46 @@
	1	+package itn.let.mjo.msgsent.service;
	2	+
	3	+import itn.let.uss.umt.service.UserDefaultVO;
	4	+
	5	+public class MjonMsgSentCntVO extends UserDefaultVO{
	6	+
	7	+ private static final long serialVersionUID = 1L;
	8	+
	9	+
	10	+
	11	+
	12	+ // 각 통계별 총 건수
	13	+ public int totCnt;// 전체 건수
	14	+
	15	+ // 각 통계별 성공, 실패 건수 처리
	16	+ public int waitCnt;// 전체 대기 건수
	17	+ public int succCnt;// 전체 성공 건수
	18	+ public int failCnt;// 전체 실패 건수
	19	+
	20	+
	21	+ public int getTotCnt() {
	22	+ return totCnt;
	23	+ }
	24	+ public void setTotCnt(int totCnt) {
	25	+ this.totCnt = totCnt;
	26	+ }
	27	+ public int getWaitCnt() {
	28	+ return waitCnt;
	29	+ }
	30	+ public void setWaitCnt(int waitCnt) {
	31	+ this.waitCnt = waitCnt;
	32	+ }
	33	+ public int getSuccCnt() {
	34	+ return succCnt;
	35	+ }
	36	+ public void setSuccCnt(int succCnt) {
	37	+ this.succCnt = succCnt;
	38	+ }
	39	+ public int getFailCnt() {
	40	+ return failCnt;
	41	+ }
	42	+ public void setFailCnt(int failCnt) {
	43	+ this.failCnt = failCnt;
	44	+ }
	45	+
	46	+}

23b4d25

4169e61

src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java


 	
 	private int successCnt;	// 문자발송 성공건수
 	
-	private String sendKind;	//문자 전송 타입(H:홈페이지 A: API)
-	
 	private String msgKind;	//문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E)
 	private String delayYn; //지연 문자 유무
 	private String delayCompleteYn; //지연문자 처리 완료 여부
 
 	private String msgId;		//문자아이디
 	private String atchFiles; 		// 그림문자 파일정보
+	
+	private String sendKind; 		// 그림문자 파일정보
 
 	public String getAtchFiles() {
 		return atchFiles;

 	public void setSendKind(String sendKind) {
 		this.sendKind = sendKind;
 	}
+	
 }

23b4d25

4169e61

src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

--- src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

+++ src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java


 		if(listType.equals("groupList")) {//전송건별 리스트 불러오기
 			
 			resultList = mjonMsgSentDAO.selectAllMsgSentList(mjonMsgSentVO);
+			System.out.println("=====");
 			
 		}else {//개인별 리스트 불러오기
 			
 			resultList = mjonMsgSentDAO.selectAllPrivateMsgSentList(mjonMsgSentVO);
+			System.out.println("====================");
 			
 		}
 		

23b4d25

4169e61

src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

--- src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java

+++ src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java


 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

 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.MjonMsgSentCntVO;
 import itn.let.mjo.msgsent.service.MjonMsgSentService;
 import itn.let.mjo.msgsent.service.MjonMsgSentVO;
 

     
     @Resource(name = "KakaoSentService")
 	private KakaoSentService kakaoSentService;
+	
+	//api key 정보
+	@Resource(name = "apiKeyMngService")
+    private ApiKeyMngService apiKeyMngService;
+
     
 private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentController.class);
 	

 		}
     	
     	mjonMsgSentVO.setUserId(userId);
-    	
     	
     	/*
     	//전체 발송 건수 통계 불러오기

     	//전체 발송 건수 통계 불러오기
     	mjonMsgSentVO.setMsgType("");
     	List<MjonMsgSentVO> totalMsgCnt = mjonMsgSentService.selectDetailMsgSentCntMix(mjonMsgSentVO);
-    	model.addAttribute("totalMsgCnt", totalMsgCnt);
-
-    	List<MjonMsgSentVO> smsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
-    	List<MjonMsgSentVO> mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
     	
+    	// H:홈페이지, A:API 로 sms, lms, mms 나누는 영역
+    	List<MjonMsgSentVO> H_totalMsgCnt = totalMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
+    	List<MjonMsgSentVO> H_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
+    	List<MjonMsgSentVO> H_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
+    	List<MjonMsgSentVO> H_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
 
-    	totalMsgCnt.forEach(t->{
+    	List<MjonMsgSentVO> A_totalMsgCnt = totalMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
+    	List<MjonMsgSentVO> A_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
+    	List<MjonMsgSentVO> A_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
+    	List<MjonMsgSentVO> A_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
+
+    	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) {
-    			smsMsgCnt.add(t);
+    			H_smsMsgCnt.add(t);
     		} else if (Integer.parseInt(t.getFilePath2())>0) {
-    			lmsMsgCnt.add(t);
+    			H_lmsMsgCnt.add(t);
     		} else if (Integer.parseInt(t.getFilePath3())>0) {
-    			mmsMsgCnt.add(t);
+    			H_mmsMsgCnt.add(t);
     		}
     	});
     	
-    	//단문 성공건, 실패건 불러오기    	
-    	model.addAttribute("smsMsgCnt", smsMsgCnt);
+    	A_totalMsgCnt.forEach(t->{
+    		if (Integer.parseInt(t.getFilePath1())>0) {
+    			A_smsMsgCnt.add(t);
+    		} else if (Integer.parseInt(t.getFilePath2())>0) {
+    			A_lmsMsgCnt.add(t);
+    		} else if (Integer.parseInt(t.getFilePath3())>0) {
+    			A_mmsMsgCnt.add(t);
+    		}
+    	});
     	
-    	//장문 성공건, 실패건 불러오기
-    	model.addAttribute("lmsMsgCnt", lmsMsgCnt);
     	
-    	//그림문자 성공건, 실패건 불러오기
-    	model.addAttribute("mmsMsgCnt", mmsMsgCnt);
+    	/* 
+    	 * 홈페이지에서 보낸 데이터 LIST
+    	 * SEND_KIND = "H"
+    	 * */
+    	// 전체 영역
+    	model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_totalMsgCnt));
+    	// 전체 단문(SMS)
+    	model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
+    	
+    	
+    	/* ==================================================================================== */
+    	
+    	
+    	/* 
+    	 * 홈페이지에서 보낸 데이터 LIST
+    	 * SEND_KIND = "A"
+    	 * */
+    	// 전체 영역
+    	model.addAttribute("A_allSentCntVO", this.getResultCntProc(A_totalMsgCnt));
+    	// 전체 단문(SMS)
+    	model.addAttribute("A_smsSentCntVO", this.getResultCntProc(A_smsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("A_lmsSentCntVO", this.getResultCntProc(A_lmsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("A_mmsSentCntVO", this.getResultCntProc(A_mmsMsgCnt));
+    	
+    	
+    	
+    	 /*<isEqual prepend="AND" property="searchCondition" compareValue="2">
+         a.mber_nm LIKE CONCAT('%',#searchKeyword#,'%')  
+         </isEqual>
+         */
+    	ApiKeyVO apiKeyVO = new ApiKeyVO();
+    	apiKeyVO.setMberId(userId);
+		model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
+    	
+    	
     	
     	
     	// 검색 리스트 불러오기

     	
 		return "web/msgsent/MsgSentView";
 	}
+
 	
-    /**
+    /** 
+     * @methodName	: getResultCntProc 
+     * @author		: 이호영
+     * @date		: 2023.07.26 
+     * @description	: MsgSentView.jsp에서 JSTL로 계산하는 것을 JAVA로 분리 
+     * @param msgCnt
+     * @param smsMsgCnt
+     * @param lmsMsgCnt
+     * @param mmsMsgCnt
+     * @return 
+     */
+    private MjonMsgSentCntVO getResultCntProc(List<MjonMsgSentVO> msgCnt) {
+//    	MjonMsgSentCntVO mjonSentCntVO = new MjonMsgSentCntVO();
+    	MjonMsgSentCntVO cntVO = new MjonMsgSentCntVO();
+    	
+
+		/*    	 
+		 * 전체 통계
+		 * */
+    	// 전체 대기 갯수
+    	cntVO.setWaitCnt(msgCnt.stream()
+    			.filter(f->"W".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+    	// 전체 성공 갯수
+    	cntVO.setSuccCnt(msgCnt.stream()
+    			.filter(f->"S".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+    	// 전체 실패 갯수
+    	cntVO.setFailCnt(msgCnt.stream()
+    			.filter(f->"F".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+
+    	// 전체 갯수 구하기
+    	cntVO.setTotCnt(cntVO.getWaitCnt() + cntVO.getSuccCnt() + cntVO.getFailCnt());
+
+    	
+		return cntVO;
+	}
+
+	/**
      * 발송관리 탭 리스트 화면 
      * @param searchVO
      * @param model

4169e61

src/main/java/itn/let/mjo/reservmsg/service/MjonMsgReservCntVO.java (added)

+++ src/main/java/itn/let/mjo/reservmsg/service/MjonMsgReservCntVO.java

...	...	@@ -0,0 +1,56 @@
	1	+package itn.let.mjo.reservmsg.service;
	2	+
	3	+import itn.let.uss.umt.service.UserDefaultVO;
	4	+
	5	+public class MjonMsgReservCntVO extends UserDefaultVO{
	6	+
	7	+ private static final long serialVersionUID = 1L;
	8	+
	9	+
	10	+
	11	+
	12	+ // 각 통계별 총 건수
	13	+ public int totCnt;// 전체 건수
	14	+
	15	+ // 각 통계별 성공, 실패 건수 처리
	16	+ public int waitCnt;// 대기 건수
	17	+ public int succCnt;// 성공 건수
	18	+ public int failCnt;// 실패 건수
	19	+ public int cnclCnt;// 예약취소 건수
	20	+
	21	+
	22	+ public int getTotCnt() {
	23	+ return totCnt;
	24	+ }
	25	+ public void setTotCnt(int totCnt) {
	26	+ this.totCnt = totCnt;
	27	+ }
	28	+ public int getWaitCnt() {
	29	+ return waitCnt;
	30	+ }
	31	+ public void setWaitCnt(int waitCnt) {
	32	+ this.waitCnt = waitCnt;
	33	+ }
	34	+ public int getSuccCnt() {
	35	+ return succCnt;
	36	+ }
	37	+ public void setSuccCnt(int succCnt) {
	38	+ this.succCnt = succCnt;
	39	+ }
	40	+ public int getFailCnt() {
	41	+ return failCnt;
	42	+ }
	43	+ public void setFailCnt(int failCnt) {
	44	+ this.failCnt = failCnt;
	45	+ }
	46	+ public int getCnclCnt() {
	47	+ return cnclCnt;
	48	+ }
	49	+ public void setCnclCnt(int cnclCnt) {
	50	+ this.cnclCnt = cnclCnt;
	51	+ }
	52	+
	53	+
	54	+
	55	+
	56	+}

23b4d25

4169e61

src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

--- src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java

+++ src/main/java/itn/let/mjo/reservmsg/service/MjonResvMsgVO.java


 	private int orderByCode;		// 문자타입 정렬번호
 	private String strReqDate;		// 문자열 타입 발송시간
 	
+	private String sendKind;		// 문자열 타입 발송시간
+	
 	public int getOrderByCode() {
 		return orderByCode;
 	}

 	public void setReserveYn(String reserveYn) {
 		this.reserveYn = reserveYn;
 	}
+	public String getSendKind() {
+		return sendKind;
+	}
+	public void setSendKind(String sendKind) {
+		this.sendKind = sendKind;
+	}
+	
+	
+	
 }

23b4d25

4169e61

src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

--- src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java

+++ src/main/java/itn/let/mjo/reservmsg/web/MjonReservMsgController.java


 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

 import itn.com.utl.fcc.service.EgovStringUtil;
 import itn.let.kakao.user.sent.service.KakaoSentService;
 import itn.let.kakao.user.sent.service.KakaoSentVO;
+import itn.let.mjo.apikey.service.ApiKeyMngService;
+import itn.let.mjo.apikey.service.ApiKeyVO;
+import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
+import itn.let.mjo.msgsent.service.MjonMsgSentVO;
+import itn.let.mjo.reservmsg.service.MjonMsgReservCntVO;
 import itn.let.mjo.reservmsg.service.MjonReservMsgService;
 import itn.let.mjo.reservmsg.service.MjonResvMsgVO;
 

     
     @Resource(name = "KakaoSentService")
 	private KakaoSentService kakaoSentService;
+	
+	//api key 정보
+	@Resource(name = "apiKeyMngService")
+    private ApiKeyMngService apiKeyMngService;
     
     
     private static final Logger logger = LoggerFactory.getLogger(MjonReservMsgController.class);

     	//전체 발송 건수 통계 불러오기
     	mjonResvMsgVO.setMsgType("");
     	List<MjonResvMsgVO> totalMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);//mjonReservMsgService.selectTotalMsgCnt(mjonResvMsgVO);
+    	
+    	List<MjonResvMsgVO> H_totalMsgCnt = totalMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
+    	List<MjonResvMsgVO> A_totalMsgCnt = totalMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
+    	
     	model.addAttribute("totalMsgCnt", totalMsgCnt);
     	
     	//단문 성공건, 실패건 불러오기
     	mjonResvMsgVO.setMsgType("4");
     	List<MjonResvMsgVO> smsMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);
+
+    	List<MjonResvMsgVO> H_smsMsgCnt = smsMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
+    	List<MjonResvMsgVO> A_smsMsgCnt = smsMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
+    	
     	model.addAttribute("smsMsgCnt", smsMsgCnt);
     	
     	//장문 성공건, 실패건 불러오기
     	mjonResvMsgVO.setMsgType("6");
     	mjonResvMsgVO.setFileCnt("0");
     	List<MjonResvMsgVO> lmsMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);
+
+    	List<MjonResvMsgVO> H_lmsMsgCnt = lmsMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
+    	List<MjonResvMsgVO> A_lmsMsgCnt = lmsMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
     	model.addAttribute("lmsMsgCnt", lmsMsgCnt);
     	
     	//그림문자 성공건, 실패건 불러오기
     	mjonResvMsgVO.setMsgType("6");
     	mjonResvMsgVO.setFileCnt("1");
     	List<MjonResvMsgVO> mmsMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);
+    	
+
+    	List<MjonResvMsgVO> H_mmsMsgCnt = mmsMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
+    	List<MjonResvMsgVO> A_mmsMsgCnt = mmsMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
     	model.addAttribute("mmsMsgCnt", mmsMsgCnt);
+
+    	
+
+    	/* 
+    	 * 홈페이지에서 보낸 데이터 LIST
+    	 * SEND_KIND = "H"
+    	 * */
+    	// 전체 영역
+    	model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_totalMsgCnt));
+    	// 전체 단문(SMS)
+    	model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
+    	
+    	
+    	/* ==================================================================================== */
+    	
+    	
+    	/* 
+    	 * 홈페이지에서 보낸 데이터 LIST
+    	 * SEND_KIND = "A"
+    	 * */
+    	// 전체 영역
+    	model.addAttribute("A_allSentCntVO", this.getResultCntProc(A_totalMsgCnt));
+    	// 전체 단문(SMS)
+    	model.addAttribute("A_smsSentCntVO", this.getResultCntProc(A_smsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("A_lmsSentCntVO", this.getResultCntProc(A_lmsMsgCnt));
+    	// 전체 장문(LMS)
+    	model.addAttribute("A_mmsSentCntVO", this.getResultCntProc(A_mmsMsgCnt));
+
+    	ApiKeyVO apiKeyVO = new ApiKeyVO();
+    	apiKeyVO.setMberId(userId);
+		model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
+    	
+//    	model.addAttribute("mmsMsgCnt", mmsMsgCnt);
     	
     	// 검색 리스트 불러오기
 		if(mjonResvMsgVO.getPageUnit() != 10) {

 		return "web/reservedmsg/ReservedMsgView";
 	}
 	
+	
+	
+    /** 
+     * @methodName	: getResultCntProc 
+     * @author		: 이호영
+     * @date		: 2023.07.26 
+     * @description	: MsgSentView.jsp에서 JSTL로 계산하는 것을 JAVA로 분리 
+     * @param msgCnt
+     * @param smsMsgCnt
+     * @param lmsMsgCnt
+     * @param mmsMsgCnt
+     * @return 
+     */
+    private MjonMsgReservCntVO getResultCntProc(List<MjonResvMsgVO> msgCnt) {
+//    	MjonMsgSentCntVO mjonSentCntVO = new MjonMsgSentCntVO();
+    	MjonMsgReservCntVO cntVO = new MjonMsgReservCntVO();
+    	
+
+		/*    	 
+		 * 전체 통계
+		 * */
+    	// 대기 갯수
+    	cntVO.setWaitCnt(msgCnt.stream()
+    			.filter(f->"W".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+    	// 성공 갯수
+    	cntVO.setSuccCnt(msgCnt.stream()
+    			.filter(f->"S".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+    	// 실패 갯수
+    	cntVO.setFailCnt(msgCnt.stream()
+    			.filter(f->"F".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+    	// 예약취소 갯수
+    	cntVO.setCnclCnt(msgCnt.stream()
+    			.filter(f->"C".equals(f.getMsgResultSts()))
+    			.mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
+
+    	// 전체 갯수 구하기
+    	cntVO.setTotCnt(cntVO.getWaitCnt() + cntVO.getSuccCnt() + cntVO.getFailCnt() + cntVO.getCnclCnt());
+
+    	
+		return cntVO;
+	}
+
+	
     /**
      * 예약관리 탭 리스트 화면 
      * @param searchVO

      */
 	@RequestMapping(value= {"/web/mjon/reservmsg/selectReservMsgListViewAjax.do"})
 	public String selectReservMsgListViewAjax(@ModelAttribute("searchVO") MjonResvMsgVO mjonResvMsgVO, ModelMap model) throws Exception{
-		
+
 		//로그인 권한정보 불러오기
     	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());

23b4d25

4169e61

src/main/java/itn/let/uat/uia/web/EgovLoginController.java

--- src/main/java/itn/let/uat/uia/web/EgovLoginController.java

+++ src/main/java/itn/let/uat/uia/web/EgovLoginController.java

...	...	@@ -585,6 +585,34 @@
585	585	ModelAndView modelAndView = new ModelAndView();
586	586	modelAndView.setViewName("jsonView");
587	587
	588	+ //비밀번호 규칙성 검증 추가 - 취약점 조치
	589	+ mberManageVO.setPassword(mberManageVO.getPassword().trim());
	590	+ String passWord = mberManageVO.getPassword();
	591	+
	592	+ if(passWord.length() < 8 \|\| passWord.length() > 20) {
	593	+ modelAndView.addObject("resultSts", "passWordFail");
	594	+ return modelAndView;
	595	+ }
	596	+
	597	+ Pattern digitPattern = Pattern.compile("[0-9]");
	598	+ Matcher digitMatcher = digitPattern.matcher(passWord);
	599	+ boolean hasDigit = digitMatcher.find();
	600	+
	601	+ Pattern letterPattern = Pattern.compile("[a-zA-Z]");
	602	+ Matcher letterMatcher = letterPattern.matcher(passWord);
	603	+ boolean hasLetter = letterMatcher.find();
	604	+
	605	+ Pattern specialPattern = Pattern.compile("[`~!@@#$%^&*\|\\\\'\";:/?]");
	606	+ Matcher specialMatcher = specialPattern.matcher(passWord);
	607	+ boolean hasSpecialCharacter = specialMatcher.find();
	608	+
	609	+
	610	+ if(hasDigit == false \|\| hasLetter == false \|\| hasSpecialCharacter == false) {
	611	+ modelAndView.addObject("resultSts", "passWordFail");
	612	+ return modelAndView;
	613	+ }
	614	+
	615	+
588	616	// 사업자등록증 업로드
589	617	List<FileVO> result = null;
590	618	String wAtchFileId = ""; //사업자등록증 첨부파일 ID
...	...	@@ -3205,6 +3233,30 @@
3205	3233
3206	3234	try {
3207	3235
	3236	+ //비밀번호 규칙성 검증 추가 - 취약점 조치
	3237	+ userManageVO.setPassword(userManageVO.getPassword().trim());
	3238	+ String passWord = userManageVO.getPassword();
	3239	+
	3240	+ Pattern digitPattern = Pattern.compile("[0-9]");
	3241	+ Matcher digitMatcher = digitPattern.matcher(passWord);
	3242	+ boolean hasDigit = digitMatcher.find();
	3243	+
	3244	+ Pattern letterPattern = Pattern.compile("[a-zA-Z]");
	3245	+ Matcher letterMatcher = letterPattern.matcher(passWord);
	3246	+ boolean hasLetter = letterMatcher.find();
	3247	+
	3248	+ Pattern specialPattern = Pattern.compile("[`~!@@#$%^&*\|\\\\'\";:/?]");
	3249	+ Matcher specialMatcher = specialPattern.matcher(passWord);
	3250	+ boolean hasSpecialCharacter = specialMatcher.find();
	3251	+
	3252	+
	3253	+ if(hasDigit == false \|\| hasLetter == false \|\| hasSpecialCharacter == false \|\| passWord.length() < 8 \|\| passWord.length() > 20) {
	3254	+ modelAndView.addObject("pwRuleCheck", false);
	3255	+ return modelAndView;
	3256	+ }else {
	3257	+ modelAndView.addObject("pwRuleCheck", true);
	3258	+ }
	3259	+
3208	3260	// 해당 정보의 등록 페스워드 조회
3209	3261	int pwCheck = mberManageService.selectMberPWOverlapCheck(userManageVO);
3210	3262

23b4d25

4169e61

src/main/java/itn/let/uat/uia/web/EgovMypageController.java

--- src/main/java/itn/let/uat/uia/web/EgovMypageController.java

+++ src/main/java/itn/let/uat/uia/web/EgovMypageController.java


 				return modelAndView;
 			}
 			
+			//비밀번호 규칙섬 검증 추가 - 취약점 조치
+			userManageVO.setPassword(userManageVO.getPassword().trim());
+			String passWord = userManageVO.getPassword();
+	        Pattern digitPattern = Pattern.compile("[0-9]");
+	        Matcher digitMatcher = digitPattern.matcher(passWord);
+	        boolean hasDigit = digitMatcher.find();
+
+	        Pattern letterPattern = Pattern.compile("[a-zA-Z]");
+	        Matcher letterMatcher = letterPattern.matcher(passWord);
+	        boolean hasLetter = letterMatcher.find();
+
+	        Pattern specialPattern = Pattern.compile("[`~!@@#$%^&*|\\\\'\";:/?]");
+	        Matcher specialMatcher = specialPattern.matcher(passWord);
+	        boolean hasSpecialCharacter = specialMatcher.find();
+			
+	        if(hasDigit == false || hasLetter == false || hasSpecialCharacter == false || passWord.length() < 8  || passWord.length() > 20) {
+				modelAndView.addObject("errType", "04");
+				modelAndView.addObject("message", "비밀번호 규칙을 확인해주세요.");
+				modelAndView.addObject("result", "fail");
+				return modelAndView;
+	        }
+			
 			userManageVO.setEmplyrId(loginVO.getId());
 			userManageService.updateUserPWAjax(userManageVO);
 			modelAndView.addObject("result", "success");

23b4d25

4169e61

src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java

--- src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java

+++ src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java


 		
 		List<ApiKeyVO> resultList = new ArrayList<ApiKeyVO>();
 		resultList = apiKeyMngService.selectApiKeyApplyStatus(apiKeyVO);
-		
+		System.out.println("=============");
 		if (resultList.size()>0) {
 			model.addAttribute("apiVO", resultList.get(0));
 			

23b4d25

4169e61

src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/fax/Fax_SQL_Mysql.xml

...	...	@@ -773,7 +773,39 @@
773	773	ORDER BY 1=1
774	774	</select>
775	775
776		-
	776	+ <!-- 팩스 금일/금월/금년 통계 -->
	777	+ <select id="faxDAO.selectFaxSendThisSum" resultClass="faxGroupDataVO" parameterClass="faxGroupDataVO">
	778	+ <![CDATA[
	779	+ SELECT
	780	+ DATE_FORMAT(NOW(), '%m-%d') AS successDay
	781	+ , DATE_FORMAT(NOW(), '%c') AS successMonth
	782	+ , DATE_FORMAT(NOW(), '%Y') AS successYear
	783	+ , (SELECT
	784	+ FORMAT(IFNULL(SUM(C.SentEA*C.Page), 0), 0)
	785	+ FROM PGI_FAXTRAN C
	786	+ WHERE 1=1
	787	+ AND C.ReqDate >= DATE_FORMAT(NOW(), '%Y-%m-%d')
	788	+ AND C.ReqDate < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
	789	+ ) successCntDay
	790	+ , (SELECT
	791	+ FORMAT(IFNULL(SUM(C.SentEA*C.Page), 0), 0)
	792	+ FROM PGI_FAXTRAN C
	793	+ WHERE 1=1
	794	+ AND C.ReqDate >= CONCAT(DATE_FORMAT(NOW(), '%Y-%m'), '-01')
	795	+ AND C.ReqDate < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
	796	+ ) successCntMonth
	797	+ , (SELECT
	798	+ FORMAT(IFNULL(SUM(C.SentEA*C.Page), 0), 0)
	799	+ FROM PGI_FAXTRAN C
	800	+ WHERE 1=1
	801	+ AND C.ReqDate >= CONCAT(DATE_FORMAT(NOW(), '%Y'), '-01-01')
	802	+ AND C.ReqDate < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
	803	+ ) successCntYear
	804	+ FROM DUAL
	805	+
	806	+ ]]>
	807	+ </select>
	808	+
777	809	<select id="faxDAO.selectBookMarkMsgList" parameterClass="mjonMsgDataVO" resultClass="egovMap">
778	810
779	811	SELECT ADDR_ID AS addrId,

23b4d25

4169e61

src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml


 			, DATE_FORMAT(NOW(), '%c') AS successMonth
 			, DATE_FORMAT(NOW(), '%Y') AS successYear 		
 			, (SELECT 
-				FORMAT(COUNT(0), 0)
+				FORMAT(IFNULL(COUNT(0), 0), 0)
 			FROM MJ_MSG_DATA C
 			WHERE
 				C.RESERVE_C_YN = 'N'

 				AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
 			) successCntDay
 			, (SELECT 
-				FORMAT(COUNT(0), 0)
+				FORMAT(IFNULL(COUNT(0), 0), 0)
 			FROM MJ_MSG_DATA C
 			WHERE
 				C.RESERVE_C_YN = 'N'

 				AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
 			) successCntMonth
 			, (SELECT 
-				FORMAT(COUNT(0), 0)
+				FORMAT(IFNULL(COUNT(0), 0), 0)
 		FROM MJ_MSG_DATA C
 			WHERE
 				C.RESERVE_C_YN = 'N'

23b4d25

4169e61

src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml


   			</isEmpty>  			
 	        
     </select>    
+    <select id="ApiKeyMngDAO.selectMberApiKeyChk" parameterClass="apiKeyVO" resultClass="int">
+		SELECT
+			COUNT(*)
+		FROM lettngnrlmber_access_key b
+			, lettngnrlmber a
+		WHERE b.MBER_ID=a.MBER_ID
+  			AND (a.MBER_STTUS = 'Y' OR a.MBER_STTUS = 'B')
+			AND b.USE_YN = 'Y'
+			AND b.mber_id = #mberId#  
+    </select>    
 
 	<update id="ApiKeyMngDAO.deleteApiKey" parameterClass="apiKeyVO">
 		UPDATE lettngnrlmber_access_key 

23b4d25

4169e61

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgResv_SQL_mysql.xml


 			, A0.RSLT_CODE							AS rsltCode
 			, A0.RSLT_CODE2							AS rsltCode2
 			, A0.AGENT_CODE							AS agentCode
+			, A0.SEND_KIND							AS sendKind
 		FROM
 			( SELECT
 				A.MSG_ID

 				, A.MSG_SEQ
 				, A.CUR_STATE
 				, A.SENT_DATE
+				, B.SEND_KIND
 				, (
 					CASE
 						WHEN A.RESERVE_C_YN = 'Y'

 		         AGENT_CODE AS agentCode,
 		         RESERVE_C_YN AS reserveCYn,
 		         CANCELDATE AS cancelDate,
+		         SEND_KIND as sendKind,
 				CASE
 					WHEN RESERVE_C_YN = 'Y'
 					THEN '예약취소'

 		                 MGD.CANCELDATE,
 		                 MD.CUR_STATE,
 		                 MD.RSLT_CODE,
-		                 MD.RSLT_CODE2
+		                 MD.RSLT_CODE2,
+						 MGD.SEND_KIND
 		         FROM    mj_msg_data MD
 		                 INNER JOIN MJ_MSG_GROUP_DATA MGD
 		                 ON      MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID

 		 		    	AND 	 CALL_FROM = #searchKeyword#
 			 	    </isEqual>
 				</isNotEmpty>
+				<isNotEmpty property="searchCondition_01">
+					AND SEND_KIND = #searchCondition_01#
+				</isNotEmpty>
 				<isNotEmpty property="startDate">
 					<![CDATA[ 
 						AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')

23b4d25

4169e61

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml


 			
             , sum(if(A0.tab1=0,0,1)) as filePath1		/*	단문여부	*/            
             , sum(if(A0.tab2=0,0,1)) as filePath2		/*	장문여부	*/
-            , sum(if(A0.tab3=0,0,1)) as filePath3		/*	그림여부	*/
-                 			
+            , sum(if(A0.tab3=0,0,1)) as filePath3		/*	그림여부	*/ 
+			, SEND_KIND as sendKind
 		FROM(
 			SELECT
 				A.MSG_ID

 				, A.RSLT_CODE2
 				, A.AGENT_CODE
 				, B.EACH_PRICE
-				
+				, B.SEND_KIND
                 , if (A.MSG_TYPE= '4' AND B.MSG_TYPE= '4'
                 	,'01','00') AS tab1
                 , if (A.MSG_TYPE= '6' AND B.MSG_TYPE= '6' AND B.FILE_CNT = '0'

 			, msgTypeName					 AS msgTypeName
 			, orderByCode					 AS orderByCode
 			, RESULT						 AS msgResult
+			, sendKind						 AS sendKind
 		FROM
 			( SELECT
 				B.USER_ID

 				, A.CUR_STATE
 				, A.RSLT_CODE
 				, A.RSLT_CODE2
+				, CASE
+					WHEN B.SEND_KIND = 'H' THEN 'WEB'
+					ELSE 'API'
+				END as sendKind
 				, CASE
 					WHEN B.MSG_TYPE = '6'
 						AND B.FILE_CNT > 0

 					AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
 				</isEqual>
 			</isNotEmpty>
+			<isNotEmpty property="searchCondition_01">
+				AND sendKind = #searchCondition_01#
+			</isNotEmpty>
 			<isNotEmpty property="startDate">
 				<![CDATA[ 
 					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')

 			, CANCELDATE							 AS cancelDate
 			, MSG_ID								 AS msgId
 			, RESULT								 AS msgResult
+			, sendKind
 		FROM
 			(SELECT
 				MGD.USER_ID

 				, MD.CUR_STATE
 				, MD.RSLT_CODE
 				, MD.RSLT_CODE2
+				, CASE WHEN MGD.SEND_KIND = 'H' THEN 'WEB' ELSE 'API' END as sendKind
 				,(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS RESULT
 			FROM
 				mj_msg_data MD

4169e61

src/main/webapp/WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp (added)

+++ src/main/webapp/WEB-INF/jsp/cmm/fms/EgovMberFileList.jsp

...	...	@@ -0,0 +1,40 @@
	1	+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
	2	+
	3	+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
	4	+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
	5	+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
	6	+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
	7	+<%
	8	+
	9	+/**
	10	+ * @Class Name : EgovFileList.jsp
	11	+ * @Description : 파일 목록화면
	12	+ * @Modification Information
	13	+ * @
	14	+ * @ 수정일 수정자 수정내용
	15	+ * @ ---------- ------ ---------------------------
	16	+ * @ 2009.03.26 이삼섭 최초 생성
	17	+ * @ 2011.07.20 옥찬우 <Input> Tag id속성 추가( Line : 68 )
	18	+ *
	19	+ * @author 공통서비스 개발팀 이삼섭
	20	+ * @since 2009.03.26
	21	+ * @version 1.0
	22	+ * @see
	23	+ *
	24	+ */
	25	+%>
	26	+
	27	+<script type="text/javascript">
	28	+
	29	+ function fn_egov_downFile(atchFileId, fileSn){
	30	+ window.open("<c:url value='/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"'/>","hiddenframe");
	31	+ }
	32	+
	33	+</script>
	34	+
	35	+ <c:forEach var="fileVO" items="${fileList}" varStatus="status">
	36	+ <a href="javascript:fn_egov_downFile('<c:out value="${fileVO.atchFileId}"/>','<c:out value="${fileVO.fileSn}"/>')" class="fileName" title="다운로드"><img src="/publish/images/content/file_img2.png" alt="첨부파일"></a>
	37	+ </c:forEach>
	38	+
	39	+<iframe width=0 height=0 name='hiddenframe' style='display:none;'></iframe>
	40	+

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp

...	...	@@ -21,6 +21,38 @@
21	21
22	22	});
23	23
	24	+// PdfView
	25	+function pdfViewPop(atchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum) {
	26	+ document.pdfForm.atchFileId.value = atchFileId;
	27	+ document.pdfForm.mberNm.value = mberNm;
	28	+ document.pdfForm.bizNo.value = bizNo;
	29	+ document.pdfForm.ceoNm.value = ceoNm;
	30	+ document.pdfForm.hstManagerNm.value = hstManagerNm;
	31	+ document.pdfForm.hstMbtlNum.value = hstMbtlNum;
	32	+ document.pdfForm.fileSn.value = 0;
	33	+ window.open("about:blank", 'taxListPopup', 'width=1020, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=no, location=no, scrollbars=yes');
	34	+ document.pdfForm.action = "<c:url value='/uss/ion/msg/pdfView.do'/>";
	35	+ document.pdfForm.target = "taxListPopup";
	36	+ document.pdfForm.submit();
	37	+}
	38	+
	39	+// 첨부파일 PdfView
	40	+function pdfViewPop2(atchFileId) {
	41	+ $.ajax({
	42	+ type: "POST",
	43	+ url: "/uss/ion/msg/pdfViewAjax.do",
	44	+ data: {"atchFileId" : atchFileId, "fileSn" : "0"},
	45	+ dataType:'html',
	46	+ async: true,
	47	+ success: function (data) {
	48	+ alert(data);
	49	+ },
	50	+ error: function (e) {
	51	+ //alert("ERROR : " + JSON.stringify(e));
	52	+ }
	53	+ });
	54	+}
	55	+
24	56	function fnChkAll() {
25	57	if($("#chkAll").is(':checked') ){
26	58	$("input[name=chkSttusY]").prop("checked", true);
...	...	@@ -268,6 +300,16 @@
268	300	</head>
269	301	<body>
270	302
	303	+<form name="pdfForm" action="<c:url value='/uss/ion/msg/pdfView.do'/>" method="post">
	304	+ <input type="hidden" name="atchFileId"/>
	305	+ <input type="hidden" name="fileSn"/>
	306	+ <input type="hidden" name="mberNm"/>
	307	+ <input type="hidden" name="bizNo"/>
	308	+ <input type="hidden" name="ceoNm"/>
	309	+ <input type="hidden" name="hstManagerNm"/>
	310	+ <input type="hidden" name="hstMbtlNum"/>
	311	+</form>
	312	+
271	313	<form name="popupForm" action="<c:url value='/uss/umt/user/EgovMberCmpHstListPop.do'/>" method="post">
272	314	<input type="hidden" name="pageIndex" value="1"/>
273	315	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
...	...	@@ -427,17 +469,25 @@
427	469	<c:if test="${result.bizType == item.code}"><c:out value="${fn:substring(item.codeNm,0,2)}"/></c:if>
428	470	</c:forEach>
429	471	</td>
430		- <td><c:out value="${result.mberNm}"/></td>
	472	+ <td>
	473	+ <c:out value="${result.mberNm}"/>
	474	+ </td>
431	475	<td><a href="https://www.bizno.net/article/${result.bizNo}" target="_blank"><c:out value="${result.bizNo}"/></a></td>
432	476	<td><c:out value="${result.ceoNm}"/></td>
433	477	<td><c:out value="${result.hstManagerNm}"/></td>
434	478	<td><c:out value="${result.hstMbtlNum}"/></td>
435		- <td class="td_file">
	479	+ <td class="td_file" style="vertical-align:middle;">
436	480	<c:if test="${result.atchFileId ne '' \|\| result.atchFileId ne null}">
437	481	<c:import url="/cmm/fms/selectAddrAgencyFileInfs.do" charEncoding="utf-8">
438	482	<c:param name="param_atchFileId" value="${result.atchFileId}" />
439	483	</c:import>
440	484	</c:if>
	485	+ <%--
	486	+ <!--/cmm/fms/selectMberFileInfs.do-->
	487	+ <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
	488	+ <button class="btnType btnType20" onclick="pdfViewPop('${result.atchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}')" style="height:20px !important; padding:0 2px !important;">V</button>
	489	+ </c:if>
	490	+ --%>
441	491	</td>
442	492	<td class="td_file">
443	493	<c:if test="${result.workAtchFileId ne '' \|\| result.workAtchFileId ne null}">
...	...	@@ -445,6 +495,12 @@
445	495	<c:param name="param_atchFileId" value="${result.workAtchFileId}" />
446	496	</c:import>
447	497	</c:if>
	498	+ <%--
	499	+ <!--/cmm/fms/selectMberFileInfs.do-->
	500	+ <c:if test="${result.workAtchFileId ne '' && result.workAtchFileId ne null}">
	501	+ <button class="btnType btnType20" onclick="pdfViewPop('${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}')" style="height:20px !important; padding:0 2px !important;">V</button>
	502	+ </c:if>
	503	+ --%>
448	504	</td>
449	505	<td>
450	506	<c:forEach var="item" items="${hstTypeList}" varStatus="status">

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/uss/ion/fax/faxAdmSendList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/fax/faxAdmSendList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/fax/faxAdmSendList.jsp


 
 	fn_init();
 	
+	//팩스 금일/금월/금년 통계
+	getFaxSendThisSum();
+	
 	$('.sort').click(function(){
 		/* 
 			내림차순 sortBtnDesc

 
 }
 
-
+//팩스 금일/금월/금년 통계
+function getFaxSendThisSum() {
+	$("#faxSendThisSumArea").html("");
+	
+	$.ajax({
+        type: "POST",
+        url: "/uss/ion/fax/selectFaxSendThisSumAjax.do",
+        data: {},
+        dataType:'json',
+        async: true,
+        success: function (data) {
+        	var jsonInfo = data.result;
+			if (data.isSuccess) {
+				try {
+					var sHtml = "";
+					sHtml = "(" + jsonInfo.successDay + " : " + jsonInfo.successCntDay + "건 / " + jsonInfo.successMonth + "월 누적 : " + jsonInfo.successCntMonth + "건 / " + jsonInfo.successYear + "년 누적 : " + jsonInfo.successCntYear + "건)";
+					$("#faxSendThisSumArea").html(sHtml);
+				} catch (error) {
+					  console.error(error);
+				}					
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });	
+}	
 
 </script>
 <style>

 	
 				</div>
 				<div class="listTop">
-					<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건</p>
+					<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건<span id="faxSendThisSumArea"></span></p>
 					<div class="rightWrap">
 		<!-- 					<input type="button" class="excelBtn" onclick="javascript:sendMsgExcelDownload();"> -->
 						<!-- <input type="button" class="printBtn"> -->

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp


 <html lang="ko">
 
 <head>
+	<link rel="stylesheet" href="/pb/css/reset.css">
+	<link rel="stylesheet" href="/pb/css/common.css">
+	<link rel="stylesheet" href="/pb/css/content.css?date=202301160001">
+	<link rel="stylesheet" href="/pb/css/popup.css">
+
 	<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
 	<script src="//mozilla.github.io/pdf.js/build/pdf.js"></script>
 </head>
 <body>
 
-<div>
-  <button id="prev">Previous</button>
-  <button id="next">Next</button>
-  &nbsp; &nbsp;
-  <span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>
-</div>
-<canvas id="the-canvas" name="the-canvas"></canvas>
+	<div class="pageCont" style="text-align: center; width: 1000px;">
+		<div class="tableWrap">
+			<table class="tbType1">
+				<colgroup>
+					<col style="width: *%">
+					<col style="width: 20%">
+					<col style="width: 20%">
+					<col style="width: 20%">
+					<col style="width: 20%">
+				</colgroup>
+				<thead>
+					<tr>
+						<th>기업명</th>
+						<th>사업자번호</th>
+						<th>대표자</th>
+						<th>담당자</th>
+						<th>휴대폰</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td>${mberNm}</td>
+						<td>${bizNo}</td>
+						<td>${ceoNm}</td>
+						<td>${hstManagerNm}</td>
+						<td>${hstMbtlNum}</td>
+					</tr>
+				</tbody>
+			</table>	
+		</div>
+		
+		<canvas id="the-canvas" name="the-canvas" style="max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>
+	
+		<div>
+		  <button class="btnType" id="prev">Previous</button>
+		  &nbsp;<span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>&nbsp;
+		  <button class="btnType" id="next">Next</button>
+		  
+		  <div style="float: right; margin-right: 10px;"><button onclick="javascript:self.close()" class="btnType">CLOSE</button></div>
+		</div>
+		
+	</div>
+
 </body>
 </html>
 	<script type="text/javaScript" language="javascript">

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/api/appMgmt.jsp

--- src/main/webapp/WEB-INF/jsp/web/api/appMgmt.jsp

+++ src/main/webapp/WEB-INF/jsp/web/api/appMgmt.jsp


 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
 <script language=javascript>
 $(document).ready(function(){
+	usrDeptChk();
 	
 });
 

 		   }
 		});		
 	}    
+	
+
+	
 }
+
 
 /* API KEY 실제 DB 삭제 - 임시 */
 function fn_delete_real(p_accessNo){

 }
 
 </script>
+
+
 <form id="checkForm" name="checkForm">
 	<input type="hidden" id="mberId" value="<c:out value="${mberId }" />" />
 </form>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/api/top_tepMenu.jsp

--- src/main/webapp/WEB-INF/jsp/web/api/top_tepMenu.jsp

+++ src/main/webapp/WEB-INF/jsp/web/api/top_tepMenu.jsp


 	
 	// 현재 url 추출
 	var url = window.location.pathname;
-// 	console.log(url);
 	// 현재 url에서 uri만 추출
 	var lastPart = url.split('/').pop();
-// 	console.log(lastPart);
+
+	
 	/*   
 	 * top 메뉴중 onclick에 있는 uri을 가져와
 	 * 현재 호출된 페이지와 uri와 비교해서 맞다면   
 	 * active로 활성화 시킴              
 	 */
     $('.tabType4 .tab').each(function(index) {
-        var onclickAttr = $(this).children("button").attr("onclick");
-//         console.log("Button " + (index + 1) + " onclick: " + onclickAttr);
-        if(onclickAttr.indexOf(lastPart) > -1){
+        var idAttr = $(this).children("button").attr("id");
+        idAttr += '.do';
+
+        if(idAttr.indexOf(lastPart) > -1){
         	$(this).addClass('active');
         }
     });
-	
+
+	// 페이지 이동 이벤트
+    $('.goPage').click(function(){
+    	// 신청/관리는 기업회원 체크해야함
+    	if($(this).attr('id') == 'appMgmt'){
+	    	// 기업회원 체크
+	    	if(usrDeptChk()){
+	    		location.href=$(this).data('info');
+	    	}
+    	}else{
+    		location.href=$(this).data('info');
+    	}
+    });
 });
 
+// 기업회원 체크
+function usrDeptChk(){
+	
+	var usrDept = '${LoginVO.dept}';
+		
+	//카카오 알림톡 기업회원 전용체크
+	if(usrDept != 'c'){
+		
+		//기업회원 전용 메세지 팝업 띄워주기
+		$('#btnDeptPop').click();
+		
+		return false;
+	}else{
+		return true;
+	}
+}
+
+// 튤팁에서 취소 클릭 시 이벤트
+function customPopup(){
+	// 현재 url 추출
+	var url = window.location.pathname;
+	// 현재 url에서 uri만 추출
+	var lastPart = url.split('/').pop();
+
+	// URL을 치고 들어왔을 경우 '문자 API소개' 페이지로 이동
+    if('appMgmt.do'.indexOf(lastPart) > -1){
+    	location.href='<c:url value="/web/api/intrdView.do" />';
+    }
+}
+
+
 </script>
-				
+		
+
+        <!-- 0724 기업회원 이동 팝업 -->
+        <div class="tooltip-wrap cvt_member_popup_wrap">
+            <div class="popup-com cvt_member_layer popup01" tabindex="0" data-tooltip-con="popup01" data-focus="popup01" data-focus-prev="popup01-close">
+            <div class="popup_heading">
+                <p>알림</p>
+                <button type="button" class="tooltip-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
+            </div>
+            <div class="layer_in">
+                <p>문자API서비스는 기업회원만 신청이 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
+                <div class="popup_btn_wrap2">
+                    <button type="button" onclick="location.href='<c:url value="/web/user/membershipChange.do" />'">확인</button>
+	               	<button type="button" class="tooltip-close" data-focus="popup01-close" data-focus-next="popup01">취소</button>
+                </div>
+            </div>
+            </div>
+        </div>
+        <!--// 0724 기업회원 이동 팝업 -->
+		<button type="button" id="btnDeptPop" data-tooltip="popup01" style="display: none;"></button>		
 		
 		<ul class="tabType4">
-			<li class="tab"><button type="button"  onclick="location.href='<c:url value="/web/api/intrdView.do" />'">문자 API소개</button></li>
-			<li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/apiSpec.do" />'">API 사용안내</button></li>
-			<li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/examDown.do" />'">예제 다운로드</button></li>
-			<li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/appMgmt.do" />'">신청/관리</button></li>
+			<li class="tab"><button type="button" class="goPage" id="intrdView" data-info="<c:url value="/web/api/intrdView.do" />">문자 API소개</button></li>
+			<li class="tab"><button type="button" class="goPage" id="apiSpec" data-info="<c:url value="/web/api/apiSpec.do" />">API 사용안내</button></li>
+			<li class="tab"><button type="button" class="goPage" id="examDown" data-info="<c:url value="/web/api/examDown.do" />">예제 다운로드</button></li>
+			<li class="tab"><button type="button" class="goPage" id="appMgmt" data-info="<c:url value="/web/api/appMgmt.do" />" >신청/관리</button></li>
 	    </ul>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp

--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp

+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp


 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
+<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
 <%
 	pageContext.setAttribute("crlf", "\r\n");
 %>

 <input type="hidden" name="bbsId" value="<c:out value='${searchVO.bbsId}'/>" />
 </form:form>                
 <form:form commandName="board" name="board" method="post" enctype="multipart/form-data">
+<double-submit:preventer tokenKey="someKey" />
 <input type="hidden" name="pageIndex" value="<c:out value='${searchVO.pageIndex}'/>" />
 <input type="hidden" name="searchCnd" value="<c:out value='${searchVO.searchCnd}'/>"/>
 <input type="hidden" name="searchWrd" value="<c:out value='${searchVO.searchWrd}'/>"/>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/cop/bbs/QnaList.jsp

--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/QnaList.jsp

+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/QnaList.jsp


                     <div>
                     <form name="searchForm" id="searchForm">
 			        	
-			        	<input type="text" name="bbsId" value="${boardMenuList[0].bbsId}">
+			        	<input type="hidden" name="bbsId" value="${boardMenuList[0].bbsId}">
 						<input type="hidden" name="nttId" value="0" />
 						<input type="hidden" name="seCmmnCdId" value="${searchVO.seCmmnCdId}">
 						<input type="hidden" name="frstRegisterId" value=""/>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/login/findUserPwResult.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/findUserPwResult.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/findUserPwResult.jsp


 		, dataType:'json'
 		, timeout:(1000*30)
 		, success:function(data){
+			if(data.pwRuleCheck == false){
+				alert("비밀번호 규칙을 확인해주세요.");
+				return;
+			}
 			if(data.pwCheck == false ){
 				alert("사용한 적 있는 비밀번호 입니다. 다른 비밀번호를 입력해주세요.");
 				return;

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/usrInsertView.jsp

...	...	@@ -564,6 +564,10 @@
564	564	//저장완료 화면으로 이동하기
565	565	fnInsertJoin();
566	566
	567	+ }else if("passWordFail" == returnData.resultSts){
	568	+ alert("비밀번호 규칙을 확인해주세요.");
	569	+ return;
	570	+
567	571	}else{
568	572
569	573	alert("회원가입에 실패 하였습니다.");

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp


 							<input type="button" class="sort sortBtn" id="sort_msgType">
 						</div>
 					</th>
+					<th>발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th>내용</th>
 					<th>받는사람
 						<div class="sort_wrap">

 								</p>
 							</td>
 							<td name="listTd">
+								<p>${resultAllSentList.sendKind }</p>
+							</td>
+							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td name="listTd">

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp


 							<input type="button" class="sort sortBtn" id="sort_msgType">
 						</div>
 					</th>
+					<th>발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th>내용</th>
 					<th>받는사람
 						<div class="sort_wrap">

 								</p>
 							</td>
 							<td>
+								${resultAllSentList.sendKind }
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp


 							<input type="button" class="sort sortBtn" id="sort_orderByCode">
 						</div>
 					</th>
+					<th>발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th>내용</th>
 					<th>받는사람
 						<div class="sort_wrap">

 								</p>
 							</td>
 							<td>
+								${resultAllSentList.sendKind }
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp


 							<input type="button" class="sort sortBtn" id="sort_msgType">
 						</div>
 					</th>
+					<th>발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th>내용</th>
 					<th>받는사람
 						<div class="sort_wrap">

 								</p>
 							</td>
 							<td>
+								${resultAllSentList.sendKind }
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp


 			url = "/web/mjon/msgsent/deleteAddrNoDataAjax.do";
 			
 			$.ajax({
-		        type: "POST",
-		        url: url,
-		        data: data,
-		        dataType:'json',
-		        async: false,
-		        processData: false,
-		        contentType: false,
-		        cache: false,
-		        success: function (returnData, status) {
+				type: "POST",
+				url: url,
+				data: data,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success: function (returnData, status) {
 					if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
 						if("fail"==returnData.result){
 							

 						alert(returnData.message);
 					}
 				},
-		        error: function (e) { alert("주소록 삭제에 실패하였습니다."); console.log("ERROR : ", e); }
-		    });
+				error: function (e) { alert("주소록 삭제에 실패하였습니다."); console.log("ERROR : ", e); }
+			});
 			
 		}
 		

 			url = "/web/mjon/msgsent/insertAddBlockNoDataAjax.do";
 			
 			$.ajax({
-		        type: "POST",
-		        url: url,
-		        data: data,
-		        dataType:'json',
-		        async: false,
-		        processData: false,
-		        contentType: false,
-		        cache: false,
-		        success: function (returnData, status) {
+				type: "POST",
+				url: url,
+				data: data,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success: function (returnData, status) {
 					if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
 						if("fail"==returnData.result){
 							

 						alert(returnData.message);
 					}
 				},
-		        error: function (e) { alert("수신거부번호 등록에 실패하였습니다."); console.log("ERROR : ", e); }
-		    });
+				error: function (e) { alert("수신거부번호 등록에 실패하였습니다."); console.log("ERROR : ", e); }
+			});
 			
 		//}
 		

 	form.resultType.value = resultType;
 	
 	//만들려는 팝업의 크기
-    var popup_wid = '1280';
-    var popup_ht = '700';
+	var popup_wid = '1280';
+	var popup_ht = '700';
 
-    var popup_left = (window.screen.width / 2) - (popup_wid / 2);
-    var popup_top =(window.screen.height / 2) - (popup_ht / 2);
+	var popup_left = (window.screen.width / 2) - (popup_wid / 2);
+	var popup_top =(window.screen.height / 2) - (popup_ht / 2);
 
-    $("#resPopForm").attr("target","msgSFDetailPop");
-    
-    window.open('', 'msgSFDetailPop', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top );
-    $("#resPopForm").attr({"action":"/web/mjon/msgsent/selectMsgSFDetailListAjax.do", "method":"post"}).submit();
+	$("#resPopForm").attr("target","msgSFDetailPop");
+	
+	window.open('', 'msgSFDetailPop', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top );
+	$("#resPopForm").attr({"action":"/web/mjon/msgsent/selectMsgSFDetailListAjax.do", "method":"post"}).submit();
 	
 }
 
 
 /* 사용내역서 클릭 시 내역서 새창 팝업 오픈  */
 function fnShowPrintPopup(tabType, type) { 
-    //만들려는 팝업의 크기
-    var popup_wid = '840';
-    var popup_ht = '900';
+	//만들려는 팝업의 크기
+	var popup_wid = '840';
+	var popup_ht = '900';
 
-    var popup_left = (window.screen.width / 2) - (popup_wid / 2);
-    var popup_top =(window.screen.height / 2) - (popup_ht / 2);
+	var popup_left = (window.screen.width / 2) - (popup_wid / 2);
+	var popup_top =(window.screen.height / 2) - (popup_ht / 2);
 
-    $("#tabType").val(tabType);
-    $("#searchForm").attr("target","msgSentPrint");
-    
-    window.open('', 'msgSentPrint', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top +',scrollbars=1');
-    $("#searchForm").attr({"action":"/web/mjon/msgsent/printMsgSentDataAjax.do", "method":"post"}).submit();
-    
+	$("#tabType").val(tabType);
+	$("#searchForm").attr("target","msgSentPrint");
+	
+	window.open('', 'msgSentPrint', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top +',scrollbars=1');
+	$("#searchForm").attr({"action":"/web/mjon/msgsent/printMsgSentDataAjax.do", "method":"post"}).submit();
+	
 }
 
 function addrGroupDuplCnt() {

 	var url = "/web/addr/selectDuplAddrGroupNameAjax.do";
 	
 	$.ajax({
-        async: false,
+		async: false,
 		type: "post",
-        url: url,
-        data: data,
-        dataType:"JSON",
+		url: url,
+		data: data,
+		dataType:"JSON",
 //          contentType: false,
 //      	 processData: false,
-        cache: false,
-        success: function (returnData, status) {
+		cache: false,
+		success: function (returnData, status) {
 			if("dupl"==returnData.result1) {
 				flag = false;
 			}

 			url = "/web/mjon/msgsent/insertAddAddrGrpDataAjax.do";
 			
 			$.ajax({
-		        type: "POST",
-		        url: url,
-		        data: data,
-		        dataType:'json',
-		        async: false,
-		        processData: false,
-		        contentType: false,
-		        cache: false,
-		        success: function (returnData, status) {
+				type: "POST",
+				url: url,
+				data: data,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success: function (returnData, status) {
 					if(status == 'success'){ // status 확인 필요한가. 석세스 안뜨면 에러 가지 않나
 						if("fail"==returnData.result){
 							

 						alert(returnData.message);
 					}
 				},
-		        error: function (e) { alert("주소록 등록에 실패하였습니다."); console.log("ERROR : ", e); }
-		    });
+				error: function (e) { alert("주소록 등록에 실패하였습니다."); console.log("ERROR : ", e); }
+			});
 	}else{
 		
 		alert("등록할 문자를 선택해 주세요.");

 				<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
 			<div class="layer_in" id="msgSentDetailPopLoad">
-                <div class="popup_btn_wrap2" style="justify-content: center;">
-                    <button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>                      
-                </div>
+				<div class="popup_btn_wrap2" style="justify-content: center;">
+					<button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>                      
+				</div>
 			</div>
 		</div>
 	</div><!--// 문자내용 팝업 -->

 				<div class="gorup_join_cont">
 					<p class="adr_pop_title">선택된 발송내역 전화번호를 그룹으로 등록합니다.</p>
 					<div class="group_input" style="margin-top: 0;">
-                        <div class="input_left">그룹이름</div>
-                        <div class="input_right">
-                            <label for="grpNm" class="label">새 그룹명 입력</label>
-                            <input type="text" id="grpNm" name="grpNm" placeholder="새 그룹명 입력" onfocus="this.placeholder=''" onblur="this.placeholder='새 그룹명 입력'" class="inputLight">
-                        </div>
-                    </div>
+						<div class="input_left">그룹이름</div>
+						<div class="input_right">
+							<label for="grpNm" class="label">새 그룹명 입력</label>
+							<input type="text" id="grpNm" name="grpNm" placeholder="새 그룹명 입력" onfocus="this.placeholder=''" onblur="this.placeholder='새 그룹명 입력'" class="inputLight">
+						</div>
+					</div>
 					<div class="popup_btn_wrap2">
 						<button type="button" onclick="javascript:fnAddAddrNo(); return false;">저장</button>
 						<button type="button" class="tooltip-close" data-focus="rev_popup02-close" data-focus-next="rev_popup02">취소</button>                      

 			</div>
 		</div>
 	</div>
-    <div class="inner">
-        <!-- send top -->
-        <div class="send_top">
+	<div class="inner">
+		<!-- send top -->
+		<div class="send_top">
 		<!-- 결제관리 - 요금 사용내역 -->
-            <div class="rev_admin_cont serv_content current">
-                <div class="heading">
-                    <h2>발송결과</h2>
-                    <button type="button" class="button info" onclick="infoPop('selectMsgSentView');">사용안내</button>
-                    <button type="button" class="button junk" data-tooltip="popupJunk">통신사 스팸규격안내</button>
-                </div>
+			<div class="rev_admin_cont serv_content current">
+				<div class="heading">
+					<h2>발송결과</h2>
+					<button type="button" class="button info" onclick="infoPop('selectMsgSentView');">사용안내</button>
+					<button type="button" class="button junk" data-tooltip="popupJunk">통신사 스팸규격안내</button>
+				</div>
 					<!-- tab button -->
-                <div class="pay_tab_wrap">
+				<div class="pay_tab_wrap">
 					<%@include file="/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp" %>
 				</div>
 					<!--// tab button -->
-                <%--<div class="titBox type1">
-                    <p>- 보낸결과는 이동통신사의 결과값을 기반으로 표시되며, 최대 6개월간의 발송내역만 확인하실 수 있습니다.</p>
-                    <p>- 전송내역이 필요한 경우 기간(6개월) 내에 다운로드하여 주시기 바랍니다.</p>
-                    <p>- 보낸결과는 이동통신사 및 수신자 등의 사정으로 발송이 지연된 경우 결과가 다소 늦게 확인될 수 있습니다.</p>
-                    <p>- 받는사람 기준으로 전송건별(묶음), 개인별(건) 상세조회가 가능합니다.</p>
-                    <p>- 단문문자는 최대 24시간, 장문 및 그림문자는 최대 72시간까지 결과값이 수신되지 않은 경우 실패(비과금) 처리됩니다.</p>
-                    <p>- 정상 수신인데도 불구하고 문자를 받지 못한 경우에는 “이통사별스팸차단서비스(버튼)” 안내를 확인하시기 바랍니다.</p>
-                    <p>- 발송건 전체가 오류 처리되는 경우 번호도용 차단서비스에 가입되어 있을 수 있습니다. “번호도용 차단서비스(버튼)” 안내를 참고하시기 바랍니다.</p>
-                    <p>- 보낸결과는 삭제 시 복구가 불가하오니 반드시 유의하시기 바랍니다.</p>
-                    <div class="btnWrap type1">
-                        <button type="button" data-tooltip="popupJunk" class="tab1">정상수신인데 못받은 경우<span>(통신사별 스팸차단서비스)</span></button>
-                        <button type="button" data-tooltip="popupJunk" class="tab2">발송내용이 전체오류가 나는 경우<span>(통신사별 스팸차단서비스)</span></button>
-                    </div>
-                </div>--%>
-                <form id="searchForm" name="searchForm" method="post">
-	                <input type="hidden" id="pageIndex" name="pageIndex" value="1"/>
-	                <input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
-	                <input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
+				<%--<div class="titBox type1">
+					<p>- 보낸결과는 이동통신사의 결과값을 기반으로 표시되며, 최대 6개월간의 발송내역만 확인하실 수 있습니다.</p>
+					<p>- 전송내역이 필요한 경우 기간(6개월) 내에 다운로드하여 주시기 바랍니다.</p>
+					<p>- 보낸결과는 이동통신사 및 수신자 등의 사정으로 발송이 지연된 경우 결과가 다소 늦게 확인될 수 있습니다.</p>
+					<p>- 받는사람 기준으로 전송건별(묶음), 개인별(건) 상세조회가 가능합니다.</p>
+					<p>- 단문문자는 최대 24시간, 장문 및 그림문자는 최대 72시간까지 결과값이 수신되지 않은 경우 실패(비과금) 처리됩니다.</p>
+					<p>- 정상 수신인데도 불구하고 문자를 받지 못한 경우에는 “이통사별스팸차단서비스(버튼)” 안내를 확인하시기 바랍니다.</p>
+					<p>- 발송건 전체가 오류 처리되는 경우 번호도용 차단서비스에 가입되어 있을 수 있습니다. “번호도용 차단서비스(버튼)” 안내를 참고하시기 바랍니다.</p>
+					<p>- 보낸결과는 삭제 시 복구가 불가하오니 반드시 유의하시기 바랍니다.</p>
+					<div class="btnWrap type1">
+						<button type="button" data-tooltip="popupJunk" class="tab1">정상수신인데 못받은 경우<span>(통신사별 스팸차단서비스)</span></button>
+						<button type="button" data-tooltip="popupJunk" class="tab2">발송내용이 전체오류가 나는 경우<span>(통신사별 스팸차단서비스)</span></button>
+					</div>
+				</div>--%>
+				<form id="searchForm" name="searchForm" method="post">
+					<input type="hidden" id="pageIndex" name="pageIndex" value="1"/>
+					<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
+					<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
 					<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
 					<input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 -->
 					<input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 -->
 					<input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 -->
 					<input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 -->
 					<input type="hidden" id="mberId" name="mberId" value="${LoginVO.id}"/><!-- 주소록 그룹 이름 -->
-                
-                <!-- 각 통계별 총 건수 -->
-                <c:set var="totAllCnt" value="0"/><!-- 전체 건수 -->
-                <c:set var="totSmsCnt" value="0"/><!-- 단문 건수 -->
-                <c:set var="totLmsCnt" value="0"/><!-- 장문 건수 -->
-                <c:set var="totMmsCnt" value="0"/><!-- 그림 건수 -->
-                
-                <!-- 각 통계별 성공, 실패 건수 처리 -->
-                <c:set var="waitAllCnt" value="0"/><!-- 전체 대기 건수 -->
-                <c:set var="succAllCnt" value="0"/><!-- 전체 성공 건수 -->
-                <c:set var="failAllCnt" value="0"/><!-- 전체 실패 건수 -->
-                <c:set var="waitSmsCnt" value="0"/><!-- 단문 대기 건수 -->
-                <c:set var="succSmsCnt" value="0"/><!-- 단문 성공 건수 -->
-                <c:set var="failSmsCnt" value="0"/><!-- 단문 실패 건수 -->
-                <c:set var="waitLmsCnt" value="0"/><!-- 장문 대기 건수 -->
-                <c:set var="succLmsCnt" value="0"/><!-- 장문 성공 건수 -->
-                <c:set var="failLmsCnt" value="0"/><!-- 장문 실패 건수 -->
-                <c:set var="waitMmsCnt" value="0"/><!-- 그림 대기 건수 -->
-                <c:set var="succMmsCnt" value="0"/><!-- 그림 성공 건수 -->
-                <c:set var="failMmsCnt" value="0"/><!-- 그림 실패 건수 -->
-                <!-- 발송대기 건수가 있으면 이것도 발송 실패건수로 일단 집계한다. -->
-                <c:forEach var="totalMsgCnt" items="${totalMsgCnt}" varStatus="status">
-                	
-                	<!-- 전체 갯수 구하기 -->
-                	<c:set var="totAllCnt" value="${totAllCnt + totalMsgCnt.msgResultCnt}"/>
-                		
-                	<!-- 전체 대기 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitAllCnt" value="${waitAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 전체 성공 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succAllCnt" value="${succAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 전체 실패 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failAllCnt" value="${failAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <!-- 단문 처리 -->
-                <c:forEach var="smsMsgCnt" items="${smsMsgCnt}" varStatus="status">
-                	
-                	<!-- 단문 전체 갯수 구하기 -->
-                	<c:set var="totSmsCnt" value="${totSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	
-                	<!-- 단문 대기 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitSmsCnt" value="${waitSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 단문 성공 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succSmsCnt" value="${succSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 단문 실패 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failSmsCnt" value="${failSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <!-- 장문 처리 -->
-                <c:forEach var="lmsMsgCnt" items="${lmsMsgCnt}" varStatus="status">
-                	
-                	<!-- 장문 전체 갯수 구하기 -->
-                	<c:set var="totLmsCnt" value="${totLmsCnt + lmsMsgCnt.msgResultCnt}"/>
-                	
-                	<!-- 장문 대기 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitLmsCnt" value="${waitLmsCnt + lmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 장문 성공 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succLmsCnt" value="${succLmsCnt + lmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 장문 실패 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failLmsCnt" value="${failLmsCnt + lmsMsgCnt.msgResultCnt}"/>	
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <!-- 그림 처리 -->
-                <c:forEach var="mmsMsgCnt" items="${mmsMsgCnt}" varStatus="status">
-                
-                	<!-- 그림 전체 갯수 구하기 -->
-                	<c:set var="totMmsCnt" value="${totMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	
-                	<!-- 그림 대기 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitMmsCnt" value="${waitMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 그림 성공 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succMmsCnt" value="${succMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-
-                	<!-- 그림 실패 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failMmsCnt" value="${failMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <div class="rev_admin">
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>전체</p>
-                            <p><span><fmt:formatNumber value="${totAllCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>단문(SMS)</p>
-                            <p><span><fmt:formatNumber value="${totSmsCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>장문(LMS)</p>
-                            <p><span><fmt:formatNumber value="${totLmsCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>그림(MMS)</p>
-                            <p><span><fmt:formatNumber value="${totMmsCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                </div>
-                <div class="excel_middle">
-                    <div class="select_btnWrap clearfix">
-                        <div class="btn_left">
-                            <span class="cal_label">기간선택</span>
-                            <div class="calendar_wrap">
-                                <input type="text" class="startDate inp calendar" title="검색 시작일" id="startDate" name="startDate" value="<c:out value='${mjonMsgSentVO.startDate}'/>" data-datecontrol="true">
-                                <span class="dateEtc">~</span>
-                                <input type="text" class="endDate inp calendar" title="검색 종료일" id="endDate" name="endDate" value="<c:out value='${mjonMsgSentVO.endDate}'/>" data-datecontrol="true">
-                            </div>
-                            <!-- <button type="button">전월</button>
-                            <button type="button">당월</button> -->
-                            <button type="button" onclick="setCalVal(lastfulstday,'startDate');setCalVal( lastfuledday,'endDate'); return false;"  class="btnType btnType19">전월</button>
-							<button type="button" onclick="setCalVal(thisfulstlday,'startDate');setCalVal( thisfuledtlday,'endDate'); return false;"  class="btnType btnType19">당월</button>
-                            <!-- <button type="button">3개월</button> -->
-                            <button type="button" onclick="setCalVal(threefulstday,'startDate');setCalVal( threefuledday,'endDate'); return false;"  class="btnType btnType19">3개월</button>
-                            <button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
-                        </div>
-                        <div class="btn_right">
-                            <%-- <label for="searchMsgType" class="label">문자형태 선택 == ${mjonMsgSentVO.searchMsgType}</label>
-                            <select name="searchMsgType" id="searchMsgType" class="selType2">
-                            	<option value="">전체</option>
-                                <option value="S" <c:if test="${mjonMsgSentVO.searchMsgType == 'S'}">selected</c:if> >단문</option>
-                                <option value="L" <c:if test="${mjonMsgSentVO.searchMsgType == 'L'}">selected</c:if> >장문</option>
-                                <option value="M" <c:if test="${mjonMsgSentVO.searchMsgType == 'M'}">selected</c:if> >그림</option>
-                            </select> --%>
-                            
-                            <label for="searchCondition" class="label">발신번호 선택 == ${mjonMsgSentVO.searchCondition}</label>
-                            <select name="searchCondition" id="searchCondition" class="selType2">
-                                <option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
-                                <option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option>
-                            </select>
-                            <div class="search">
-                                <label for="id" class="label"></label>
-                                <input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchKeyword}'/>" placeholder="검색어를 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='검색어를 입력하세요.'">
-                                <button type="button" class="btnType btnType2" onClick="javascript:fnSearch(1); return false;">검색</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="list_tab_wrap2 type4">
-                    <!-- tab button -->
-                    <ul class="list_tab">
-                        <li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
-                        <li class="tab"><button type="button" onclick="fnTabLoad('S',1); return false;">단문(SMS)</button></li>
-                        <li class="tab"><button type="button" onclick="fnTabLoad('L',2); return false;">장문(LMS)</button></li>
-                        <li class="tab"><button type="button" onclick="fnTabLoad('M',3); return false;">그림(MMS)</button></li>
-                    </ul><!--// tab button -->
-                </div>
-                <!-- 예약관리 > 전체 -->
-	                <div class="price_history_cont current" id="listTab_2">
-	                    <!-- tab button -->
-	                    <div class="table_tab_wrap">
-	                        <ul>
-	                            <li class="tab active">
-	                            <button type="button" onclick="fnListLoad('all','0'); return false;">전체</button></li>
-	                            <li class="tab"><button type="button" onclick="fnListLoad('ready','1'); return false;">결과대기</button></li>
-	                            <li class="tab"><button type="button" onclick="fnListLoad('complete','2'); return false;">정상수신</button></li>
-	                            <li class="tab"><button type="button" onclick="fnListLoad('fail','3'); return false;">수신오류</button></li>
-	                        </ul><!--// tab button -->
-	                        <div class="tab_depth1">
-                                <a href="#none" class="on msgGgoupList">받는사람(전송건별)</a>
-                                <a href="#none" style="display: none;"></a>
-                                <a href="#none" class="msgPrivateList">받는사람(개인별)</a>
-                                <div class="on_active">받는사람(전송건별)</div>
-                            </div>
-	                    </div>
-	                    <!-- 발송관리 리스트 -->
-						<div class="table_cont current msgSentAllLoad" id="tableCont_1">
-						</div><!-- //전체 종료 -->
-						<!-- table -->
+				
+				
+					<div class="rev_content" id="tab5_1">
+						<div class="rev_admin">
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>전체</p>
+									<c:set var="allTotal" value="${H_allSentCntVO.totCnt + A_allSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${allTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>단문(SMS)</p>
+									<c:set var="smsTotal" value="${H_smsSentCntVO.totCnt + A_smsSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${smsTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_smsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_smsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>장문(LMS)</p>
+									<c:set var="lmsTotal" value="${H_lmsSentCntVO.totCnt + A_lmsSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${lmsTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_lmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_lmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>그림(MMS)</p>
+									<c:set var="mmsTotal" value="${H_mmsSentCntVO.totCnt + A_mmsSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${mmsTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top">WEB<span class="title_num"><fmt:formatNumber value="${H_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_mmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top">API<span class="title_num"><fmt:formatNumber value="${A_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_mmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+						</div>
+						
+						
+						
+						
+						
+						<div class="excel_middle">
+							<div class="select_btnWrap clearfix">
+								<div class="btn_left">
+									<span class="cal_label">기간선택</span>
+									<div class="calendar_wrap">
+										<input type="text" class="startDate inp calendar" title="검색 시작일" id="startDate" name="startDate" value="<c:out value='${mjonMsgSentVO.startDate}'/>" data-datecontrol="true">
+										<span class="dateEtc">~</span>
+										<input type="text" class="endDate inp calendar" title="검색 종료일" id="endDate" name="endDate" value="<c:out value='${mjonMsgSentVO.endDate}'/>" data-datecontrol="true">
+									</div>
+									<!-- <button type="button">전월</button>
+									<button type="button">당월</button> -->
+									<button type="button" onclick="setCalVal(lastfulstday,'startDate');setCalVal( lastfuledday,'endDate'); return false;"  class="btnType btnType19">전월</button>
+									<button type="button" onclick="setCalVal(thisfulstlday,'startDate');setCalVal( thisfuledtlday,'endDate'); return false;"  class="btnType btnType19">당월</button>
+									<!-- <button type="button">3개월</button> -->
+									<button type="button" onclick="setCalVal(threefulstday,'startDate');setCalVal( threefuledday,'endDate'); return false;"  class="btnType btnType19">3개월</button>
+									<button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
+								</div>
+								<div class="btn_right">
+									<%-- <label for="searchMsgType" class="label">문자형태 선택 == ${mjonMsgSentVO.searchMsgType}</label>
+									<select name="searchMsgType" id="searchMsgType" class="selType2">
+										<option value="">전체</option>
+										<option value="S" <c:if test="${mjonMsgSentVO.searchMsgType == 'S'}">selected</c:if> >단문</option>
+										<option value="L" <c:if test="${mjonMsgSentVO.searchMsgType == 'L'}">selected</c:if> >장문</option>
+										<option value="M" <c:if test="${mjonMsgSentVO.searchMsgType == 'M'}">selected</c:if> >그림</option>
+									</select> --%>
+									
+									<c:if test="${appMgmt }">
+									<label for="searchCondition_01" class="label">발신방식 == ${mjonMsgSentVO.searchCondition}</label>
+										<select name="searchCondition_01" id="searchCondition_01" class="selType2 select_all_btn">
+											<option value="" <c:if test="${empty mjonMsgSentVO.searchCondition_01 }">selected</c:if> >발송방식 전체</option>
+											<option value="H" <c:if test="${mjonMsgSentVO.searchCondition_01 == 'H'}">selected</c:if> >WEB</option>
+											<option value="A" <c:if test="${mjonMsgSentVO.searchCondition_01 == 'A'}">selected</c:if> >API</option>
+										</select>
+									</c:if>
+									<label for="searchCondition" class="label">발신번호 선택 == ${mjonMsgSentVO.searchCondition}</label>
+									<select name="searchCondition" id="searchCondition" class="selType2 select_btn">
+										<option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
+										<option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option>
+									</select>
+									<div class="search">
+										<label for="id" class="label"></label>
+										<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchKeyword}'/>" placeholder="검색어를 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='검색어를 입력하세요.'">
+										<button type="button" class="btnType btnType2" onClick="javascript:fnSearch(1); return false;">검색</button>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="list_tab_wrap2 type4">
+							<!-- tab button -->
+							<ul class="list_tab">
+								<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
+								<li class="tab"><button type="button" onclick="fnTabLoad('S',1); return false;">단문(SMS)</button></li>
+								<li class="tab"><button type="button" onclick="fnTabLoad('L',2); return false;">장문(LMS)</button></li>
+								<li class="tab"><button type="button" onclick="fnTabLoad('M',3); return false;">그림(MMS)</button></li>
+							</ul><!--// tab button -->
+						</div>
+						<!-- 예약관리 > 전체 -->
+						<div class="price_history_cont current" id="listTab_2">
+							<!-- tab button -->
+							<div class="table_tab_wrap">
+								<ul>
+									<li class="tab active">
+									<button type="button" onclick="fnListLoad('all','0'); return false;">전체</button></li>
+									<li class="tab"><button type="button" onclick="fnListLoad('ready','1'); return false;">결과대기</button></li>
+									<li class="tab"><button type="button" onclick="fnListLoad('complete','2'); return false;">정상수신</button></li>
+									<li class="tab"><button type="button" onclick="fnListLoad('fail','3'); return false;">수신오류</button></li>
+								</ul><!--// tab button -->
+								<div class="tab_depth1">
+									<a href="#none" class="on msgGgoupList">받는사람(전송건별)</a>
+									<a href="#none" style="display: none;"></a>
+									<a href="#none" class="msgPrivateList">받는사람(개인별)</a>
+									<div class="on_active">받는사람(전송건별)</div>
+								</div>
+							</div>
+							<!-- 발송관리 리스트 -->
+							<div class="table_cont current msgSentAllLoad" id="tableCont_1">
+							</div><!-- //전체 종료 -->
+							<!-- table -->
+						</div>
 					</div>
 				</form>
 			</div>
-        </div><!--// send top -->
-    </div>
+		</div><!--// send top -->
+	</div>
 	<form id="resPopForm" name="resPopForm" method="post">
 		<input type="hidden" id="msgGroupId" name="msgGroupId" value=""/>
 		<input type="hidden" id="msgId" name="msgId" value=""/>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgAllListAjax.jsp


 	<div class="tb_wrap">
 		<table class="tType4">
 			<colgroup>
-			<col style="width: 30px;">
-			<col style="width: 9%;">
-			<col style="width: 12%;">
-			<col style="width: 12%;">
-			<col style="width: 7%;">
-<%-- 			<col style="width: 15%;"> --%>
-			<col style="width: 60px;">
-			<col style="width: 9%;">
-			<col style="width: 10%;">
-			<col style="width: 9%;">
-			<col style="width: 6%;">
-			<col style="width: 8%;">
-			<col style="width: 60px;">
+				<col style="width: 20px;">
+				<col style="width: 8%;">
+				<col style="width: 12%;">
+				<col style="width: 12%;">
+				<col style="width: 6%;">
+				<col style="width: 8%;">
+				<col style="width: 42PX;">
+				<col style="width: 8%;">
+				<col style="width: 10%;">
+				<col style="width: 8%;">
+				<col style="width: 4%;">
+				<col style="width: 6%;">
+				<col style="width: 42px;">
 			</colgroup>
 			<thead>
 				<tr>

 							<input type="button" class="sort sortBtn" id="sort_subject">
 						</div>
 					</th> -->
+					<th rowspan="2">
+						발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th rowspan="2">
 						내용
 					</th>

 								</p>
 							</td> --%>
 							<td>
+								<p><c:out value="${resultAllResList.sendKind == 'H'? 'WEB' : 'API' }"/></p>
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllResList.msgGroupId}','${resultAllResList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCancelListAjax.jsp


 				<col style="width: 15%;">
 				<col style="width: 15%;">
 				<col style="width: 7%;">
-<%-- 				<col style="width: 20%;"> --%>
+				<col style="width: 8%;">
 				<col style="width: 85px;">
 				<col style="width: 9%;">
 				<col style="width: 11%;">

 							<input type="button" class="sort sortBtn" id="sort_subject">
 						</div>
 					</th> -->
+					<th rowspan="2">
+						발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th rowspan="2">
 						내용
 					</th>

 								</p>
 							</td> --%>
 							<td>
+								<p><c:out value="${resultAllResList.sendKind == 'H'? 'WEB' : 'API' }"/></p>
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllResList.msgGroupId}','${resultAllResList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgCompleteListAjax.jsp


 				<col style="width: 15%;">
 				<col style="width: 15%;">
 				<col style="width: 7%;">
-<%-- 				<col style="width: 20%;"> --%>
+				
+				<col style="width: 10%;">
 				<col style="width: 90px;">
 				<col style="width: 10%;">
 				<col style="width: 10%;">

 							<input type="button" class="sort sortBtn" id="sort_subject">
 						</div>
 					</th> -->
+					<th rowspan="2">
+						발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
+						</div>
+					</th>
 					<th>
 						내용
 					</th>

 								</p>
 							</td> --%>
 							<td>
+								<p><c:out value="${resultAllResList.sendKind == 'H'? 'WEB' : 'API' }"/></p>
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllResList.msgGroupId}','${resultAllResList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgReadyListAjax.jsp


 				<col style="width: 15%;">
 				<col style="width: 15%;">
 				<col style="width: 8%;">
-<%-- 				<col style="width: 20%;"> --%>
-				<col style="width: 85px;">
+				<col style="width: 8%;">
+				
+				<col style="width: 10%;">
 				<col style="width: 10%;">
 				<col style="width: 11%;">
 				<col style="width: 9%;">
-				<col style="width: 85px;">
+				<col style="width: 42px;">
 			</colgroup>
 			<thead>
 				<tr>

 						형태
 						<div class="sort_wrap">
 							<input type="button" class="sort sortBtn" id="sort_orderByCode">
+						</div>
+					</th>
+					<th rowspan="2">
+						발송방식
+						<div class="sort_wrap">
+							<input type="button" class="sort sortBtn" id="sort_sendKind">
 						</div>
 					</th>
 					<!-- <th rowspan="2">

 								</p>
 							</td> --%>
 							<td>
+								<p><c:out value="${resultAllResList.sendKind == 'H'? 'WEB' : 'API' }"/></p>
+							</td>
+							<td>
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllResList.msgGroupId}','${resultAllResList.fileCnt}'); return false;">상세보기</button>
 							</td>
 							<td>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgView.jsp

--- src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/reservedmsg/ReservedMsgView.jsp


 					<input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 -->
 					<input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 -->
                 
-                <!-- 각 통계별 총 건수 -->
-                <c:set var="totAllCnt" value="0"/><!-- 전체 건수 -->
-                <c:set var="totSmsCnt" value="0"/><!-- 단문 건수 -->
-                <c:set var="totLmsCnt" value="0"/><!-- 장문 건수 -->
-                <c:set var="totMmsCnt" value="0"/><!-- 그림 건수 -->
                 
-                <!-- 각 통계별 성공, 실패 건수 처리 -->
-                <c:set var="waitAllCnt" value="0"/><!-- 전체 대기 건수 -->
-                <c:set var="succAllCnt" value="0"/><!-- 전체 성공 건수 -->
-                <c:set var="failAllCnt" value="0"/><!-- 전체 실패 건수 -->
-                <c:set var="cnclAllCnt" value="0"/><!-- 전체 예약취소 건수 -->
-                
-                <c:set var="waitSmsCnt" value="0"/><!-- 단문 대기 건수 -->
-                <c:set var="succSmsCnt" value="0"/><!-- 단문 성공 건수 -->
-                <c:set var="failSmsCnt" value="0"/><!-- 단문 실패 건수 -->
-                <c:set var="cnclSmsCnt" value="0"/><!-- 단문 예약취소 건수 -->
-                
-                <c:set var="waitLmsCnt" value="0"/><!-- 장문 대기 건수 -->
-                <c:set var="succLmsCnt" value="0"/><!-- 장문 성공 건수 -->
-                <c:set var="failLmsCnt" value="0"/><!-- 장문 실패 건수 -->
-                <c:set var="cnclLmsCnt" value="0"/><!-- 장문 예약취소 건수 -->
-                
-                <c:set var="waitMmsCnt" value="0"/><!-- 그림 대기 건수 -->
-                <c:set var="succMmsCnt" value="0"/><!-- 그림 성공 건수 -->
-                <c:set var="failMmsCnt" value="0"/><!-- 그림 실패 건수 -->
-                <c:set var="cnclMmsCnt" value="0"/><!-- 그림 예약취소 건수 -->
-                
-                <c:forEach var="totalMsgCnt" items="${totalMsgCnt}" varStatus="status">
-                
-                	<!-- 전체 갯수 구하기 -->
-                	<c:set var="totAllCnt" value="${totAllCnt + totalMsgCnt.msgResultCnt}"/>
-                		
-                	<!-- 전체 대기 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitAllCnt" value="${waitAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                		
-                	<!-- 전체 성공 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succAllCnt" value="${succAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 전체 실패 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failAllCnt" value="${failAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 전체 예약취소 갯수 -->
-                	<c:if test="${totalMsgCnt.msgResultSts == 'C'}">
-                		<c:set var="cnclAllCnt" value="${cnclAllCnt + totalMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <!-- 단문 처리 -->
-                <c:forEach var="smsMsgCnt" items="${smsMsgCnt}" varStatus="status">
-                	
-                	<!-- 단문 전체 갯수 구하기 -->
-                	<c:set var="totSmsCnt" value="${totSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	
-                	<!-- 단문 대기 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitSmsCnt" value="${waitSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 단문 성공 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succSmsCnt" value="${succSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 단문 실패 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failSmsCnt" value="${failSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 단문 예약취소 갯수 구하기 -->
-                	<c:if test="${smsMsgCnt.msgResultSts == 'C'}">
-                		<c:set var="cnclSmsCnt" value="${cnclSmsCnt + smsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <!-- 장문 처리 -->
-                <c:forEach var="lmsMsgCnt" items="${lmsMsgCnt}" varStatus="status">
-                	
-                	<!-- 장문 전체 갯수 구하기 -->
-                	<c:set var="totLmsCnt" value="${totLmsCnt + lmsMsgCnt.msgResultCnt}"/>
-                	
-                	<!-- 장문 대기 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitLmsCnt" value="${waitLmsCnt + lmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 장문 성공 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succLmsCnt" value="${succLmsCnt + lmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 장문 실패 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failLmsCnt" value="${failLmsCnt + lmsMsgCnt.msgResultCnt}"/>	
-                	</c:if>
-                	
-                	<!-- 장문 예약취소 갯수 구하기 -->
-                	<c:if test="${lmsMsgCnt.msgResultSts == 'C'}">
-                		<c:set var="cnclLmsCnt" value="${cnclLmsCnt + lmsMsgCnt.msgResultCnt}"/>	
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <!-- 그림 처리 -->
-                <c:forEach var="mmsMsgCnt" items="${mmsMsgCnt}" varStatus="status">
-                
-                	<!-- 그림 전체 갯수 구하기 -->
-                	<c:set var="totMmsCnt" value="${totMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	
-                	<!-- 그림 대기 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'W'}">
-                		<c:set var="waitMmsCnt" value="${waitMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 그림 성공 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'S'}">
-                		<c:set var="succMmsCnt" value="${succMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 그림 실패 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'F'}">
-                		<c:set var="failMmsCnt" value="${failMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                	<!-- 그림 예약취소 갯수 구하기 -->
-                	<c:if test="${mmsMsgCnt.msgResultSts == 'C'}">
-                		<c:set var="cnclMmsCnt" value="${cnclMmsCnt + mmsMsgCnt.msgResultCnt}"/>
-                	</c:if>
-                	
-                </c:forEach>
-                
-                <div class="rev_admin">
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>전체</p>
-                            <p><span><fmt:formatNumber value="${totAllCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>예약취소</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${cnclAllCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>단문(SMS)</p>
-                            <p><span><fmt:formatNumber value="${totSmsCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>예약취소</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${cnclSmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>장문(LMS)</p>
-                            <p><span><fmt:formatNumber value="${totLmsCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>예약취소</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${cnclLmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                    <div class="rev_admin_in">
-                        <div class="rev_admin_top clearfix">
-                            <p>그림(MMS)</p>
-                            <p><span><fmt:formatNumber value="${totMmsCnt}" pattern="#,###"/></span> 건</p>
-                        </div>
-                        <div class="rev_admin_btm">
-                        	<dl>
-                        		<dt>대기</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${waitMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>성공</dt>
-                        		<dd><span class="c_002c9a"><fmt:formatNumber value="${succMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>실패</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${failMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        	<dl>
-                        		<dt>예약취소</dt>
-                        		<dd><span class="c_e40000"><fmt:formatNumber value="${cnclMmsCnt}" pattern="#,###"/></span>건</dd>
-                        	</dl>
-                        </div>
-                    </div>
-                </div>
+					<div class="rev_content" id="tab5_1">
+						<div class="rev_admin">
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>전체</p>
+									<c:set var="allTotal" value="${H_allSentCntVO.totCnt + A_allSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${allTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top reserve_top">WEB<span class="title_num"><fmt:formatNumber value="${H_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>예약취소</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_allSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top reserve_top">API<span class="title_num"><fmt:formatNumber value="${A_allSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_allSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_allSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_allSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>예약취소</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_allSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>단문(SMS)</p>
+									<c:set var="smsTotal" value="${H_smsSentCntVO.totCnt + A_smsSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${smsTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top reserve_top">WEB<span class="title_num"><fmt:formatNumber value="${H_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_smsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>예약취소</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_smsSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">	
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top reserve_top">API<span class="title_num"><fmt:formatNumber value="${A_smsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_smsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_smsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_smsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>예약취소</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_smsSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>장문(LMS)</p>
+									<c:set var="lmsTotal" value="${H_lmsSentCntVO.totCnt + A_lmsSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${lmsTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top reserve_top">WEB<span class="title_num"><fmt:formatNumber value="${H_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_lmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>예약취소</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_lmsSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top reserve_top">API<span class="title_num"><fmt:formatNumber value="${A_lmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_lmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_lmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_lmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>예약취소</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_lmsSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+							<div class="rev_admin_in">
+								<div class="rev_admin_top clearfix">
+									<p>그림(MMS)</p>
+									<c:set var="mmsTotal" value="${H_mmsSentCntVO.totCnt + A_mmsSentCntVO.totCnt }" />
+									<p><span><fmt:formatNumber value="${mmsTotal }" pattern="#,###"/></span> 건</p>
+								</div>
+								<div class="rev_admin_btm admin_btm">
+									<P class="title_top reserve_top">WEB<span class="title_num"><fmt:formatNumber value="${H_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+									<dl>
+										<dt>대기</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>성공</dt>
+										<dd><span class="c_002c9a"><fmt:formatNumber value="${H_mmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>실패</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+									<dl>
+										<dt>예약취소</dt>
+										<dd><span class="c_e40000"><fmt:formatNumber value="${H_mmsSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+									</dl>
+								</div>
+								<c:if test="${appMgmt }">
+									<div class="rev_admin_btm admin_btm admin_btm_api">
+										<P class="title_top reserve_top">API<span class="title_num"><fmt:formatNumber value="${A_mmsSentCntVO.totCnt}" pattern="#,###"/><span>건</span></span></P>
+										<dl>
+											<dt>대기</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_mmsSentCntVO.waitCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>성공</dt>
+											<dd><span class="c_002c9a"><fmt:formatNumber value="${A_mmsSentCntVO.succCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>실패</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_mmsSentCntVO.failCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+										<dl>
+											<dt>예약취소</dt>
+											<dd><span class="c_e40000"><fmt:formatNumber value="${A_mmsSentCntVO.cnclCnt}" pattern="#,###"/></span>건</dd>
+										</dl>
+									</div>	
+								</c:if>
+							</div>
+						</div>
+						
+						
                 <div class="excel_middle">
                     <div class="select_btnWrap clearfix">
                         <div class="btn_left">

                             <button type="button" onclick="setCalVal(threefulstday,'startDate');setCalVal( threefuledday,'endDate'); return false;"  class="btnType btnType19">3개월</button>
                             <button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
                         </div>
-                        <div class="btn_right">
+                        <div class="btn_right">			
+							<c:if test="${appMgmt }">
+								<label for="searchCondition_01" class="label">발신방식 == ${mjonResvMsgVO.searchCondition_01}</label>
+								<select name="searchCondition_01" id="searchCondition_01" class="selType2 select_all_btn">
+									<option value="" <c:if test="${empty mjonResvMsgVO.searchCondition_01 }">selected</c:if> >발송방식 전체</option>
+									<option value="H" <c:if test="${mjonResvMsgVO.searchCondition_01 == 'H'}">selected</c:if> >WEB</option>
+									<option value="A" <c:if test="${mjonResvMsgVO.searchCondition_01 == 'A'}">selected</c:if> >API</option>
+								</select>
+							</c:if>
                             <label for="searchCondition" class="label">발신번호 선택 == ${mjonResvMsgVO.searchCondition}</label>
-                            <select name="searchCondition" id="searchCondition" class="selType2">
+                            <select name="searchCondition" id="searchCondition" class="selType2 select_btn">
                                 <%-- <option value="1" <c:if test="${mjonResvMsgVO.searchCondition == '1'}">selected</c:if> >제목</option> --%>
                                 <option value="2" <c:if test="${mjonResvMsgVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
                             </select>
                             <div class="search">
                                 <label for="id" class="label"></label>
-                                <input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchKeyword}'/>" placeholder="검색어를 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='검색어를 입력하세요.'">
+<%--                                 <input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchKeyword}'/>" placeholder="검색어를 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='검색어를 입력하세요.'"> --%>
+                                <input type="text" class="send_text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchKeyword}'/>" placeholder="검색어를 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='검색어를 입력하세요.'">
                                 <button type="button" class="btnType btnType2" onClick="javascript:fnSearch(1); return false;">검색</button>
                             </div>
                         </div>

23b4d25

4169e61

src/main/webapp/WEB-INF/jsp/web/user/passwordChange.jsp

--- src/main/webapp/WEB-INF/jsp/web/user/passwordChange.jsp

+++ src/main/webapp/WEB-INF/jsp/web/user/passwordChange.jsp


 					$('#newPassword2').val("");
 					$('#newPassword1').focus();
 					return;	
+				}		
+				
+				if(returnData.errType == "04") {
+					$('#newPassword1').val("");
+					$('#newPassword2').val("");
+					$('#newPassword1').focus();
+					return;	
 				}				
 			}
 		}

23b4d25

4169e61

src/main/webapp/publish/api_admin1.html

--- src/main/webapp/publish/api_admin1.html

+++ src/main/webapp/publish/api_admin1.html


 
         <!-- 0724 기업회원 이동 팝업 -->
         <div class="tooltip-wrap cvt_member_popup_wrap">
-            <div class="popup-com cvt_member_layer popup01">
+            <div class="popup-com cvt_member_layer popup01" tabindex="0" data-tooltip-con="popup01" data-focus="popup01" data-focus-prev="popup01-close">
             <div class="popup_heading">
                 <p>알림</p>
                 <button type="button" class="tooltip-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>

                 <p>문자API서비스는 기업회원만 신청이 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
                 <div class="popup_btn_wrap2">
                     <button type="button" onclick="location.href='/web/user/membershipChange.do'">확인</button>
-                    <button type="button" class="tooltip-close" data-focus="popup01-close" data-focus-next="popup01" onclick="location.href='#'">취소</button>
+	               	<button type="button" class="tooltip-close" data-focus="popup01-close" data-focus-next="popup01">취소</button>
                 </div>
             </div>
             </div>
         </div>
         <!--// 0724 기업회원 이동 팝업 -->
-
+		<button type="button" id="btnDeptPop" data-tooltip="popup01" style="display: none;"></button>
         <div class="inner">
             <!-- send top -->
             <div class="send_top">

23b4d25

4169e61

src/main/webapp/publish/textingmsg_2022.html

--- src/main/webapp/publish/textingmsg_2022.html

+++ src/main/webapp/publish/textingmsg_2022.html

...	...	@@ -1,3 +1,15 @@
	1	+
	2	+<th>발송방식
	3	+ <div class="sort_wrap">
	4	+ <input type="button" class="sort sortBtn" id="sort_sendKind">
	5	+ </div>
	6	+</th>
	7	+
	8	+
	9	+<td>
	10	+ ${resultAllSentList.sendKind }
	11	+</td>
	12	+
1	13	<!DOCTYPE html>
2	14	<html lang="ko">
3	15

Add a comment

Open 0
Closed 0

List

...	...	@@ -162,6 +162,7 @@
162	162
163	163	//전체 발송 리스트 불러오기
164	164	List<KakaoSentVO> resultAllSentList = kakaoSentService.selectAllKakaoSentList(kakaoSentVO);
	165	+ System.out.println("??");
165	166	model.addAttribute("resultAllSentList", resultAllSentList);
166	167	model.addAttribute("resultAllSentCnt", resultAllSentList.size());
167	168

...	...	@@ -1,6 +1,5 @@
1	1	package itn.let.mjo.msg.web;
2	2
3		-import java.io.File;
4	3	import java.io.OutputStream;
5	4	import java.net.URL;
6	5	import java.text.SimpleDateFormat;
...	...	@@ -5044,7 +5043,40 @@
5044	5043	}
5045	5044
5046	5045	@RequestMapping(value = {"/uss/ion/msg/pdfView.do"})
5047		- public String pdfView(FileVO fileVO, ModelMap model) throws Exception {
	5046	+ public String pdfView(FileVO fileVO
	5047	+ , ModelMap model
	5048	+ , HttpServletRequest request) throws Exception {
	5049	+
	5050	+ FileVO fvo = fileService.selectFileInf(fileVO);
	5051	+ String path = "";
	5052	+
	5053	+ if(fvo != null) {
	5054	+ if("pdf".equals(fvo.getFileExtsn())) {
	5055	+ path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
	5056	+ }else {
	5057	+ String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
	5058	+ path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
	5059	+ }
	5060	+ }
	5061	+
	5062	+ String mberNm = request.getParameter("mberNm");
	5063	+ String bizNo = request.getParameter("bizNo");
	5064	+ String ceoNm = request.getParameter("ceoNm");
	5065	+ String hstManagerNm = request.getParameter("hstManagerNm");
	5066	+ String hstMbtlNum = request.getParameter("hstMbtlNum");
	5067	+
	5068	+ model.addAttribute("pdfPath", path);
	5069	+ model.addAttribute("mberNm", mberNm);
	5070	+ model.addAttribute("bizNo", bizNo);
	5071	+ model.addAttribute("ceoNm", ceoNm);
	5072	+ model.addAttribute("hstManagerNm", hstManagerNm);
	5073	+ model.addAttribute("hstMbtlNum", hstMbtlNum);
	5074	+
	5075	+ return "/uss/ion/msg/pdfView";
	5076	+ }
	5077	+
	5078	+ @RequestMapping(value = {"/uss/ion/msg/pdfViewAjax.do"})
	5079	+ public String pdfViewAjax(FileVO fileVO, ModelMap model) throws Exception {
5048	5080
5049	5081	FileVO fvo = fileService.selectFileInf(fileVO);
5050	5082	String path = "";
...	...	@@ -5061,8 +5093,6 @@
5061	5093	model.addAttribute("pdfPath", path);
5062	5094
5063	5095	return "/uss/ion/msg/pdfView";
5064		- }
5065		-
5066		-
	5096	+ }
5067	5097
5068	5098	} (No newline at end of file)

...	...	@@ -1231,6 +1231,28 @@
1231	1231	return modelAndView;
1232	1232	}
1233	1233
	1234	+ //비밀번호 규칙섬 검증 추가 - 취약점 조치
	1235	+ userManageVO.setPassword(userManageVO.getPassword().trim());
	1236	+ String passWord = userManageVO.getPassword();
	1237	+ Pattern digitPattern = Pattern.compile("[0-9]");
	1238	+ Matcher digitMatcher = digitPattern.matcher(passWord);
	1239	+ boolean hasDigit = digitMatcher.find();
	1240	+
	1241	+ Pattern letterPattern = Pattern.compile("[a-zA-Z]");
	1242	+ Matcher letterMatcher = letterPattern.matcher(passWord);
	1243	+ boolean hasLetter = letterMatcher.find();
	1244	+
	1245	+ Pattern specialPattern = Pattern.compile("[`~!@@#$%^&*\|\\\\'\";:/?]");
	1246	+ Matcher specialMatcher = specialPattern.matcher(passWord);
	1247	+ boolean hasSpecialCharacter = specialMatcher.find();
	1248	+
	1249	+ if(hasDigit == false \|\| hasLetter == false \|\| hasSpecialCharacter == false \|\| passWord.length() < 8 \|\| passWord.length() > 20) {
	1250	+ modelAndView.addObject("errType", "04");
	1251	+ modelAndView.addObject("message", "비밀번호 규칙을 확인해주세요.");
	1252	+ modelAndView.addObject("result", "fail");
	1253	+ return modelAndView;
	1254	+ }
	1255	+
1234	1256	userManageVO.setEmplyrId(loginVO.getId());
1235	1257	userManageService.updateUserPWAjax(userManageVO);
1236	1258	modelAndView.addObject("result", "success");

...	...	@@ -1051,7 +1051,7 @@
1051	1051	, DATE_FORMAT(NOW(), '%c') AS successMonth
1052	1052	, DATE_FORMAT(NOW(), '%Y') AS successYear
1053	1053	, (SELECT
1054		- FORMAT(COUNT(0), 0)
	1054	+ FORMAT(IFNULL(COUNT(0), 0), 0)
1055	1055	FROM MJ_MSG_DATA C
1056	1056	WHERE
1057	1057	C.RESERVE_C_YN = 'N'
...	...	@@ -1061,7 +1061,7 @@
1061	1061	AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
1062	1062	) successCntDay
1063	1063	, (SELECT
1064		- FORMAT(COUNT(0), 0)
	1064	+ FORMAT(IFNULL(COUNT(0), 0), 0)
1065	1065	FROM MJ_MSG_DATA C
1066	1066	WHERE
1067	1067	C.RESERVE_C_YN = 'N'
...	...	@@ -1071,7 +1071,7 @@
1071	1071	AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
1072	1072	) successCntMonth
1073	1073	, (SELECT
1074		- FORMAT(COUNT(0), 0)
	1074	+ FORMAT(IFNULL(COUNT(0), 0), 0)
1075	1075	FROM MJ_MSG_DATA C
1076	1076	WHERE
1077	1077	C.RESERVE_C_YN = 'N'

...	...	@@ -104,6 +104,11 @@
104	104	<input type="button" class="sort sortBtn" id="sort_msgType">
105	105	</div>
106	106	</th>
	107	+ <th>발송방식
	108	+ <div class="sort_wrap">
	109	+ <input type="button" class="sort sortBtn" id="sort_sendKind">
	110	+ </div>
	111	+ </th>
107	112	<th>내용</th>
108	113	<th>받는사람
109	114	<div class="sort_wrap">
...	...	@@ -173,6 +178,9 @@
173	178	</p>
174	179	</td>
175	180	<td name="listTd">
	181	+ <p>${resultAllSentList.sendKind }</p>
	182	+ </td>
	183	+ <td name="listTd">
176	184	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
177	185	</td>
178	186	<td name="listTd">

...	...	@@ -110,7 +110,7 @@
110	110	File imgFiles = new File(imgDir + "." +extsn);
111	111	Image img = ImageIO.read(imgFiles);
112	112
113		- PDPage page = new PDPage(PDRectangle.A4);
	113	+ PDPage page = new PDPage(PDRectangle.A2);
114	114	doc.addPage(page);
115	115
116	116	PDImageXObject pdImage = PDImageXObject.createFromFile(imgFiles.toString(), doc);
...	...	@@ -132,6 +132,7 @@
132	132	contents.drawImage(pdImage, pageWidthPosition, pageHeightPosition, imgWidth, imgHeight);
133	133	contents.close();
134	134	doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf");
	135	+ //doc.save("C:/TEST/" + uuid + ".pdf");
135	136
136	137	} catch (Exception e) {
137	138	System.out.println("Exception! : " + e.getMessage());

...	...	@@ -9,10 +9,6 @@
9	9	import java.net.URLEncoder;
10	10	import java.util.Map;
11	11
12		-import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
13		-import itn.com.cmm.service.EgovFileMngService;
14		-import itn.com.cmm.service.FileVO;
15		-
16	12	import javax.annotation.Resource;
17	13	import javax.servlet.http.HttpServletRequest;
18	14	import javax.servlet.http.HttpServletResponse;
...	...	@@ -24,6 +20,9 @@
24	20	import org.springframework.util.FileCopyUtils;
25	21	import org.springframework.web.bind.annotation.RequestMapping;
26	22	import org.springframework.web.bind.annotation.RequestParam;
	23	+
	24	+import itn.com.cmm.service.EgovFileMngService;
	25	+import itn.com.cmm.service.FileVO;
27	26
28	27	/**
29	28	* 파일 다운로드를 위한 컨트롤러 클래스
...	...	@@ -468,6 +467,8 @@
468	467
469	468
470	469	File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
	470	+ //File uFile = new File("C:/TEST/", fileNm);
	471	+
471	472	long fSize = uFile.length();
472	473
473	474	if (fSize > 0) {

...	...	@@ -73,6 +73,7 @@
73	73	import itn.com.cmm.service.EgovFileMngUtil;
74	74	import itn.com.cmm.service.FileVO;
75	75	import itn.com.cmm.service.ReadService;
	76	+import itn.com.cmm.util.EgovDoubleSubmitHelper;
76	77	import itn.com.cmm.util.StringUtil;
77	78	import itn.com.cmm.util.WebUtil;
78	79	import itn.com.uss.ion.cnf.service.ProhibitMngService;
...	...	@@ -2712,6 +2713,12 @@
2712	2713	ModelAndView modelAndView = new ModelAndView();
2713	2714	modelAndView.setViewName("jsonView");
2714	2715
	2716	+
	2717	+ if (!EgovDoubleSubmitHelper.checkAndSaveToken("someKey", multiRequest)) {
	2718	+ modelAndView.addObject("message", "너무많은 글쓰기가 시도되었습니다.");
	2719	+ modelAndView.addObject("result", "fail");
	2720	+ return modelAndView;
	2721	+ }
2715	2722	// Start => bbsId를 변조해서 공지사항에 글 등록 방지 처리
2716	2723	//boardVO.setBbsId("BBSMSTR_000000000651"); // 공지사항
2717	2724	List<BoardVO> userBbsWriteList = bbsMngService.selectUserBbsWriteList(boardVO);

...	...	@@ -17,8 +17,6 @@
17	17
18	18	import java.io.Serializable;
19	19
20		-import itn.com.cmm.ComDefaultVO;
21		-
22	20
23	21	/**
24	22	*
...	...	@@ -206,6 +204,61 @@
206	204	private String searchMonth;
207	205	private String searchQuarter;
208	206
	207	+ private String successDay;
	208	+ private String successMonth;
	209	+ private String successYear;
	210	+ private String successCntDay;
	211	+ private String successCntMonth;
	212	+ private String successCntYear;
	213	+
	214	+ public String getSuccessDay() {
	215	+ return successDay;
	216	+ }
	217	+
	218	+ public void setSuccessDay(String successDay) {
	219	+ this.successDay = successDay;
	220	+ }
	221	+
	222	+ public String getSuccessMonth() {
	223	+ return successMonth;
	224	+ }
	225	+
	226	+ public void setSuccessMonth(String successMonth) {
	227	+ this.successMonth = successMonth;
	228	+ }
	229	+
	230	+ public String getSuccessYear() {
	231	+ return successYear;
	232	+ }
	233	+
	234	+ public void setSuccessYear(String successYear) {
	235	+ this.successYear = successYear;
	236	+ }
	237	+
	238	+ public String getSuccessCntDay() {
	239	+ return successCntDay;
	240	+ }
	241	+
	242	+ public void setSuccessCntDay(String successCntDay) {
	243	+ this.successCntDay = successCntDay;
	244	+ }
	245	+
	246	+ public String getSuccessCntMonth() {
	247	+ return successCntMonth;
	248	+ }
	249	+
	250	+ public void setSuccessCntMonth(String successCntMonth) {
	251	+ this.successCntMonth = successCntMonth;
	252	+ }
	253	+
	254	+ public String getSuccessCntYear() {
	255	+ return successCntYear;
	256	+ }
	257	+
	258	+ public void setSuccessCntYear(String successCntYear) {
	259	+ this.successCntYear = successCntYear;
	260	+ }
	261	+
209	262
210	263	public FaxGroupDataVO() {};
211	264

...	...	@@ -32,6 +32,9 @@
32	32
33	33	FaxGroupDataVO selectFaxSendDetailInfo(FaxGroupDataVO faxGroupDataVO);
34	34
	35	+ // 팩스 금일/금월/금년 통계
	36	+ FaxGroupDataVO selectFaxSendThisSum(FaxGroupDataVO faxGroupDataVO);
	37	+
35	38	List<FaxGroupDataVO> selectMyFaxSendList(FaxGroupDataVO faxGroupDataVO);
36	39
37	40

...	...	@@ -136,6 +136,11 @@
136	136	return (FaxGroupDataVO)select("faxDAO.selectFaxSendDetailInfo", faxGroupDataVO);
137	137	}
138	138
	139	+ // 팩스 금일/금월/금년 통계
	140	+ public FaxGroupDataVO selectFaxSendThisSum(FaxGroupDataVO faxGroupDataVO) {
	141	+ return (FaxGroupDataVO)select("faxDAO.selectFaxSendThisSum", faxGroupDataVO);
	142	+ }
	143	+
139	144	public List<?> selectBookMarkMsgList(MjonMsgDataVO mjonMsgDataVO) throws Exception{
140	145	return list("faxDAO.selectBookMarkMsgList", mjonMsgDataVO);
141	146	}

...	...	@@ -2,8 +2,6 @@
2	2
3	3	import java.io.File;
4	4	import java.io.IOException;
5		-import java.math.BigDecimal;
6		-import java.math.RoundingMode;
7	5	import java.text.SimpleDateFormat;
8	6	import java.time.LocalDateTime;
9	7	import java.util.ArrayList;
...	...	@@ -15,7 +13,6 @@
15	13	import java.util.Map;
16	14
17	15	import javax.annotation.Resource;
18		-import javax.servlet.http.HttpServletResponse;
19	16
20	17	import org.apache.commons.lang3.StringUtils;
21	18	import org.slf4j.Logger;
...	...	@@ -33,7 +30,6 @@
33	30	import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
34	31	import itn.com.cmm.util.DateUtil;
35	32	import itn.com.cmm.util.FaxUtil;
36		-import itn.com.cmm.util.MJUtil;
37	33	import itn.let.fax.user.service.FaxConvertMngVO;
38	34	import itn.let.fax.user.service.FaxConvertVO;
39	35	import itn.let.fax.user.service.FaxGroupDataVO;
...	...	@@ -41,14 +37,12 @@
41	37	import itn.let.fax.user.service.FaxService;
42	38	import itn.let.fax.user.service.FaxTranVO;
43	39	import itn.let.mail.service.StatusResponse;
44		-import itn.let.mjo.msg.service.MjonMsgVO;
45	40	import itn.let.mjo.msgdata.service.MjonMsgDataVO;
46	41	import itn.let.mjo.msgdata.service.impl.MjonMsgDataDAO;
47	42	import itn.let.mjo.pay.service.MjonPayVO;
48	43	import itn.let.mjo.pay.service.impl.MjonPayDAO;
49	44	import itn.let.module.base.PriceAndPoint;
50	45	import itn.let.sym.site.service.JoinSettingVO;
51		-import itn.let.uss.umt.service.MberManageVO;
52	46	import itn.let.utl.fcc.service.EgovStringUtil;
53	47
54	48
...	...	@@ -587,6 +581,12 @@
587	581	return faxDao.selectFaxSendDetailInfo(faxGroupDataVO);
588	582	}
589	583
	584	+ // 팩스 금일/금월/금년 통계
	585	+ @Override
	586	+ public FaxGroupDataVO selectFaxSendThisSum(FaxGroupDataVO faxGroupDataVO) {
	587	+ return faxDao.selectFaxSendThisSum(faxGroupDataVO);
	588	+ }
	589	+
590	590	@Override
591	591	public List<FaxGroupDataVO> selectMyFaxSendList(FaxGroupDataVO faxGroupDataVO) {
592	592	return faxDao.selectMyFaxSendList(faxGroupDataVO);

...	...	@@ -265,7 +265,7 @@
265	265
266	266	// 알림톡 금일/금월/금년 통계
267	267	@RequestMapping(value = "/uss/umt/user/selectMjonKakaoAtThisSumAjax.do")
268		- public ModelAndView DashBoardAdminLogAjax(
	268	+ public ModelAndView MjonKakaoAtThisSumAjax(
269	269	@ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception {
270	270
271	271	ModelAndView modelAndView = new ModelAndView();

...	...	@@ -37,5 +37,7 @@
37	37
38	38	//REST API 신청상태
39	39	public List<ApiKeyVO> selectApiKeyApplyStatus(ApiKeyVO apiKeyVO) throws Exception;
	40	+
	41	+ public int selectMberApiKeyChk(ApiKeyVO apiKeyVO) throws Exception;
40	42
41	43	} (No newline at end of file)

...	...	@@ -55,5 +55,9 @@
55	55	public List<ApiKeyVO> selectApiKeyApplyStatus(ApiKeyVO apiKeyVO){
56	56	return (List<ApiKeyVO>) list("ApiKeyMngDAO.selectApiKeyApplyStatus", apiKeyVO);
57	57	}
	58	+
	59	+ public int selectMberApiKeyChk(ApiKeyVO apiKeyVO) {
	60	+ return (int) select("ApiKeyMngDAO.selectMberApiKeyChk", apiKeyVO);
	61	+ }
58	62
59	63	} (No newline at end of file)

...	...	@@ -195,7 +195,7 @@
195	195
196	196	List<ApiKeyVO> resultList = new ArrayList<ApiKeyVO>();
197	197	resultList = apiKeyMngService.selectApiKeyApplyStatus(apiKeyVO);
198		-
	198	+ System.out.println("=============");
199	199	if (resultList.size()>0) {
200	200	model.addAttribute("apiVO", resultList.get(0));
201	201

...	...	@@ -42,6 +42,11 @@
42	42	}
43	43
44	44	@Override
	45	+ public int selectMberApiKeyChk(ApiKeyVO apiKeyVO) throws Exception {
	46	+ return apiKeyMngDAO.selectMberApiKeyChk(apiKeyVO);
	47	+ }
	48	+
	49	+ @Override
45	50	public void deleteApiKey(ApiKeyVO apiKeyVO) throws Exception {
46	51	apiKeyMngDAO.deleteApiKey(apiKeyVO);
47	52

...	...	@@ -70,14 +70,14 @@
70	70
71	71	private int successCnt; // 문자발송 성공건수
72	72
73		- private String sendKind; //문자 전송 타입(H:홈페이지 A: API)
74		-
75	73	private String msgKind; //문자종류(일반:N, 광고:A , 선거:C, 관리자:S, 이벤트:E)
76	74	private String delayYn; //지연 문자 유무
77	75	private String delayCompleteYn; //지연문자 처리 완료 여부
78	76
79	77	private String msgId; //문자아이디
80	78	private String atchFiles; // 그림문자 파일정보
	79	+
	80	+ private String sendKind; // 그림문자 파일정보
81	81
82	82	public String getAtchFiles() {
83	83	return atchFiles;
...	...	@@ -428,4 +428,5 @@
428	428	public void setSendKind(String sendKind) {
429	429	this.sendKind = sendKind;
430	430	}
	431	+
431	432	}

...	...	@@ -72,10 +72,12 @@
72	72	if(listType.equals("groupList")) {//전송건별 리스트 불러오기
73	73
74	74	resultList = mjonMsgSentDAO.selectAllMsgSentList(mjonMsgSentVO);
	75	+ System.out.println("=====");
75	76
76	77	}else {//개인별 리스트 불러오기
77	78
78	79	resultList = mjonMsgSentDAO.selectAllPrivateMsgSentList(mjonMsgSentVO);
	80	+ System.out.println("====================");
79	81
80	82	}
81	83

...	...	@@ -7,6 +7,7 @@
7	7	import java.util.Date;
8	8	import java.util.List;
9	9	import java.util.Locale;
	10	+import java.util.stream.Collectors;
10	11
11	12	import javax.annotation.Resource;
12	13	import javax.servlet.http.HttpServletRequest;
...	...	@@ -40,6 +41,9 @@
40	41	import itn.let.mjo.addr.service.AddrGroupVO;
41	42	import itn.let.mjo.addr.service.AddrService;
42	43	import itn.let.mjo.addr.service.AddrVO;
	44	+import itn.let.mjo.apikey.service.ApiKeyMngService;
	45	+import itn.let.mjo.apikey.service.ApiKeyVO;
	46	+import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
43	47	import itn.let.mjo.msgsent.service.MjonMsgSentService;
44	48	import itn.let.mjo.msgsent.service.MjonMsgSentVO;
45	49
...	...	@@ -67,6 +71,11 @@
67	71
68	72	@Resource(name = "KakaoSentService")
69	73	private KakaoSentService kakaoSentService;
	74	+
	75	+ //api key 정보
	76	+ @Resource(name = "apiKeyMngService")
	77	+ private ApiKeyMngService apiKeyMngService;
	78	+
70	79
71	80	private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentController.class);
72	81
...	...	@@ -90,7 +99,6 @@
90	99	}
91	100
92	101	mjonMsgSentVO.setUserId(userId);
93		-
94	102
95	103	/*
96	104	//전체 발송 건수 통계 불러오기
...	...	@@ -119,31 +127,83 @@
119	127	//전체 발송 건수 통계 불러오기
120	128	mjonMsgSentVO.setMsgType("");
121	129	List<MjonMsgSentVO> totalMsgCnt = mjonMsgSentService.selectDetailMsgSentCntMix(mjonMsgSentVO);
122		- model.addAttribute("totalMsgCnt", totalMsgCnt);
123		-
124		- List<MjonMsgSentVO> smsMsgCnt = new ArrayList<MjonMsgSentVO>();
125		- List<MjonMsgSentVO> lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
126		- List<MjonMsgSentVO> mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
127	130
	131	+ // H:홈페이지, A:API 로 sms, lms, mms 나누는 영역
	132	+ List<MjonMsgSentVO> H_totalMsgCnt = totalMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
	133	+ List<MjonMsgSentVO> H_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
	134	+ List<MjonMsgSentVO> H_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
	135	+ List<MjonMsgSentVO> H_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
128	136
129		- totalMsgCnt.forEach(t->{
	137	+ List<MjonMsgSentVO> A_totalMsgCnt = totalMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
	138	+ List<MjonMsgSentVO> A_smsMsgCnt = new ArrayList<MjonMsgSentVO>();
	139	+ List<MjonMsgSentVO> A_lmsMsgCnt = new ArrayList<MjonMsgSentVO>();
	140	+ List<MjonMsgSentVO> A_mmsMsgCnt = new ArrayList<MjonMsgSentVO>();
	141	+
	142	+ System.out.println(" ::H_totalMsgCnt :: "+ H_totalMsgCnt.size());
	143	+ System.out.println(" ::A_totalMsgCnt :: "+ A_totalMsgCnt.size());
	144	+
	145	+ H_totalMsgCnt.forEach(t->{
130	146	if (Integer.parseInt(t.getFilePath1())>0) {
131		- smsMsgCnt.add(t);
	147	+ H_smsMsgCnt.add(t);
132	148	} else if (Integer.parseInt(t.getFilePath2())>0) {
133		- lmsMsgCnt.add(t);
	149	+ H_lmsMsgCnt.add(t);
134	150	} else if (Integer.parseInt(t.getFilePath3())>0) {
135		- mmsMsgCnt.add(t);
	151	+ H_mmsMsgCnt.add(t);
136	152	}
137	153	});
138	154
139		- //단문 성공건, 실패건 불러오기
140		- model.addAttribute("smsMsgCnt", smsMsgCnt);
	155	+ A_totalMsgCnt.forEach(t->{
	156	+ if (Integer.parseInt(t.getFilePath1())>0) {
	157	+ A_smsMsgCnt.add(t);
	158	+ } else if (Integer.parseInt(t.getFilePath2())>0) {
	159	+ A_lmsMsgCnt.add(t);
	160	+ } else if (Integer.parseInt(t.getFilePath3())>0) {
	161	+ A_mmsMsgCnt.add(t);
	162	+ }
	163	+ });
141	164
142		- //장문 성공건, 실패건 불러오기
143		- model.addAttribute("lmsMsgCnt", lmsMsgCnt);
144	165
145		- //그림문자 성공건, 실패건 불러오기
146		- model.addAttribute("mmsMsgCnt", mmsMsgCnt);
	166	+ /*
	167	+ * 홈페이지에서 보낸 데이터 LIST
	168	+ * SEND_KIND = "H"
	169	+ * */
	170	+ // 전체 영역
	171	+ model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_totalMsgCnt));
	172	+ // 전체 단문(SMS)
	173	+ model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
	174	+ // 전체 장문(LMS)
	175	+ model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt));
	176	+ // 전체 장문(LMS)
	177	+ model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
	178	+
	179	+
	180	+ /* ==================================================================================== */
	181	+
	182	+
	183	+ /*
	184	+ * 홈페이지에서 보낸 데이터 LIST
	185	+ * SEND_KIND = "A"
	186	+ * */
	187	+ // 전체 영역
	188	+ model.addAttribute("A_allSentCntVO", this.getResultCntProc(A_totalMsgCnt));
	189	+ // 전체 단문(SMS)
	190	+ model.addAttribute("A_smsSentCntVO", this.getResultCntProc(A_smsMsgCnt));
	191	+ // 전체 장문(LMS)
	192	+ model.addAttribute("A_lmsSentCntVO", this.getResultCntProc(A_lmsMsgCnt));
	193	+ // 전체 장문(LMS)
	194	+ model.addAttribute("A_mmsSentCntVO", this.getResultCntProc(A_mmsMsgCnt));
	195	+
	196	+
	197	+
	198	+ /*<isEqual prepend="AND" property="searchCondition" compareValue="2">
	199	+ a.mber_nm LIKE CONCAT('%',#searchKeyword#,'%')
	200	+ </isEqual>
	201	+ */
	202	+ ApiKeyVO apiKeyVO = new ApiKeyVO();
	203	+ apiKeyVO.setMberId(userId);
	204	+ model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
	205	+
	206	+
147	207
148	208
149	209	// 검색 리스트 불러오기
...	...	@@ -171,8 +231,48 @@
171	231
172	232	return "web/msgsent/MsgSentView";
173	233	}
	234	+
174	235
175		- /**
	236	+ /**
	237	+ * @methodName : getResultCntProc
	238	+ * @author : 이호영
	239	+ * @date : 2023.07.26
	240	+ * @description : MsgSentView.jsp에서 JSTL로 계산하는 것을 JAVA로 분리
	241	+ * @param msgCnt
	242	+ * @param smsMsgCnt
	243	+ * @param lmsMsgCnt
	244	+ * @param mmsMsgCnt
	245	+ * @return
	246	+ */
	247	+ private MjonMsgSentCntVO getResultCntProc(List<MjonMsgSentVO> msgCnt) {
	248	+// MjonMsgSentCntVO mjonSentCntVO = new MjonMsgSentCntVO();
	249	+ MjonMsgSentCntVO cntVO = new MjonMsgSentCntVO();
	250	+
	251	+
	252	+ /*
	253	+ * 전체 통계
	254	+ * */
	255	+ // 전체 대기 갯수
	256	+ cntVO.setWaitCnt(msgCnt.stream()
	257	+ .filter(f->"W".equals(f.getMsgResultSts()))
	258	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	259	+ // 전체 성공 갯수
	260	+ cntVO.setSuccCnt(msgCnt.stream()
	261	+ .filter(f->"S".equals(f.getMsgResultSts()))
	262	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	263	+ // 전체 실패 갯수
	264	+ cntVO.setFailCnt(msgCnt.stream()
	265	+ .filter(f->"F".equals(f.getMsgResultSts()))
	266	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	267	+
	268	+ // 전체 갯수 구하기
	269	+ cntVO.setTotCnt(cntVO.getWaitCnt() + cntVO.getSuccCnt() + cntVO.getFailCnt());
	270	+
	271	+
	272	+ return cntVO;
	273	+ }
	274	+
	275	+ /**
176	276	* 발송관리 탭 리스트 화면
177	277	* @param searchVO
178	278	* @param model

...	...	@@ -57,6 +57,8 @@
57	57	private int orderByCode; // 문자타입 정렬번호
58	58	private String strReqDate; // 문자열 타입 발송시간
59	59
	60	+ private String sendKind; // 문자열 타입 발송시간
	61	+
60	62	public int getOrderByCode() {
61	63	return orderByCode;
62	64	}
...	...	@@ -297,4 +299,13 @@
297	299	public void setReserveYn(String reserveYn) {
298	300	this.reserveYn = reserveYn;
299	301	}
	302	+ public String getSendKind() {
	303	+ return sendKind;
	304	+ }
	305	+ public void setSendKind(String sendKind) {
	306	+ this.sendKind = sendKind;
	307	+ }
	308	+
	309	+
	310	+
300	311	}

...	...	@@ -8,6 +8,7 @@
8	8	import java.util.Date;
9	9	import java.util.List;
10	10	import java.util.Locale;
	11	+import java.util.stream.Collectors;
11	12
12	13	import javax.annotation.Resource;
13	14	import javax.servlet.http.HttpServletRequest;
...	...	@@ -42,6 +43,11 @@
42	43	import itn.com.utl.fcc.service.EgovStringUtil;
43	44	import itn.let.kakao.user.sent.service.KakaoSentService;
44	45	import itn.let.kakao.user.sent.service.KakaoSentVO;
	46	+import itn.let.mjo.apikey.service.ApiKeyMngService;
	47	+import itn.let.mjo.apikey.service.ApiKeyVO;
	48	+import itn.let.mjo.msgsent.service.MjonMsgSentCntVO;
	49	+import itn.let.mjo.msgsent.service.MjonMsgSentVO;
	50	+import itn.let.mjo.reservmsg.service.MjonMsgReservCntVO;
45	51	import itn.let.mjo.reservmsg.service.MjonReservMsgService;
46	52	import itn.let.mjo.reservmsg.service.MjonResvMsgVO;
47	53
...	...	@@ -63,6 +69,10 @@
63	69
64	70	@Resource(name = "KakaoSentService")
65	71	private KakaoSentService kakaoSentService;
	72	+
	73	+ //api key 정보
	74	+ @Resource(name = "apiKeyMngService")
	75	+ private ApiKeyMngService apiKeyMngService;
66	76
67	77
68	78	private static final Logger logger = LoggerFactory.getLogger(MjonReservMsgController.class);
...	...	@@ -91,24 +101,77 @@
91	101	//전체 발송 건수 통계 불러오기
92	102	mjonResvMsgVO.setMsgType("");
93	103	List<MjonResvMsgVO> totalMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);//mjonReservMsgService.selectTotalMsgCnt(mjonResvMsgVO);
	104	+
	105	+ List<MjonResvMsgVO> H_totalMsgCnt = totalMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
	106	+ List<MjonResvMsgVO> A_totalMsgCnt = totalMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
	107	+
94	108	model.addAttribute("totalMsgCnt", totalMsgCnt);
95	109
96	110	//단문 성공건, 실패건 불러오기
97	111	mjonResvMsgVO.setMsgType("4");
98	112	List<MjonResvMsgVO> smsMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);
	113	+
	114	+ List<MjonResvMsgVO> H_smsMsgCnt = smsMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
	115	+ List<MjonResvMsgVO> A_smsMsgCnt = smsMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
	116	+
99	117	model.addAttribute("smsMsgCnt", smsMsgCnt);
100	118
101	119	//장문 성공건, 실패건 불러오기
102	120	mjonResvMsgVO.setMsgType("6");
103	121	mjonResvMsgVO.setFileCnt("0");
104	122	List<MjonResvMsgVO> lmsMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);
	123	+
	124	+ List<MjonResvMsgVO> H_lmsMsgCnt = lmsMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
	125	+ List<MjonResvMsgVO> A_lmsMsgCnt = lmsMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
105	126	model.addAttribute("lmsMsgCnt", lmsMsgCnt);
106	127
107	128	//그림문자 성공건, 실패건 불러오기
108	129	mjonResvMsgVO.setMsgType("6");
109	130	mjonResvMsgVO.setFileCnt("1");
110	131	List<MjonResvMsgVO> mmsMsgCnt = mjonReservMsgService.selectDetailMsgCnt(mjonResvMsgVO);
	132	+
	133	+
	134	+ List<MjonResvMsgVO> H_mmsMsgCnt = mmsMsgCnt.stream().filter(t -> "H".equals(t.getSendKind())).collect(Collectors.toList());
	135	+ List<MjonResvMsgVO> A_mmsMsgCnt = mmsMsgCnt.stream().filter(t -> "A".equals(t.getSendKind())).collect(Collectors.toList());
111	136	model.addAttribute("mmsMsgCnt", mmsMsgCnt);
	137	+
	138	+
	139	+
	140	+ /*
	141	+ * 홈페이지에서 보낸 데이터 LIST
	142	+ * SEND_KIND = "H"
	143	+ * */
	144	+ // 전체 영역
	145	+ model.addAttribute("H_allSentCntVO", this.getResultCntProc(H_totalMsgCnt));
	146	+ // 전체 단문(SMS)
	147	+ model.addAttribute("H_smsSentCntVO", this.getResultCntProc(H_smsMsgCnt));
	148	+ // 전체 장문(LMS)
	149	+ model.addAttribute("H_lmsSentCntVO", this.getResultCntProc(H_lmsMsgCnt));
	150	+ // 전체 장문(LMS)
	151	+ model.addAttribute("H_mmsSentCntVO", this.getResultCntProc(H_mmsMsgCnt));
	152	+
	153	+
	154	+ /* ==================================================================================== */
	155	+
	156	+
	157	+ /*
	158	+ * 홈페이지에서 보낸 데이터 LIST
	159	+ * SEND_KIND = "A"
	160	+ * */
	161	+ // 전체 영역
	162	+ model.addAttribute("A_allSentCntVO", this.getResultCntProc(A_totalMsgCnt));
	163	+ // 전체 단문(SMS)
	164	+ model.addAttribute("A_smsSentCntVO", this.getResultCntProc(A_smsMsgCnt));
	165	+ // 전체 장문(LMS)
	166	+ model.addAttribute("A_lmsSentCntVO", this.getResultCntProc(A_lmsMsgCnt));
	167	+ // 전체 장문(LMS)
	168	+ model.addAttribute("A_mmsSentCntVO", this.getResultCntProc(A_mmsMsgCnt));
	169	+
	170	+ ApiKeyVO apiKeyVO = new ApiKeyVO();
	171	+ apiKeyVO.setMberId(userId);
	172	+ model.addAttribute("appMgmt", apiKeyMngService.selectMberApiKeyChk(apiKeyVO) > 0 ? true : false);
	173	+
	174	+// model.addAttribute("mmsMsgCnt", mmsMsgCnt);
112	175
113	176	// 검색 리스트 불러오기
114	177	if(mjonResvMsgVO.getPageUnit() != 10) {
...	...	@@ -155,6 +218,52 @@
155	218	return "web/reservedmsg/ReservedMsgView";
156	219	}
157	220
	221	+
	222	+
	223	+ /**
	224	+ * @methodName : getResultCntProc
	225	+ * @author : 이호영
	226	+ * @date : 2023.07.26
	227	+ * @description : MsgSentView.jsp에서 JSTL로 계산하는 것을 JAVA로 분리
	228	+ * @param msgCnt
	229	+ * @param smsMsgCnt
	230	+ * @param lmsMsgCnt
	231	+ * @param mmsMsgCnt
	232	+ * @return
	233	+ */
	234	+ private MjonMsgReservCntVO getResultCntProc(List<MjonResvMsgVO> msgCnt) {
	235	+// MjonMsgSentCntVO mjonSentCntVO = new MjonMsgSentCntVO();
	236	+ MjonMsgReservCntVO cntVO = new MjonMsgReservCntVO();
	237	+
	238	+
	239	+ /*
	240	+ * 전체 통계
	241	+ * */
	242	+ // 대기 갯수
	243	+ cntVO.setWaitCnt(msgCnt.stream()
	244	+ .filter(f->"W".equals(f.getMsgResultSts()))
	245	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	246	+ // 성공 갯수
	247	+ cntVO.setSuccCnt(msgCnt.stream()
	248	+ .filter(f->"S".equals(f.getMsgResultSts()))
	249	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	250	+ // 실패 갯수
	251	+ cntVO.setFailCnt(msgCnt.stream()
	252	+ .filter(f->"F".equals(f.getMsgResultSts()))
	253	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	254	+ // 예약취소 갯수
	255	+ cntVO.setCnclCnt(msgCnt.stream()
	256	+ .filter(f->"C".equals(f.getMsgResultSts()))
	257	+ .mapToInt(t -> Integer.parseInt(t.getMsgResultCnt())).sum());
	258	+
	259	+ // 전체 갯수 구하기
	260	+ cntVO.setTotCnt(cntVO.getWaitCnt() + cntVO.getSuccCnt() + cntVO.getFailCnt() + cntVO.getCnclCnt());
	261	+
	262	+
	263	+ return cntVO;
	264	+ }
	265	+
	266	+
158	267	/**
159	268	* 예약관리 탭 리스트 화면
160	269	* @param searchVO
...	...	@@ -164,7 +273,7 @@
164	273	*/
165	274	@RequestMapping(value= {"/web/mjon/reservmsg/selectReservMsgListViewAjax.do"})
166	275	public String selectReservMsgListViewAjax(@ModelAttribute("searchVO") MjonResvMsgVO mjonResvMsgVO, ModelMap model) throws Exception{
167		-
	276	+
168	277	//로그인 권한정보 불러오기
169	278	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
170	279	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());

...	...	@@ -84,6 +84,16 @@
84	84	</isEmpty>
85	85
86	86	</select>
	87	+ <select id="ApiKeyMngDAO.selectMberApiKeyChk" parameterClass="apiKeyVO" resultClass="int">
	88	+ SELECT
	89	+ COUNT(*)
	90	+ FROM lettngnrlmber_access_key b
	91	+ , lettngnrlmber a
	92	+ WHERE b.MBER_ID=a.MBER_ID
	93	+ AND (a.MBER_STTUS = 'Y' OR a.MBER_STTUS = 'B')
	94	+ AND b.USE_YN = 'Y'
	95	+ AND b.mber_id = #mberId#
	96	+ </select>
87	97
88	98	<update id="ApiKeyMngDAO.deleteApiKey" parameterClass="apiKeyVO">
89	99	UPDATE lettngnrlmber_access_key

...	...	@@ -41,6 +41,7 @@
41	41	, A0.RSLT_CODE AS rsltCode
42	42	, A0.RSLT_CODE2 AS rsltCode2
43	43	, A0.AGENT_CODE AS agentCode
	44	+ , A0.SEND_KIND AS sendKind
44	45	FROM
45	46	( SELECT
46	47	A.MSG_ID
...	...	@@ -48,6 +49,7 @@
48	49	, A.MSG_SEQ
49	50	, A.CUR_STATE
50	51	, A.SENT_DATE
	52	+ , B.SEND_KIND
51	53	, (
52	54	CASE
53	55	WHEN A.RESERVE_C_YN = 'Y'
...	...	@@ -214,6 +216,7 @@
214	216	AGENT_CODE AS agentCode,
215	217	RESERVE_C_YN AS reserveCYn,
216	218	CANCELDATE AS cancelDate,
	219	+ SEND_KIND as sendKind,
217	220	CASE
218	221	WHEN RESERVE_C_YN = 'Y'
219	222	THEN '예약취소'
...	...	@@ -253,7 +256,8 @@
253	256	MGD.CANCELDATE,
254	257	MD.CUR_STATE,
255	258	MD.RSLT_CODE,
256		- MD.RSLT_CODE2
	259	+ MD.RSLT_CODE2,
	260	+ MGD.SEND_KIND
257	261	FROM mj_msg_data MD
258	262	INNER JOIN MJ_MSG_GROUP_DATA MGD
259	263	ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
...	...	@@ -322,6 +326,9 @@
322	326	AND CALL_FROM = #searchKeyword#
323	327	</isEqual>
324	328	</isNotEmpty>
	329	+ <isNotEmpty property="searchCondition_01">
	330	+ AND SEND_KIND = #searchCondition_01#
	331	+ </isNotEmpty>
325	332	<isNotEmpty property="startDate">
326	333	<![CDATA[
327	334	AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')

...	...	@@ -25,8 +25,8 @@
25	25
26	26	, sum(if(A0.tab1=0,0,1)) as filePath1 /* 단문여부 */
27	27	, sum(if(A0.tab2=0,0,1)) as filePath2 /* 장문여부 */
28		- , sum(if(A0.tab3=0,0,1)) as filePath3 /* 그림여부 */
29		-
	28	+ , sum(if(A0.tab3=0,0,1)) as filePath3 /* 그림여부 */
	29	+ , SEND_KIND as sendKind
30	30	FROM(
31	31	SELECT
32	32	A.MSG_ID
...	...	@@ -39,7 +39,7 @@
39	39	, A.RSLT_CODE2
40	40	, A.AGENT_CODE
41	41	, B.EACH_PRICE
42		-
	42	+ , B.SEND_KIND
43	43	, if (A.MSG_TYPE= '4' AND B.MSG_TYPE= '4'
44	44	,'01','00') AS tab1
45	45	, if (A.MSG_TYPE= '6' AND B.MSG_TYPE= '6' AND B.FILE_CNT = '0'
...	...	@@ -264,6 +264,7 @@
264	264	, msgTypeName AS msgTypeName
265	265	, orderByCode AS orderByCode
266	266	, RESULT AS msgResult
	267	+ , sendKind AS sendKind
267	268	FROM
268	269	( SELECT
269	270	B.USER_ID
...	...	@@ -287,6 +288,10 @@
287	288	, A.CUR_STATE
288	289	, A.RSLT_CODE
289	290	, A.RSLT_CODE2
	291	+ , CASE
	292	+ WHEN B.SEND_KIND = 'H' THEN 'WEB'
	293	+ ELSE 'API'
	294	+ END as sendKind
290	295	, CASE
291	296	WHEN B.MSG_TYPE = '6'
292	297	AND B.FILE_CNT > 0
...	...	@@ -394,6 +399,9 @@
394	399	AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
395	400	</isEqual>
396	401	</isNotEmpty>
	402	+ <isNotEmpty property="searchCondition_01">
	403	+ AND sendKind = #searchCondition_01#
	404	+ </isNotEmpty>
397	405	<isNotEmpty property="startDate">
398	406	<![CDATA[
399	407	AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
...	...	@@ -462,6 +470,7 @@
462	470	, CANCELDATE AS cancelDate
463	471	, MSG_ID AS msgId
464	472	, RESULT AS msgResult
	473	+ , sendKind
465	474	FROM
466	475	(SELECT
467	476	MGD.USER_ID
...	...	@@ -487,6 +496,7 @@
487	496	, MD.CUR_STATE
488	497	, MD.RSLT_CODE
489	498	, MD.RSLT_CODE2
	499	+ , CASE WHEN MGD.SEND_KIND = 'H' THEN 'WEB' ELSE 'API' END as sendKind
490	500	,(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS RESULT
491	501	FROM
492	502	mj_msg_data MD

...	...	@@ -18,6 +18,9 @@
18	18
19	19	fn_init();
20	20
	21	+ //팩스 금일/금월/금년 통계
	22	+ getFaxSendThisSum();
	23	+
21	24	$('.sort').click(function(){
22	25	/*
23	26	내림차순 sortBtnDesc
...	...	@@ -117,7 +120,36 @@
117	120
118	121	}
119	122
120		-
	123	+//팩스 금일/금월/금년 통계
	124	+function getFaxSendThisSum() {
	125	+ $("#faxSendThisSumArea").html("");
	126	+
	127	+ $.ajax({
	128	+ type: "POST",
	129	+ url: "/uss/ion/fax/selectFaxSendThisSumAjax.do",
	130	+ data: {},
	131	+ dataType:'json',
	132	+ async: true,
	133	+ success: function (data) {
	134	+ var jsonInfo = data.result;
	135	+ if (data.isSuccess) {
	136	+ try {
	137	+ var sHtml = "";
	138	+ sHtml = "(" + jsonInfo.successDay + " : " + jsonInfo.successCntDay + "건 / " + jsonInfo.successMonth + "월 누적 : " + jsonInfo.successCntMonth + "건 / " + jsonInfo.successYear + "년 누적 : " + jsonInfo.successCntYear + "건)";
	139	+ $("#faxSendThisSumArea").html(sHtml);
	140	+ } catch (error) {
	141	+ console.error(error);
	142	+ }
	143	+ }
	144	+ else {
	145	+ //alert("Msg : " + data.msg);
	146	+ }
	147	+ },
	148	+ error: function (e) {
	149	+ //alert("ERROR : " + JSON.stringify(e));
	150	+ }
	151	+ });
	152	+}
121	153
122	154	</script>
123	155	<style>
...	...	@@ -193,7 +225,7 @@
193	225
194	226	</div>
195	227	<div class="listTop">
196		- <p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건</p>
	228	+ <p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건<span id="faxSendThisSumArea"></span></p>
197	229	<div class="rightWrap">
198	230	<!-- <input type="button" class="excelBtn" onclick="javascript:sendMsgExcelDownload();"> -->
199	231	<!-- <input type="button" class="printBtn"> -->

Delete comment

...	...	@@ -26,18 +26,59 @@
26	26	<html lang="ko">
27	27
28	28	<head>
	29	+ <link rel="stylesheet" href="/pb/css/reset.css">
	30	+ <link rel="stylesheet" href="/pb/css/common.css">
	31	+ <link rel="stylesheet" href="/pb/css/content.css?date=202301160001">
	32	+ <link rel="stylesheet" href="/pb/css/popup.css">
	33	+
29	34	<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
30	35	<script src="//mozilla.github.io/pdf.js/build/pdf.js"></script>
31	36	</head>
32	37	<body>
33	38
34		-<div>
35		- <button id="prev">Previous</button>
36		- <button id="next">Next</button>
37		-
38		- <span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>
39		-</div>
40		-<canvas id="the-canvas" name="the-canvas"></canvas>
	39	+ <div class="pageCont" style="text-align: center; width: 1000px;">
	40	+ <div class="tableWrap">
	41	+ <table class="tbType1">
	42	+ <colgroup>
	43	+ <col style="width: *%">
	44	+ <col style="width: 20%">
	45	+ <col style="width: 20%">
	46	+ <col style="width: 20%">
	47	+ <col style="width: 20%">
	48	+ </colgroup>
	49	+ <thead>
	50	+ <tr>
	51	+ <th>기업명</th>
	52	+ <th>사업자번호</th>
	53	+ <th>대표자</th>
	54	+ <th>담당자</th>
	55	+ <th>휴대폰</th>
	56	+ </tr>
	57	+ </thead>
	58	+ <tbody>
	59	+ <tr>
	60	+ <td>${mberNm}</td>
	61	+ <td>${bizNo}</td>
	62	+ <td>${ceoNm}</td>
	63	+ <td>${hstManagerNm}</td>
	64	+ <td>${hstMbtlNum}</td>
	65	+ </tr>
	66	+ </tbody>
	67	+ </table>
	68	+ </div>
	69	+
	70	+ <canvas id="the-canvas" name="the-canvas" style="max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>
	71	+
	72	+ <div>
	73	+ <button class="btnType" id="prev">Previous</button>
	74	+  <span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>
	75	+ <button class="btnType" id="next">Next</button>
	76	+
	77	+ <div style="float: right; margin-right: 10px;"><button onclick="javascript:self.close()" class="btnType">CLOSE</button></div>
	78	+ </div>
	79	+
	80	+ </div>
	81	+
41	82	</body>
42	83	</html>
43	84	<script type="text/javaScript" language="javascript">

...	...	@@ -4,6 +4,7 @@
4	4	<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
5	5	<script language=javascript>
6	6	$(document).ready(function(){
	7	+ usrDeptChk();
7	8
8	9	});
9	10
...	...	@@ -39,7 +40,11 @@
39	40	}
40	41	});
41	42	}
	43	+
	44	+
	45	+
42	46	}
	47	+
43	48
44	49	/* API KEY 실제 DB 삭제 - 임시 */
45	50	function fn_delete_real(p_accessNo){
...	...	@@ -220,6 +225,8 @@
220	225	}
221	226
222	227	</script>
	228	+
	229	+
223	230	<form id="checkForm" name="checkForm">
224	231	<input type="hidden" id="mberId" value="<c:out value="${mberId }" />" />
225	232	</form>

...	...	@@ -7,31 +7,94 @@
7	7
8	8	// 현재 url 추출
9	9	var url = window.location.pathname;
10		-// console.log(url);
11	10	// 현재 url에서 uri만 추출
12	11	var lastPart = url.split('/').pop();
13		-// console.log(lastPart);
	12	+
	13	+
14	14	/*
15	15	* top 메뉴중 onclick에 있는 uri을 가져와
16	16	* 현재 호출된 페이지와 uri와 비교해서 맞다면
17	17	* active로 활성화 시킴
18	18	*/
19	19	$('.tabType4 .tab').each(function(index) {
20		- var onclickAttr = $(this).children("button").attr("onclick");
21		-// console.log("Button " + (index + 1) + " onclick: " + onclickAttr);
22		- if(onclickAttr.indexOf(lastPart) > -1){
	20	+ var idAttr = $(this).children("button").attr("id");
	21	+ idAttr += '.do';
	22	+
	23	+ if(idAttr.indexOf(lastPart) > -1){
23	24	$(this).addClass('active');
24	25	}
25	26	});
26		-
	27	+
	28	+ // 페이지 이동 이벤트
	29	+ $('.goPage').click(function(){
	30	+ // 신청/관리는 기업회원 체크해야함
	31	+ if($(this).attr('id') == 'appMgmt'){
	32	+ // 기업회원 체크
	33	+ if(usrDeptChk()){
	34	+ location.href=$(this).data('info');
	35	+ }
	36	+ }else{
	37	+ location.href=$(this).data('info');
	38	+ }
	39	+ });
27	40	});
28	41
	42	+// 기업회원 체크
	43	+function usrDeptChk(){
	44	+
	45	+ var usrDept = '${LoginVO.dept}';
	46	+
	47	+ //카카오 알림톡 기업회원 전용체크
	48	+ if(usrDept != 'c'){
	49	+
	50	+ //기업회원 전용 메세지 팝업 띄워주기
	51	+ $('#btnDeptPop').click();
	52	+
	53	+ return false;
	54	+ }else{
	55	+ return true;
	56	+ }
	57	+}
	58	+
	59	+// 튤팁에서 취소 클릭 시 이벤트
	60	+function customPopup(){
	61	+ // 현재 url 추출
	62	+ var url = window.location.pathname;
	63	+ // 현재 url에서 uri만 추출
	64	+ var lastPart = url.split('/').pop();
	65	+
	66	+ // URL을 치고 들어왔을 경우 '문자 API소개' 페이지로 이동
	67	+ if('appMgmt.do'.indexOf(lastPart) > -1){
	68	+ location.href='<c:url value="/web/api/intrdView.do" />';
	69	+ }
	70	+}
	71	+
	72	+
29	73	</script>
30		-
	74	+
	75	+
	76	+ <!-- 0724 기업회원 이동 팝업 -->
	77	+ <div class="tooltip-wrap cvt_member_popup_wrap">
	78	+ <div class="popup-com cvt_member_layer popup01" tabindex="0" data-tooltip-con="popup01" data-focus="popup01" data-focus-prev="popup01-close">
	79	+ <div class="popup_heading">
	80	+ <p>알림</p>
	81	+ <button type="button" class="tooltip-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
	82	+ </div>
	83	+ <div class="layer_in">
	84	+ <p>문자API서비스는 기업회원만 신청이 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
	85	+ <div class="popup_btn_wrap2">
	86	+ <button type="button" onclick="location.href='<c:url value="/web/user/membershipChange.do" />'">확인</button>
	87	+ <button type="button" class="tooltip-close" data-focus="popup01-close" data-focus-next="popup01">취소</button>
	88	+ </div>
	89	+ </div>
	90	+ </div>
	91	+ </div>
	92	+ <!--// 0724 기업회원 이동 팝업 -->
	93	+ <button type="button" id="btnDeptPop" data-tooltip="popup01" style="display: none;"></button>
31	94
32	95	<ul class="tabType4">
33		- <li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/intrdView.do" />'">문자 API소개</button></li>
34		- <li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/apiSpec.do" />'">API 사용안내</button></li>
35		- <li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/examDown.do" />'">예제 다운로드</button></li>
36		- <li class="tab"><button type="button" onclick="location.href='<c:url value="/web/api/appMgmt.do" />'">신청/관리</button></li>
	96	+ <li class="tab"><button type="button" class="goPage" id="intrdView" data-info="<c:url value="/web/api/intrdView.do" />">문자 API소개</button></li>
	97	+ <li class="tab"><button type="button" class="goPage" id="apiSpec" data-info="<c:url value="/web/api/apiSpec.do" />">API 사용안내</button></li>
	98	+ <li class="tab"><button type="button" class="goPage" id="examDown" data-info="<c:url value="/web/api/examDown.do" />">예제 다운로드</button></li>
	99	+ <li class="tab"><button type="button" class="goPage" id="appMgmt" data-info="<c:url value="/web/api/appMgmt.do" />" >신청/관리</button></li>
37	100	</ul>

...	...	@@ -18,6 +18,7 @@
18	18	<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
19	19	<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
20	20	<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
	21	+<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
21	22	<%
22	23	pageContext.setAttribute("crlf", "\r\n");
23	24	%>
...	...	@@ -74,6 +75,7 @@
74	75	<input type="hidden" name="bbsId" value="<c:out value='${searchVO.bbsId}'/>" />
75	76	</form:form>
76	77	<form:form commandName="board" name="board" method="post" enctype="multipart/form-data">
	78	+<double-submit:preventer tokenKey="someKey" />
77	79	<input type="hidden" name="pageIndex" value="<c:out value='${searchVO.pageIndex}'/>" />
78	80	<input type="hidden" name="searchCnd" value="<c:out value='${searchVO.searchCnd}'/>"/>
79	81	<input type="hidden" name="searchWrd" value="<c:out value='${searchVO.searchWrd}'/>"/>

...	...	@@ -138,7 +138,7 @@
138	138	<div>
139	139	<form name="searchForm" id="searchForm">
140	140
141		- <input type="text" name="bbsId" value="${boardMenuList[0].bbsId}">
	141	+ <input type="hidden" name="bbsId" value="${boardMenuList[0].bbsId}">
142	142	<input type="hidden" name="nttId" value="0" />
143	143	<input type="hidden" name="seCmmnCdId" value="${searchVO.seCmmnCdId}">
144	144	<input type="hidden" name="frstRegisterId" value=""/>

...	...	@@ -97,6 +97,10 @@
97	97	, dataType:'json'
98	98	, timeout:(1000*30)
99	99	, success:function(data){
	100	+ if(data.pwRuleCheck == false){
	101	+ alert("비밀번호 규칙을 확인해주세요.");
	102	+ return;
	103	+ }
100	104	if(data.pwCheck == false ){
101	105	alert("사용한 적 있는 비밀번호 입니다. 다른 비밀번호를 입력해주세요.");
102	106	return;

...	...	@@ -97,6 +97,11 @@
97	97	<input type="button" class="sort sortBtn" id="sort_msgType">
98	98	</div>
99	99	</th>
	100	+ <th>발송방식
	101	+ <div class="sort_wrap">
	102	+ <input type="button" class="sort sortBtn" id="sort_sendKind">
	103	+ </div>
	104	+ </th>
100	105	<th>내용</th>
101	106	<th>받는사람
102	107	<div class="sort_wrap">
...	...	@@ -165,6 +170,9 @@
165	170	</p>
166	171	</td>
167	172	<td>
	173	+ ${resultAllSentList.sendKind }
	174	+ </td>
	175	+ <td>
168	176	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
169	177	</td>
170	178	<td>

...	...	@@ -95,6 +95,11 @@
95	95	<input type="button" class="sort sortBtn" id="sort_orderByCode">
96	96	</div>
97	97	</th>
	98	+ <th>발송방식
	99	+ <div class="sort_wrap">
	100	+ <input type="button" class="sort sortBtn" id="sort_sendKind">
	101	+ </div>
	102	+ </th>
98	103	<th>내용</th>
99	104	<th>받는사람
100	105	<div class="sort_wrap">
...	...	@@ -153,6 +158,9 @@
153	158	</p>
154	159	</td>
155	160	<td>
	161	+ ${resultAllSentList.sendKind }
	162	+ </td>
	163	+ <td>
156	164	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
157	165	</td>
158	166	<td>

...	...	@@ -69,19 +69,19 @@
69	69	<div class="tb_wrap">
70	70	<table class="tType4">
71	71	<colgroup>
72		- <col style="width: 30px;">
73		- <col style="width: 9%;">
74		- <col style="width: 12%;">
75		- <col style="width: 12%;">
76		- <col style="width: 7%;">
77		-<%-- <col style="width: 15%;"> --%>
78		- <col style="width: 60px;">
79		- <col style="width: 9%;">
80		- <col style="width: 10%;">
81		- <col style="width: 9%;">
82		- <col style="width: 6%;">
83		- <col style="width: 8%;">
84		- <col style="width: 60px;">
	72	+ <col style="width: 20px;">
	73	+ <col style="width: 8%;">
	74	+ <col style="width: 12%;">
	75	+ <col style="width: 12%;">
	76	+ <col style="width: 6%;">
	77	+ <col style="width: 8%;">
	78	+ <col style="width: 42PX;">
	79	+ <col style="width: 8%;">
	80	+ <col style="width: 10%;">
	81	+ <col style="width: 8%;">
	82	+ <col style="width: 4%;">
	83	+ <col style="width: 6%;">
	84	+ <col style="width: 42px;">
85	85	</colgroup>
86	86	<thead>
87	87	<tr>
...	...	@@ -118,6 +118,12 @@
118	118	<input type="button" class="sort sortBtn" id="sort_subject">
119	119	</div>
120	120	</th> -->
	121	+ <th rowspan="2">
	122	+ 발송방식
	123	+ <div class="sort_wrap">
	124	+ <input type="button" class="sort sortBtn" id="sort_sendKind">
	125	+ </div>
	126	+ </th>
121	127	<th rowspan="2">
122	128	내용
123	129	</th>
...	...	@@ -230,6 +236,9 @@
230	236	</p>
231	237	</td> --%>
232	238	<td>
	239	+ <p><c:out value="${resultAllResList.sendKind == 'H'? 'WEB' : 'API' }"/></p>
	240	+ </td>
	241	+ <td>
233	242	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllResList.msgGroupId}','${resultAllResList.fileCnt}'); return false;">상세보기</button>
234	243	</td>
235	244	<td>

...	...	@@ -73,7 +73,7 @@
73	73	<col style="width: 15%;">
74	74	<col style="width: 15%;">
75	75	<col style="width: 7%;">
76		-<%-- <col style="width: 20%;"> --%>
	76	+ <col style="width: 8%;">
77	77	<col style="width: 85px;">
78	78	<col style="width: 9%;">
79	79	<col style="width: 11%;">
...	...	@@ -111,6 +111,12 @@
111	111	<input type="button" class="sort sortBtn" id="sort_subject">
112	112	</div>
113	113	</th> -->
	114	+ <th rowspan="2">
	115	+ 발송방식
	116	+ <div class="sort_wrap">
	117	+ <input type="button" class="sort sortBtn" id="sort_sendKind">
	118	+ </div>
	119	+ </th>
114	120	<th rowspan="2">
115	121	내용
116	122	</th>
...	...	@@ -186,6 +192,9 @@
186	192	</p>
187	193	</td> --%>
188	194	<td>
	195	+ <p><c:out value="${resultAllResList.sendKind == 'H'? 'WEB' : 'API' }"/></p>
	196	+ </td>
	197	+ <td>
189	198	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllResList.msgGroupId}','${resultAllResList.fileCnt}'); return false;">상세보기</button>
190	199	</td>
191	200	<td>