From 99afdc3011199969df1dad54a9f9053fa846fa20 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 15 Mar 2024 10:27:26 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=ED=8C=A9=EC=8A=A4=20back=EB=8B=A8=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EA=B8=88=EC=95=A1=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fax/user/service/impl/FaxServiceImpl.java | 60 ++++++++++++++++++- .../WEB-INF/jsp/web/fax/faxDataView.jsp | 4 +- 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java b/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java index d11c564f..0ef15559 100644 --- a/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java +++ b/src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java @@ -2,6 +2,8 @@ package itn.let.fax.user.service.impl; 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; @@ -37,12 +39,15 @@ import itn.let.fax.user.service.FaxReceiverVO; 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.MjonMsgDataService; 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; @@ -98,7 +103,11 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic @Resource(name = "egovMjonCashIdGnrService") private EgovIdGnrService idgenMjonCashId; - + + + @Resource(name = "MjonMsgDataService") + private MjonMsgDataService mjonMsgDataService; + @Autowired private PriceAndPoint priceAndPoint; @@ -319,6 +328,11 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic @Override public StatusResponse sendData(FaxTranVO faxTranVO, String userId) throws Exception { + // 단가확인 + Boolean priceChk = this.getPriceChk(faxTranVO, userId); + if(!priceChk) { + return new StatusResponse(HttpStatus.BAD_REQUEST, "팩스 발송에 필요한 회원님의 보유 잔액이 부족 합니다.", LocalDateTime.now()); + } // 팩스발송 정보 삽입 faxTranVO.setFaxTranSeq(idgenPgiFaxTranId.getNextStringId()); @@ -346,6 +360,49 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic } + private Boolean getPriceChk(FaxTranVO faxTranVO, String userId) throws Exception { + + Boolean returnVal = true; + + MjonMsgVO mjonMsgVO = new MjonMsgVO(); + mjonMsgVO.setUserId(userId); + + String userMoney = mjonMsgDataService.selectBeforeCashData(mjonMsgVO); + String userPoint = mjonMsgDataService.selectBeforePointData(mjonMsgVO); + mjonMsgVO.setBefPoint(userPoint); //현재 보유 포인트 정보 저장 + + BigDecimal befCash = new BigDecimal(userMoney).setScale(2, RoundingMode.HALF_EVEN); + + + + + + int callToSize = faxTranVO.getCallToList().split(",").length; + + // 사용자 단가 + Float faxPrice = this.getFaxPrice(userId); + + // 변환 완료 테이블에서 변환된 페이지 갯수 가져오기 + // FROM PGI_FAXCONVERT + int resPage = faxDao.findAllConvertTb(faxTranVO.getFaxConvertSeq()).getResPage(); + System.out.println(" + resPage :: "+ resPage); + + Float faxPriceTotalP = callToSize*faxPrice*resPage; + + + // faxPrice를 BigDecimal로 변환 + BigDecimal faxPriceBD = new BigDecimal(faxPriceTotalP.toString()); + + System.out.println(" + befCash :: "+ befCash); + System.out.println(" + faxPriceBD :: "+ faxPriceBD); + System.out.println(" + faxPriceBD.compareTo(befCash) :: "+ faxPriceBD.compareTo(befCash)); + if (faxPriceBD.compareTo(befCash) > 0) { + returnVal = false; + } + + return returnVal; + } + @Override public Map selectFaxSendDetailList(FaxGroupDataVO faxGroupDataVO) throws Exception { @@ -491,7 +548,6 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic //2.사용자 개인 단가 정보 불러오기 faxPrice = mjonMsgDataDAO.selectMberManageInfo(userId).getFaxPrice(); - // SMS 인경우 // 사용자 개인 단가가 없으면 시스템 단가로 if(faxPrice == 0.0f) return sysJoinSetVO.getFaxPrice(); diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index e41469b9..38ce82ff 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -51,9 +51,9 @@ return false; } - if(!moneyChk()){ + /* if(!moneyChk()){ return false; - } + } */ if(!valueChk()){ From bf289e9e42d585e3c8d6c4deec74ca7c30822c67 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 20 Mar 2024 16:34:15 +0900 Subject: [PATCH 2/7] =?UTF-8?q?2024-03-20=2016:34=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B5=9C=EA=B7=BC=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=EB=82=B4=EC=97=AD-=EB=AC=B8=EC=9E=90=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EC=84=B1=EB=8A=A5=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EgovMberManageServiceImpl.java | 3 + .../uat/uia/service/impl/MberManageDAO.java | 4 + .../let/uat/uia/web/EgovMypageController.java | 2 +- .../umt/service/EgovMberManageService.java | 2 + .../uss/umt/web/EgovUserManageController.java | 2 +- .../sqlmap/let/mjo/event/Event_SQL_Mysql.xml | 1 + .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 1 + .../sqlmap/let/pay/MjonPay_SQL_mysql.xml | 2 + .../let/uss/umt/EgovMberManage_SQL_Mysql.xml | 130 ++++++++++++++++++ 9 files changed, 145 insertions(+), 2 deletions(-) diff --git a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index d81e731a..b51976bc 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -378,6 +378,9 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement public List selectMberMsgSentLatestList(String mberId) throws Exception{ return mberManageDAO.selectMberMsgSentLatestList(mberId); } + public List selectMberMsgSentLatestListNew20240320(String mberId) throws Exception{ + return mberManageDAO.selectMberMsgSentLatestListNew20240320(mberId); + } //회원 최근 발송 문자내용 3개 불러오기(예약) public List selectMberMsgSentLatestList2(String mberId) throws Exception{ diff --git a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java index 62398fa5..2068d743 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java +++ b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java @@ -212,6 +212,10 @@ public class MberManageDAO extends EgovComAbstractDAO{ public List selectMberMsgSentLatestList(String mberId) throws Exception{ return (List) list("mberManageDAO.selectMberMsgSentLatestList", mberId); } + @SuppressWarnings("unchecked") + public List selectMberMsgSentLatestListNew20240320(String mberId) throws Exception{ + return (List) list("mberManageDAO.selectMberMsgSentLatestListNew20240320", mberId); + } //회원 최근 발송 문자내용 3개 불러오기(예약) @SuppressWarnings("unchecked") diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java index eee2f486..91bedb50 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -363,7 +363,7 @@ public class EgovMypageController { } {//최근 발송 문자 내용 불러오기 - 최근 3개 내역만 - List mjonMsgSentList = mberManageService.selectMberMsgSentLatestList(userId); + List mjonMsgSentList = mberManageService.selectMberMsgSentLatestListNew20240320(userId); model.addAttribute("mjonMsgSentList", mjonMsgSentList); } diff --git a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java index a333609d..e03cbeff 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java @@ -198,6 +198,8 @@ public interface EgovMberManageService { //회원 최근 발송 문자내용 3개 불러오기 public List selectMberMsgSentLatestList(String mberId) throws Exception; + //성능개선 2024-03-20 + public List selectMberMsgSentLatestListNew20240320(String mberId) throws Exception; //회원 최근 발송 문자내용 3개 불러오기(예약) public List selectMberMsgSentLatestList2(String mberId) throws Exception; diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index c367dd89..95c2cbc6 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1194,7 +1194,7 @@ public class EgovUserManageController { model.addAttribute("flowTypeCode", cmmUseService.selectCmmCodeDetail(vo)); //최근 발송 문자 내용 불러오기 - 최근 3개 내역만 - List mjonMsgSentList = mberManageService.selectMberMsgSentLatestList(userId); + List mjonMsgSentList = mberManageService.selectMberMsgSentLatestListNew20240320(userId); model.addAttribute("mjonMsgSentList", mjonMsgSentList); //최근 발송 문자 내용 불러오기 - 최근 3개 내역만(에약) diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/event/Event_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/event/Event_SQL_Mysql.xml index bb0a9fad..c20c47d3 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/event/Event_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/event/Event_SQL_Mysql.xml @@ -74,6 +74,7 @@ + /* mjonMsgDAO.selectMberManageInfo */ SELECT MBER_ID AS mberId , MBER_NM AS mberNm diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index b54485e2..9c0436a5 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -2187,6 +2187,7 @@ + /* mberManageDAO.selectMberMsgSentLatestList */ SELECT msgId , msgGroupId @@ -1438,6 +1439,135 @@ + + + /* mjonMsgDAO.selectWithKakaoSendTotCnt */ WITH TBL AS ( SELECT diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index 9c0436a5..c0fa44ab 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -2149,6 +2149,7 @@ - /* 발송결과 상단 전광판 조회(전체, 단문, 장문, 그림) MIX 결과 수량 */ + /* MjonMsgSentDAO.selectDetailMsgSentCntMix - 발송결과 상단 전광판 조회(전체, 단문, 장문, 그림) MIX 결과 수량 */ SELECT A0.MSG_GROUP_ID AS msgGroupId , COUNT(A0.RESULT) AS msgResultCnt diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp index 3c945a2c..28b0720d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp @@ -96,6 +96,8 @@ $(document).ready(function(){ linkPage(1); }); + + subContent(); }); @@ -751,6 +753,84 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) } } +//발송결과 - 대기/성공/실패 +function subContent(p_content_no){ + + var sendData = $(document.listForm).serializeArray(); + var v_html_pre = '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표
구분충전금액사용금액잔액
LOADING...
'; + + var v_html_pre = '' + + '
' + + '
' + + '

전체

' + + '

' + + '
' + + '
' + + '
LOADING...
' + + '
' + + '
' + + + '
' + + '
' + + '

단문(SMS)

' + + '

' + + '
' + + '
' + + '
LOADING...
' + + '
' + + '
' + + + '
' + + '
' + + '

장문(LMS)

' + + '

' + + '
' + + '
' + + '
LOADING...
' + + '
' + + '
' + + + '
' + + '
' + + '

그림(MMS)

' + + '

' + + '
' + + '
' + + '
LOADING...
' + + '
' + + '
' + ; + + + //$("#prePaymentYn_Y").html('
LOADING...
'); + $("#revAdmin").html(v_html_pre); + + + + $("#revAdmin").load("/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.do", sendData ,function(response, status, xhr){ + }); + +} +
@@ -833,169 +913,10 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
-
-
-
-

전체

- -

-
-
-

WEB

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
- -
-

API

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
-
-
-
-
-

단문(SMS)

- -

-
-
-

WEB

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
- -
-

API

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
-
-
-
-
-

장문(LMS)

- -

-
-
-

WEB

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
- -
-

API

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
-
-
-
-
-

그림(MMS)

- -

-
-
-

WEB

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
- -
-

API

-
-
대기
-
-
-
-
성공
-
-
-
-
실패
-
-
-
-
-
+ +
- - - -
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp new file mode 100644 index 00000000..73127188 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/subcontent/MsgSentView_HA_allSentAjax.jsp @@ -0,0 +1,183 @@ +<%-- + Class Name : MsgSentView_HA_allSentAjax.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"%> + + + + +
+
+

전체

+ +

+
+
+

WEB

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+ +
+

API

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+
+
+
+
+

단문(SMS)

+ +

+
+
+

WEB

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+ +
+

API

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+
+
+
+
+

장문(LMS)

+ +

+
+
+

WEB

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+ +
+

API

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+
+
+
+
+

그림(MMS)

+ +

+
+
+

WEB

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+ +
+

API

+
+
대기
+
+
+
+
성공
+
+
+
+
실패
+
+
+
+
+
\ No newline at end of file From 6396af29b76acb85bed855978a92546a32ad01bc Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 21 Mar 2024 17:17:46 +0900 Subject: [PATCH 5/7] =?UTF-8?q?2024-03-21=2017:17=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=EC=97=90=20=EC=A3=BC=EC=84=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml index 269a02b2..8e721c86 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml @@ -1569,6 +1569,7 @@ + /* KakaoSentDAO.selectAllKakaoSentList */ SELECT M2.totMsgCnt , M2.userId , @@ -478,6 +479,7 @@