From 1f4e865a748a6b6ed61f6eb7a43582612493400f Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 31 Jul 2023 11:16:51 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=EC=97=90=EC=84=9C=20MSG=5F?= =?UTF-8?q?TYPE=20=EB=8B=A4=EC=8B=9C=EA=B3=84=EC=82=B0=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/MjonMsgCampainDataController.java | 15 +++++++++++++++ .../mjo/msgdata/web/MjonMsgDataController.java | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java index d83b6d70..864ffc5b 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java @@ -2164,6 +2164,21 @@ public class MjonMsgCampainDataController { System.out.println("mjonMsgVO.getMsgType2() ::: "+mjonMsgVO.getMsgType()); + // MSG_TYPE 다시계산 + if(mjonMsgVO.getFileName1() != null) { + mjonMsgVO.setMsgType("6"); + }else { + if(FrBytes < 2000) { + if(FrBytes > 90) {// 90Byte 초과시 장문 + mjonMsgVO.setMsgType("6"); + }else {// 그외 단문 + mjonMsgVO.setMsgType("4"); + } + } + } + + System.out.println("mjonMsgVO.getMsgType3() ::: "+mjonMsgVO.getMsgType()); + //각 문자 종류별 단가 셋팅해주기 float tmpEachPrice = 0; if(mjonMsgVO.getMsgType().equals("4")) { diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 8e9e44bd..2b09674e 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -2316,6 +2316,21 @@ public class MjonMsgDataController { System.out.println("mjonMsgVO.getMsgType2() ::: "+mjonMsgVO.getMsgType()); + // MSG_TYPE 다시계산 + if(mjonMsgVO.getFileName1() != null) { + mjonMsgVO.setMsgType("6"); + }else { + if(FrBytes < 2000) { + if(FrBytes > 90) {// 90Byte 초과시 장문 + mjonMsgVO.setMsgType("6"); + }else {// 그외 단문 + mjonMsgVO.setMsgType("4"); + } + } + } + + System.out.println("mjonMsgVO.getMsgType3() ::: "+mjonMsgVO.getMsgType()); + //각 문자 종류별 단가 셋팅해주기 float tmpEachPrice = 0; if(mjonMsgVO.getMsgType().equals("4")) { From b5f3948b8e5d444b0b7b57e683ef970c749736ff Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 31 Jul 2023 14:03:39 +0900 Subject: [PATCH 2/8] =?UTF-8?q?pdf=20=EB=B7=B0=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/util/PdfUtil.java | 59 ++++++++ .../let/mjo/msg/web/MjonMsgController.java | 26 +++- src/main/webapp/WEB-INF/decorators.xml | 1 + .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp | 134 ++++++++++++++++++ 4 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp diff --git a/src/main/java/itn/com/cmm/util/PdfUtil.java b/src/main/java/itn/com/cmm/util/PdfUtil.java index bc205360..119925e8 100644 --- a/src/main/java/itn/com/cmm/util/PdfUtil.java +++ b/src/main/java/itn/com/cmm/util/PdfUtil.java @@ -1,12 +1,22 @@ package itn.com.cmm.util; +import java.awt.Image; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.UUID; +import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.FileUtils; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.PDPageContentStream; +import org.apache.pdfbox.pdmodel.common.PDRectangle; +import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; + /** * * @author : 이호영 @@ -88,4 +98,53 @@ public final class PdfUtil { } + public static String makeImgPdf(String imgDir,String extsn) throws Exception { + PDDocument doc = new PDDocument(); + String uuid = UUID.randomUUID().toString(); + try { + File copy1 = new File(imgDir); + File copy2 = new File(imgDir + "." +extsn); + + + FileUtils.copyFile(copy1, copy2); + File imgFiles = new File(imgDir + "." +extsn); + Image img = ImageIO.read(imgFiles); + + PDPage page = new PDPage(PDRectangle.A4); + doc.addPage(page); + + PDImageXObject pdImage = PDImageXObject.createFromFile(imgFiles.toString(), doc); + int pageWidth = Math.round(page.getCropBox().getWidth()); + int pageHeight = Math.round(page.getCropBox().getHeight()); + + float imgRatio = 1; + if ( pageWidth < img.getWidth(null)) { + imgRatio = (float)img.getWidth(null) / (float)pageWidth; + } + + int imgWidth = Math.round(img.getWidth(null) / imgRatio); + int imgHeight = Math.round(img.getHeight(null) / imgRatio); + + int pageWidthPosition = (pageWidth - imgWidth) / 2; + int pageHeightPosition = (pageWidth - imgWidth) / 2; + + PDPageContentStream contents = new PDPageContentStream(doc, page); + contents.drawImage(pdImage, pageWidthPosition, pageHeightPosition, imgWidth, imgHeight); + contents.close(); + doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf"); + + } catch (Exception e) { + System.out.println("Exception! : " + e.getMessage()); + } + + try { + doc.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + return "/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf"; + } + + } diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java index 8e0e13e4..d21ae61f 100644 --- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java +++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java @@ -1,5 +1,6 @@ package itn.let.mjo.msg.web; +import java.io.File; import java.io.OutputStream; import java.net.URL; import java.text.SimpleDateFormat; @@ -13,7 +14,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Random; -import java.util.stream.Collector; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -52,6 +52,7 @@ import itn.com.cmm.service.EgovFileMngService; import itn.com.cmm.service.EgovFileMngUtil; import itn.com.cmm.service.FileVO; import itn.com.cmm.util.MJUtil; +import itn.com.cmm.util.PdfUtil; import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; @@ -158,6 +159,9 @@ public class MjonMsgController { @Resource(name = "egovMberCmpHstService") private EgovMberCmpHstService egovMberCmpHstService; + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + //배열 정의{"컬럼순차번호, 컬럼이름, 컬럼내용, 컬럼이름에 붙여야할 내용(엑셀코드양식다운로드시 필요)"} private String[][] sendMsgExcelValue ={ {"0" ,"번호" , "1" , "" }, @@ -5038,6 +5042,26 @@ public class MjonMsgController { return "/uss/ion/msg/weekendCsWork2"; } + + @RequestMapping(value = {"/uss/ion/msg/pdfView.do"}) + public String pdfView(FileVO fileVO, ModelMap model) 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 = PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); + } + } + + model.addAttribute("pdfPath", path); + + return "/uss/ion/msg/pdfView"; + } diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index ef4bbdb2..e4160c4b 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -151,6 +151,7 @@ /uss/ion/msg/weekendCsWork.do /uss/ion/msg/weekendCsWork2.do + /uss/ion/msg/pdfView.do diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp new file mode 100644 index 00000000..e3dc303e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp @@ -0,0 +1,134 @@ +<%-- + Class Name : weekendCsWork.jsp + Description : 발신번호 리스트 조회 페이지 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.03.31 신명섭 최초 생성 + + Copyright (C) 2009 by ITN All right reserved. +--%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> +<% + response.setHeader("Cache-Control","no-store"); + response.setHeader("Pragma","no-cache"); + response.setDateHeader("Expires",0); + if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); +%> + + + + + + + + + +
+ + +     + Page: / +
+ + + + \ No newline at end of file From 611c723f87351b34d6eaadd014562e7873f6b7c2 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 31 Jul 2023 14:42:19 +0900 Subject: [PATCH 3/8] =?UTF-8?q?pdf=20=EB=B7=B0=EC=96=B4=20=EC=BB=A4?= =?UTF-8?q?=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/util/PdfUtil.java | 2 +- .../cmm/web/EgovFileDownloadController.java | 71 +++++++++++++++++++ .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp | 2 +- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/main/java/itn/com/cmm/util/PdfUtil.java b/src/main/java/itn/com/cmm/util/PdfUtil.java index 119925e8..a93216c0 100644 --- a/src/main/java/itn/com/cmm/util/PdfUtil.java +++ b/src/main/java/itn/com/cmm/util/PdfUtil.java @@ -143,7 +143,7 @@ public final class PdfUtil { e.printStackTrace(); } - return "/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf"; + return uuid + ".pdf"; } diff --git a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java index d0a3d9a4..2c9f7e60 100644 --- a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java +++ b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java @@ -452,4 +452,75 @@ public class EgovFileDownloadController { } } + + /** + * 첨부파일로 등록된 파일에 대하여 다운로드를 제공한다. + * + * @param commandMap + * @param response + * @throws Exception + */ + @RequestMapping(value = "/cmm/fms/FileDowntest.do") + public void FileDowntest(@RequestParam Map commandMap, HttpServletRequest request, HttpServletResponse response) throws Exception { + + String fileNm = (String) commandMap.get("fileNm"); + try { + + + File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm); + long fSize = uFile.length(); + + if (fSize > 0) { + String mimetype = "application/x-msdownload"; + + response.setContentType(mimetype); + setDisposition(fileNm, request, response); + //response.setContentLength(fSize); + + BufferedInputStream in = null; + BufferedOutputStream out = null; + + try { + in = new BufferedInputStream(new FileInputStream(uFile)); + out = new BufferedOutputStream(response.getOutputStream()); + + FileCopyUtils.copy(in, out); + out.flush(); + } catch (Exception ex) { + LOGGER.debug("IGNORED: {}", ex.getMessage()); + } finally { + if (in != null) { + try { + in.close(); + } catch (Exception ignore) { + LOGGER.debug("IGNORED: {}", ignore.getMessage()); + } + } + if (out != null) { + try { + out.close(); + } catch (Exception ignore) { + LOGGER.debug("IGNORED: {}", ignore.getMessage()); + } + } + } + + } else { + response.setContentType("application/x-msdownload"); + + PrintWriter printwriter = response.getWriter(); + printwriter.println(""); + printwriter.println("


Could not get file name:
" + fileNm + "

"); + printwriter.println("


Back

"); + printwriter.println("


© webAccess"); + printwriter.println(""); + printwriter.flush(); + printwriter.close(); + } + + } catch (Exception e) { + System.out.println(e.getMessage()); + } + } + } diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp index e3dc303e..40384ec5 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp @@ -50,7 +50,7 @@ var ctx = canvas.getContext('2d'); /* var url = '/cmm/fms/FileDown.do?atchFileId=FILE_000000000019061&fileSn=0'; */ // var url = '/usr/local/tomcat/file/sht/pdf/2ccbb16e-62df-48c0-bbb1-3b6559bd4c36.pdf'; - var url = ''; + var url = '/cmm/fms/FileDowntest.do?fileNm=${pdfPath}'; /** * Get page info from document, resize canvas accordingly, and render page. From 34a1139084cfc9215f9e96f622a8e111fb67f336 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 31 Jul 2023 14:45:18 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=ED=86=B5=EA=B3=84=20=EC=98=88=EC=95=BD=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=EA=B1=B4=20=EC=A0=9C=EC=99=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/let/mjo/kakao/KakaoStatistics_SQL_Mysql.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoStatistics_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoStatistics_SQL_Mysql.xml index 0634695e..daf91c9d 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoStatistics_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoStatistics_SQL_Mysql.xml @@ -112,6 +112,7 @@ ON md.MSG_GROUP_ID = bkp.MSG_GROUP_ID WHERE md.MSG_TYPE = '8' + AND md.RESERVE_C_YN = 'N' AND md.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > md.SENT_DATE AND md.AGENT_CODE = '04' @@ -174,8 +175,9 @@ md.USER_ID = mbr.mber_id where md.BIZ_KAKAO_RESEND_YN = 'Y' - AND md.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') - AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > md.SENT_DATE + AND md.RESERVE_C_YN = 'N' + AND md.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') + AND DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > md.SENT_DATE ) B left outer join MJ_MSG_COST AGENT on B.AGENT_CODE = AGENT.AGENT_CODE From 7c9c593101821b86a1c543d804adb820ed9651a2 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 31 Jul 2023 14:49:23 +0900 Subject: [PATCH 5/8] =?UTF-8?q?pdf=20=EB=B7=B0=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/let/mjo/msg/web/MjonMsgController.java | 2 +- src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java index d21ae61f..f2ced2c4 100644 --- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java +++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java @@ -5054,7 +5054,7 @@ public class MjonMsgController { path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn(); }else { String storePath = fvo.getFileStreCours() + fvo.getStreFileNm(); - path = PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); + path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn()); } } diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp index 40384ec5..da7e1206 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp @@ -50,7 +50,7 @@ var ctx = canvas.getContext('2d'); /* var url = '/cmm/fms/FileDown.do?atchFileId=FILE_000000000019061&fileSn=0'; */ // var url = '/usr/local/tomcat/file/sht/pdf/2ccbb16e-62df-48c0-bbb1-3b6559bd4c36.pdf'; - var url = '/cmm/fms/FileDowntest.do?fileNm=${pdfPath}'; + var url = '${pdfPath}'; /** * Get page info from document, resize canvas accordingly, and render page. From 618abcb37dfb241c797bf6a43bb85a8144c4f11a Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 31 Jul 2023 15:31:00 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=A0=84?= =?UTF-8?q?=EC=86=A1=EB=AA=A9=EB=A1=9D=EC=97=90=20=EA=B8=88=EC=9D=BC/?= =?UTF-8?q?=EA=B8=88=EC=9B=94/=EA=B8=88=EB=85=84=20=ED=86=B5=EA=B3=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakaoAt/service/MjonKakaoATService.java | 3 + .../kakaoAt/service/impl/MjonKakaoATDAO.java | 5 ++ .../service/impl/MjonKakaoATServiceImpl.java | 10 ++++ .../kakaoAt/web/MjonKakaoATController.java | 28 ++++++++++ .../java/itn/let/kakao/kakaoComm/KakaoVO.java | 55 +++++++++++++++++++ .../let/kakao/MjonKakaoATData_SQL_mysql.xml | 41 ++++++++++++++ .../jsp/uss/ion/kakaoat/SendKakaoATList.jsp | 41 +++++++++++++- 7 files changed, 182 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java b/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java index dc4d986a..f9fe0495 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java @@ -18,6 +18,9 @@ public interface MjonKakaoATService { //알림톡 전송내역 상세 KakaoVO selectMjonKakaoATVO(KakaoVO mjonKakaoATVO) throws Exception; + // 알림톡 금일/금월/금년 통계 + KakaoVO selectMjonKakaoAtThisSum(KakaoVO mjonKakaoATVO) throws Exception; + //알림톡 예약 발송 리스트 List selectReserveMjonKakaoATGroupList(KakaoVO searchVO) throws Exception; diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java index 95a59740..1ff99bc3 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java @@ -31,6 +31,11 @@ public class MjonKakaoATDAO extends EgovAbstractDAO { return (KakaoVO) select("mjonKakaoATDAO.selectMjonKakaoATVO", p_mjonKakaoATVO); } + // 알림톡 금일/금월/금년 통계 + public KakaoVO selectMjonKakaoAtThisSum(KakaoVO p_mjonKakaoATVO) throws Exception{ + return (KakaoVO) select("mjonKakaoATDAO.selectMjonKakaoAtThisSum", p_mjonKakaoATVO); + } + @SuppressWarnings("unchecked") public List selectReserveMjonKakaoATGroupList(KakaoVO p_mjonKakaoATVO) throws Exception{ return (List)list("mjonKakaoATDAO.selectReserveMjonKakaoATGroupList", p_mjonKakaoATVO); diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java index fb8b4cbb..f0686fae 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java @@ -125,6 +125,16 @@ public class MjonKakaoATServiceImpl extends EgovAbstractServiceImpl implements M return result; } + // 알림톡 금일/금월/금년 통계 + @Override + public KakaoVO selectMjonKakaoAtThisSum(KakaoVO p_mjonKakaoATVO) throws Exception { + KakaoVO result = new KakaoVO(); + + result = mjonKakaoATDAO.selectMjonKakaoAtThisSum(p_mjonKakaoATVO); + + return result; + } + @Override public List selectReserveMjonKakaoATGroupList(KakaoVO p_mjonKakaoATVO) throws Exception { return mjonKakaoATDAO.selectReserveMjonKakaoATGroupList(p_mjonKakaoATVO); diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java index 7ddaa800..24bca3cb 100644 --- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java +++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java @@ -13,6 +13,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.HandlerMapping; +import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -262,6 +263,33 @@ public class MjonKakaoATController { } + // 알림톡 금일/금월/금년 통계 + @RequestMapping(value = "/uss/umt/user/selectMjonKakaoAtThisSumAjax.do") + public ModelAndView DashBoardAdminLogAjax( + @ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = true; + String msg = ""; + KakaoVO result = null; + + try { + result = mjonKakaoATService.selectMjonKakaoAtThisSum(kakaoVO); + } + catch(Exception e) { + isSuccess = false; + msg = e.getMessage(); + } + + modelAndView.addObject("result", result); + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + /** * 알림톡 상세 전송 리스트 * @param searchVO diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java index ba2e51a0..c2a03178 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java @@ -238,6 +238,61 @@ public class KakaoVO extends MjonMsgVO{ private String imageTitle; //친구톡 이미지 제목 private String imageLink; //친구톡 이미지 클릭시 링크 주소 private String jsonText; //json 파일 생성시 내용 저장(혹시 몰라서 내용도 별도로 저장함) + + 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 static long getSerialversionuid() { return serialVersionUID; diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml index 1b556b37..6b13e13f 100644 --- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml @@ -1043,6 +1043,47 @@ + + +