From d580800ea14f065ad36b9148d41768bf2a06e254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 29 Dec 2021 11:49:18 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=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 --- .../controller/adminController.java | 20 +++--- .../kcgfilemanager/mapper/BoardMapper.java | 3 + .../dbnt/kcgfilemanager/model/BoardLog.java | 11 +++- .../kcgfilemanager/service/BoardService.java | 8 +++ .../resources/mybatisMapper/BoardMapper.xml | 26 +++++++- src/main/resources/templates/admin/main.html | 62 ++++++++++++++++++- .../resources/templates/board/contentLog.html | 2 +- 7 files changed, 117 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java index f8877c2..92e115b 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/adminController.java @@ -1,13 +1,8 @@ package com.dbnt.kcgfilemanager.controller; -import com.dbnt.kcgfilemanager.model.BoardCategory; -import com.dbnt.kcgfilemanager.model.CategoryRole; -import com.dbnt.kcgfilemanager.model.CommonCode; -import com.dbnt.kcgfilemanager.model.UserInfo; -import com.dbnt.kcgfilemanager.service.BoardCategoryService; -import com.dbnt.kcgfilemanager.service.CategoryRoleService; -import com.dbnt.kcgfilemanager.service.CommonCodeService; -import com.dbnt.kcgfilemanager.service.UserInfoService; +import com.dbnt.kcgfilemanager.config.LogStatus; +import com.dbnt.kcgfilemanager.model.*; +import com.dbnt.kcgfilemanager.service.*; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -25,10 +20,17 @@ public class adminController { private final BoardCategoryService boardCategoryService; private final UserInfoService userInfoService; private final CategoryRoleService categoryRoleService; + private final BoardService boardService; @GetMapping("/main") - public ModelAndView goAdmin() { + public ModelAndView goAdmin(BoardLog boardLog) { ModelAndView mav = new ModelAndView("admin/main"); + boardLog.setQueryInfo(); + mav.addObject("statusMap", LogStatus.getStatusMap()); + mav.addObject("boardLogList", boardService.selectBoardLogList(boardLog)); + boardLog.setContentCnt(boardService.selectBoardLogListCnt(boardLog)); + boardLog.setPaginationInfo(); + mav.addObject("searchParams", boardLog); return mav; } @GetMapping("/categoryMgt") diff --git a/src/main/java/com/dbnt/kcgfilemanager/mapper/BoardMapper.java b/src/main/java/com/dbnt/kcgfilemanager/mapper/BoardMapper.java index 01f1458..986080c 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/mapper/BoardMapper.java +++ b/src/main/java/com/dbnt/kcgfilemanager/mapper/BoardMapper.java @@ -13,4 +13,7 @@ public interface BoardMapper { Integer selectContentListCnt(Board board); List selectHashTagListFromContentSeq(Integer contentSeq); List selectBoardLogFromContentSeq(Integer contentSeq); + + List selectBoardLogList(BoardLog boardLog); + Integer selectBoardLogListCnt(BoardLog boardLog); } diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/BoardLog.java b/src/main/java/com/dbnt/kcgfilemanager/model/BoardLog.java index 660e3a3..b7815ae 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/model/BoardLog.java +++ b/src/main/java/com/dbnt/kcgfilemanager/model/BoardLog.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @DynamicUpdate @Table(name = "BOARD_LOG") @IdClass(BoardLog.BoardLogId.class) -public class BoardLog { +public class BoardLog extends BaseModel{ @Id @Column(name = "CONTENT_SEQ", nullable = false) @@ -34,6 +34,15 @@ public class BoardLog { @Column(name = "CREATE_DATE") private LocalDateTime createDate; + @Transient + private String title; + @Transient + private String categoryName; + @Transient + private Integer categorySeq; + @Transient + private String createName; + @Embeddable @Data @NoArgsConstructor diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java index fbd13ea..026ca5f 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java @@ -285,4 +285,12 @@ public class BoardService { double unitSelector = Math.floor(Math.log(fileSize)/Math.log(1024)); return Math.round((fileSize/Math.pow(1024, unitSelector))*100)/100d+" "+units[(int)unitSelector]; } + + public List selectBoardLogList(BoardLog boardLog) { + return boardMapper.selectBoardLogList(boardLog); + } + + public Integer selectBoardLogListCnt(BoardLog boardLog) { + return boardMapper.selectBoardLogListCnt(boardLog); + } } diff --git a/src/main/resources/mybatisMapper/BoardMapper.xml b/src/main/resources/mybatisMapper/BoardMapper.xml index 5e958a2..7d626dd 100644 --- a/src/main/resources/mybatisMapper/BoardMapper.xml +++ b/src/main/resources/mybatisMapper/BoardMapper.xml @@ -154,11 +154,35 @@ SELECT A.LOG_SEQ AS logSeq, A.LOG_STATUS AS logStatus, A.DESCRIPTION AS description, - B.NAME AS createId , + B.NAME AS createName , A.CREATE_DATE AS createDate FROM BOARD_LOG A INNER JOIN USER_INFO B ON A.CREATE_ID = B.USER_ID WHERE A.CONTENT_SEQ = ${categorySeq} ORDER BY LOG_SEQ DESC + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/main.html b/src/main/resources/templates/admin/main.html index 10bfdc8..cac58cb 100644 --- a/src/main/resources/templates/admin/main.html +++ b/src/main/resources/templates/admin/main.html @@ -9,10 +9,66 @@
-
- +
+
저장공간
-
+
+
전체 이력
+ + + + + + + + + + + + + + + + + + + + + + + + +
제목행동내용사용자발생일시
+ +
+
+
+ +
+
diff --git a/src/main/resources/templates/board/contentLog.html b/src/main/resources/templates/board/contentLog.html index 0b85b90..b881017 100644 --- a/src/main/resources/templates/board/contentLog.html +++ b/src/main/resources/templates/board/contentLog.html @@ -18,7 +18,7 @@ - +