From 5cd1c3148d572d3010882801e2aecfc1220e8ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 5 Jan 2024 17:38:31 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=ED=98=84=ED=99=A9=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=84=A4=EC=9D=B4=EC=85=98=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/EgovPaging.jsx | 2 +- .../admin/logs/AdminLogsController.java | 21 ++----- .../admin/logs/entity/ThPrivacyLog.java | 56 +------------------ .../config/common/BoardParams.java | 11 ++++ 4 files changed, 19 insertions(+), 71 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/components/EgovPaging.jsx b/egovframe-template-simple-react-contribution/src/components/EgovPaging.jsx index 57c564b..9fffccf 100644 --- a/egovframe-template-simple-react-contribution/src/components/EgovPaging.jsx +++ b/egovframe-template-simple-react-contribution/src/components/EgovPaging.jsx @@ -36,7 +36,7 @@ function EgovPaging({pagination, moveToPage}) { } if(pagination.endNum!=pagination.maxNum){ // 다음 페이지 이동 - const nextPageIndex = pagination.pageIndex+10 < pagination.maxNum?pagination.maxNum:(pagination.pageIndex-10) + const nextPageIndex = pagination.pageIndex+10 > pagination.maxNum?pagination.maxNum:(pagination.pageIndex+10) paginationTag.push(
    • ); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java index d30cd0f..568959f 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/AdminLogsController.java @@ -49,25 +49,12 @@ public class AdminLogsController extends BaseController { throws Exception { ResultVO resultVO = new ResultVO(); + thPrivacyLog.setQueryInfo(); Map resultMap = adminLogsService.selectPrivacyList(); - - PaginationInfo paginationInfo = new PaginationInfo(); - - paginationInfo.setCurrentPageNo(thPrivacyLog.getPageIndex()); - paginationInfo.setRecordCountPerPage(propertyService.getInt("Globals.pageUnit")); - paginationInfo.setPageSize(propertyService.getInt("Globals.pageSize")); - - thPrivacyLog.setFirstIndex(paginationInfo.getFirstRecordIndex()); - thPrivacyLog.setLastIndex(paginationInfo.getLastRecordIndex()); - thPrivacyLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - int totCnt = Integer.parseInt((String)resultMap.get("resultCnt")); - paginationInfo.setTotalRecordCount(totCnt); - -// resultMap.put("resultList", adminLogsService.selectPrivacyList()); -// resultMap.put("resultList", resultMap.get("resultList")); -// resultMap.put("resultCnt", totCnt); - resultMap.put("paginationInfo", paginationInfo); + thPrivacyLog.setContentCnt(totCnt); + thPrivacyLog.setPaginationInfo(); + resultMap.put("paginationInfo", thPrivacyLog); resultVO.setResultCode(ResponseCode.SUCCESS.getCode()); resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage()); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java index ee29534..bc2ab54 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java @@ -1,6 +1,8 @@ package com.dbnt.kcscbackend.admin.logs.entity; import java.io.Serializable; + +import com.dbnt.kcscbackend.config.common.BoardParams; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; @@ -22,61 +24,9 @@ import java.time.LocalDateTime; @DynamicInsert @DynamicUpdate @Table(name = "th_user_privacy_log") -public class ThPrivacyLog implements Serializable { +public class ThPrivacyLog extends BoardParams implements Serializable { private static final long serialVersionUID = -3779821913760046011L; - @Transient - @Schema(description = "검색시작일") - private String searchBgnDe = ""; - - @Transient - @Schema(description = "검색조건") - private String searchCnd = ""; - - @Transient - @Schema(description = "검색종료일") - private String searchEndDe = ""; - - @Transient - @Schema(description = "검색단어") - private String searchWrd = ""; - - @Transient - @Schema(description = "정렬순서(DESC,ASC)") - private long sortOrdr = 0L; - - @Transient - @Schema(description = "검색사용여부") - private String searchUseYn = ""; - - @Transient - @Schema(description = "현재페이지") - private int pageIndex = 1; - - @Transient - @Schema(description = "페이지갯수") - private int pageUnit = 10; - - @Transient - @Schema(description = "페이지사이즈") - private int pageSize = 10; - - @Transient - @Schema(description = "첫페이지 인덱스") - private int firstIndex = 1; - - @Transient - @Schema(description = "마지막페이지 인덱스") - private int lastIndex = 1; - - @Transient - @Schema(description = "페이지당 레코드 개수") - private int recordCountPerPage = 10; - - @Transient - @Schema(description = "레코드 번호") - private int rowNo = 0; - @Id @Column(name = "upl_seq") private Long uplSeq; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/common/BoardParams.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/common/BoardParams.java index ecaef87..1113fac 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/common/BoardParams.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/common/BoardParams.java @@ -1,5 +1,6 @@ package com.dbnt.kcscbackend.config.common; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -28,6 +29,16 @@ public class BoardParams implements Serializable { @Transient private Integer contentCnt=0; + @Transient + @Schema(description = "검색시작일") + private String searchBgnDe = ""; + @Transient + @Schema(description = "검색종료일") + private String searchEndDe = ""; + @Transient + @Schema(description = "정렬순서(DESC,ASC)") + private long sortOrdr = 0L; + public void setQueryInfo(){ setFirstIndex((getPageIndex()-1)*getRowCnt()); }