From 0bd96565ed5f2bc8162bbbc4988904cc03865295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 22 Dec 2021 18:09:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BoardController.java | 13 ++- .../com/dbnt/kcgfilemanager/model/Board.java | 5 +- .../kcgfilemanager/model/ContentPosition.java | 20 ++++ .../repository/ContentPositionRepository.java | 8 ++ .../service/BoardCategoryService.java | 7 ++ .../kcgfilemanager/service/BoardService.java | 2 +- .../resources/mybatisMapper/BoardMapper.xml | 81 +++++++++++-- .../resources/static/js/board/contentList.js | 6 +- .../templates/admin/categoryMgt.html | 4 +- .../resources/templates/admin/codeMgt.html | 4 +- src/main/resources/templates/admin/main.html | 4 +- .../templates/admin/modifyRequest.html | 4 +- .../resources/templates/admin/userMgt.html | 4 +- .../templates/board/contentDetail.html | 2 +- .../templates/board/contentList.html | 4 +- .../templates/board/contentSearch.html | 4 +- .../templates/board/contentWrite.html | 4 +- src/main/resources/templates/board/main.html | 109 ++++++++++++++++++ .../resources/templates/fragments/footer.html | 4 +- .../layout/defaultContentLayout.html | 4 +- src/main/resources/templates/login.html | 4 +- .../resources/templates/login/denied.html | 4 +- .../resources/templates/login/myInfo.html | 4 +- .../resources/templates/login/signup.html | 4 +- src/main/resources/templates/main.html | 10 -- 25 files changed, 251 insertions(+), 68 deletions(-) create mode 100644 src/main/java/com/dbnt/kcgfilemanager/model/ContentPosition.java create mode 100644 src/main/java/com/dbnt/kcgfilemanager/repository/ContentPositionRepository.java create mode 100644 src/main/resources/templates/board/main.html delete mode 100644 src/main/resources/templates/main.html diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java index 65b959e..a6ac1a9 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java @@ -34,9 +34,14 @@ public class BoardController { @GetMapping("/main") - public ModelAndView main() { - ModelAndView mav = new ModelAndView("main"); - + public ModelAndView main(Board param) { + ModelAndView mav = new ModelAndView("board/main"); + param.setStatus("M"); + mav.addObject("contentList", boardService.selectContentList(param)); + param.setQueryInfo(); + param.setContentCnt(boardService.selectContentListCnt(param)); + param.setPaginationInfo(); + mav.addObject("searchParams", param); return mav; } @@ -72,7 +77,7 @@ public class BoardController { @RequestParam(value = "tagName", required = false) List tagNameList ){ ModelAndView mav = new ModelAndView("board/contentList"); - mav.addObject("pageTitle", boardCategoryService.getPageTitle(board.getCategorySeq())); + mav.addObject("pageTitle", boardCategoryService.getDepth4PageTitle(board.getCategorySeq())); board.setQueryInfo(); if(tagNameList != null && tagNameList.size() != 0){ board = boardService.setHashTagSearch(board, tagNameList); diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/Board.java b/src/main/java/com/dbnt/kcgfilemanager/model/Board.java index 6e78680..ad8287e 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/model/Board.java +++ b/src/main/java/com/dbnt/kcgfilemanager/model/Board.java @@ -40,7 +40,7 @@ public class Board extends BaseModel{ private LocalDateTime createDate; @Transient - private String originalName; + private String categoryName; @Transient private String createName; @@ -58,4 +58,7 @@ public class Board extends BaseModel{ private String hashTagStr; @Transient private List fileList; + + @Transient + private String originalName; } diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/ContentPosition.java b/src/main/java/com/dbnt/kcgfilemanager/model/ContentPosition.java new file mode 100644 index 0000000..bfa5ffb --- /dev/null +++ b/src/main/java/com/dbnt/kcgfilemanager/model/ContentPosition.java @@ -0,0 +1,20 @@ +package com.dbnt.kcgfilemanager.model; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import javax.persistence.*; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@Table(name = "CONTENT_POSITION") +public class ContentPosition { + @Id + @Column(name = "CATEGORY_SEQ") + private Integer categorySeq; + @Column(name = "CATEGORY_NAME", nullable = false) + private String categoryName; +} diff --git a/src/main/java/com/dbnt/kcgfilemanager/repository/ContentPositionRepository.java b/src/main/java/com/dbnt/kcgfilemanager/repository/ContentPositionRepository.java new file mode 100644 index 0000000..bfb34e0 --- /dev/null +++ b/src/main/java/com/dbnt/kcgfilemanager/repository/ContentPositionRepository.java @@ -0,0 +1,8 @@ +package com.dbnt.kcgfilemanager.repository; + +import com.dbnt.kcgfilemanager.model.ContentPosition; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ContentPositionRepository extends JpaRepository { + +} diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java index f2dc3ad..90de367 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardCategoryService.java @@ -2,8 +2,10 @@ package com.dbnt.kcgfilemanager.service; import com.dbnt.kcgfilemanager.model.BoardCategory; import com.dbnt.kcgfilemanager.model.CategoryRole; +import com.dbnt.kcgfilemanager.model.ContentPosition; import com.dbnt.kcgfilemanager.repository.BoardCategoryRepository; import com.dbnt.kcgfilemanager.repository.CategoryRoleRepository; +import com.dbnt.kcgfilemanager.repository.ContentPositionRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,6 +19,7 @@ public class BoardCategoryService { private final BoardCategoryRepository boardCategoryRepository; private final CategoryRoleRepository categoryRoleRepository; + private final ContentPositionRepository contentPositionRepository; public List selectBoardCategory(Integer parentSeq, Integer depth) { @@ -69,6 +72,10 @@ public class BoardCategoryService { return getPageTitle(category.getParentSeq())+" > "+category.getCategoryName(); } + public String getDepth4PageTitle(Integer categorySeq) { + ContentPosition contentPosition = contentPositionRepository.findById(categorySeq).orElse(null); + return contentPosition.getCategoryName(); + } public String makeFilePath(Integer categorySeq){ BoardCategory category = boardCategoryRepository.findById(categorySeq).orElse(null); if(category.getParentSeq()==null){ diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java index 778905b..924b99c 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java @@ -49,7 +49,7 @@ public class BoardService { board.getCategoryList().add(category); } - searchResult.setContentList(boardMapper.selectContentList(board)); + searchResult.setContentList(selectContentList(board)); results.add(searchResult); } return results; diff --git a/src/main/resources/mybatisMapper/BoardMapper.xml b/src/main/resources/mybatisMapper/BoardMapper.xml index 519b2f1..99ae63f 100644 --- a/src/main/resources/mybatisMapper/BoardMapper.xml +++ b/src/main/resources/mybatisMapper/BoardMapper.xml @@ -5,12 +5,17 @@