From aeb93b51bd747257313c977064c9fb66db7d1cc9 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 24 May 2023 13:49:21 +0900 Subject: [PATCH] =?UTF-8?q?2023-05-24=2013:49=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EC=A0=95=EB=B3=B4=20=EB=B0=8F=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EB=B0=9C=EC=86=A1=20=EC=A0=95=EB=B3=B4=20api=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjon/api/inqry/mapper/HstryMapper.java | 7 +-- .../inqry/service/impl/HstryServiceImpl.java | 50 ++++++++++++++----- .../mapper/api/inqry/HstryMapper.xml | 25 ++++++++-- 3 files changed, 61 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/HstryMapper.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/HstryMapper.java index 2b79d1c..fd41afd 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/HstryMapper.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/HstryMapper.java @@ -1,11 +1,12 @@ package com.itn.mjonApi.mjon.api.inqry.mapper; import java.util.List; -import java.util.Map; import org.apache.ibatis.annotations.Mapper; import com.itn.mjonApi.mjon.api.access.mapper.domain.AccessKeyVO; +import com.itn.mjonApi.mjon.api.inqry.service.mapper.domain.HstryDetailVO; +import com.itn.mjonApi.mjon.api.inqry.service.mapper.domain.HstryVO; /** * @packageName : com.itn.mjonApi.mjon.api.inqry.service.mapper @@ -31,8 +32,8 @@ public interface HstryMapper { */ //double selectUserMoney(String mberId); - List selectApiInqryHstry(String mberId); + List selectApiInqryHstry(HstryVO hstryVO); - List selectApiInqryHstryDetail(String mberId, String msgGroupId); + List selectApiInqryHstryDetail(HstryDetailVO hstryDetailVO); } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/HstryServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/HstryServiceImpl.java index a08400b..65ae9ff 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/HstryServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/HstryServiceImpl.java @@ -39,15 +39,17 @@ public class HstryServiceImpl implements HstryService { //전체 발송 이력 log.info(" :: hstryList ::"); - + HstryResponseVO hstryResponseVO = new HstryResponseVO(); - try { - hstryResponseVO = HstryResponseVO.builder() - - .objectList(hstryMapper.selectApiInqryHstry(hstryVO.getMberId())) + try { + //page 계산 + hstryVO.setPage(_calcPage(hstryVO.getPage(), hstryVO.getPageSize())); - .build(); + //전체 발송 이력 가져오기 + hstryResponseVO = HstryResponseVO.builder() + .objectList(hstryMapper.selectApiInqryHstry(hstryVO)) + .build(); } catch (Exception e) { log.info("selectPrice Error [{}]", e.getMessage()); @@ -67,14 +69,12 @@ public class HstryServiceImpl implements HstryService { HstryResponseVO hstryResponseVO = new HstryResponseVO(); try { - hstryResponseVO = HstryResponseVO.builder() - - .objectList(hstryMapper.selectApiInqryHstryDetail( - hstryDetailVO.getMberId() - , hstryDetailVO.getMsgGroupId() - )) + //page 계산 + hstryDetailVO.setPage(_calcPage(hstryDetailVO.getPage(), hstryDetailVO.getPageSize())); - .build(); + hstryResponseVO = HstryResponseVO.builder() + .objectList(hstryMapper.selectApiInqryHstryDetail(hstryDetailVO)) + .build(); } catch (Exception e) { log.info("selectPrice Error [{}]", e.getMessage()); @@ -84,5 +84,29 @@ public class HstryServiceImpl implements HstryService { } + + private String _calcPage(String p_s_page, String p_s_pageSize) throws Exception{ + //page 계산 + int i_page = 1; + int i_pageSize = 30; + + try { + i_page = Integer.parseInt(p_s_page); + }catch(Exception e) { + i_page = 1; + log.info("i_page Error [{}]", e.getMessage()); + } + + try { + i_pageSize = Integer.parseInt(p_s_pageSize); + }catch(Exception e) { + i_page = 30; + log.info("i_pageSize Error [{}]", e.getMessage()); + } + + i_page = (i_page-1)*i_pageSize; + + return Integer.toString(i_page); + } } diff --git a/src/main/resources/mapper/api/inqry/HstryMapper.xml b/src/main/resources/mapper/api/inqry/HstryMapper.xml index 7e7314a..de3fde1 100644 --- a/src/main/resources/mapper/api/inqry/HstryMapper.xml +++ b/src/main/resources/mapper/api/inqry/HstryMapper.xml @@ -179,6 +179,22 @@ AND B.DEL_FLAG ='N' AND B.RESERVE_C_YN = 'N' AND DATE_ADD(NOW(), INTERVAL 60 MINUTE) >= B.REQ_DATE + + + AND b.regdate >= STR_TO_DATE(CONCAT(#{startDate}, '000000'), '%Y%m%d%H%i%s') + + + AND b.regdate >= STR_TO_DATE(date_format(now(),'%Y%m%d000000'), '%Y%m%d%H%i%s') + + + + AND STR_TO_DATE(CONCAT(#{endDate}, '235959'), '%Y%m%d%H%i%s') >= b.regdate + + + AND STR_TO_DATE(date_format(DATE_ADD(NOW(), INTERVAL 1 day),'%Y%m%d000000'), '%Y%m%d%H%i%s') >= b.regdate + + + ) M LEFT JOIN @@ -204,8 +220,8 @@ MSG_GROUP_ID DESC , regdate DESC */ - LIMIT 100 - OFFSET 0 + LIMIT ${pageSize} + OFFSET ${page} )AAA ,( @@ -458,9 +474,8 @@ */ ORDER BY 1=1 , regdate DESC - LIMIT 5 - OFFSET 0 - + LIMIT ${pageSize} + OFFSET ${page} \ No newline at end of file