From ef51c429ff4942e23adf881ea03973326c881d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 21 Dec 2021 11:43:29 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BoardController.java | 13 +++- .../static/js/board/contentSearch.js | 66 +++++++++++++++---- .../templates/board/contentSearch.html | 10 +-- .../templates/fragments/leftMenu.html | 2 +- 4 files changed, 70 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java index 896f10e..629ca45 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java @@ -1,9 +1,7 @@ package com.dbnt.kcgfilemanager.controller; import com.dbnt.kcgfilemanager.config.LogStatus; -import com.dbnt.kcgfilemanager.model.Board; -import com.dbnt.kcgfilemanager.model.FileInfo; -import com.dbnt.kcgfilemanager.model.UserInfo; +import com.dbnt.kcgfilemanager.model.*; import com.dbnt.kcgfilemanager.service.BoardService; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -73,6 +71,15 @@ public class BoardController { return mav; } + @GetMapping("/fullSearchBoardContent") + public ModelAndView fullSearchBoardContent(Board board, + @RequestParam(value = "categorySeq", required = false) List categorySeqList, + @RequestParam(value = "tagName", required = false) List tagNameList){ + ModelAndView mav = new ModelAndView("board/contentSearchResult"); + + return mav; + } + @GetMapping("/selectBoardContent") public ModelAndView selectBoardContent(Board content, @AuthenticationPrincipal UserInfo loginUser){ ModelAndView mav = new ModelAndView("board/contentDetail"); diff --git a/src/main/resources/static/js/board/contentSearch.js b/src/main/resources/static/js/board/contentSearch.js index 57d10af..125890b 100644 --- a/src/main/resources/static/js/board/contentSearch.js +++ b/src/main/resources/static/js/board/contentSearch.js @@ -20,8 +20,10 @@ $(document).on('click', '#categoryDownBtn', function (){ if(parentCheck(categorySeq)){ childCheck(categorySeq); const categoryName = selectedCategory.attr("data-categoryname"); + const depth = selectedCategory.attr("data-depth"); let categoryHtml = ""; $("#selectedCategoryDiv").append(categoryHtml); @@ -34,30 +36,28 @@ $(document).on('click', '#categoryUpBtn', function (){ $(document).on('click', '#categorySelectBtn', function (){ const selectedCategory = $(".selectedCategory"); - let categorySeqs = ""; + let boardCategory = ""; let categoryNames = ""; selectedCategory.each(function (idx, el){ - categorySeqs += $(el).attr("data-categoryseq")+","; + boardCategory += $(el).attr("data-categoryseq")+","+$(el).attr("data-depth")+"|"; categoryNames += $(el).attr("data-categoryName")+", "; }) - $("#categorySeq").val(categorySeqs.slice(0, -1)); + $("#boardCategoryAry").val(boardCategory.slice(0, -1)); $("#categoryName").val(categoryNames.slice(0, -2)); $("#categorySelectModal").find(".btn-close").click(); }) $(document).on('click', '#searchBtn', function (){ - + const param = getSearchParam(); $.ajax({ - url: '/board/boardContentSearch', - data: {contentSeq: contentSeq}, + url: '/board/fullSearchBoardContent', + data: param, type: 'GET', + processData: false, + contentType: false, dataType:"html", success: function(html){ - $("#contentDiv").empty().append(html) - if($("#contentStatus").val() !== "D"){ - const viewCntTd = $(".contentCheckBox:checked").parents("tr").find(".viewCntTd"); - viewCntTd.text(Number(viewCntTd.text())+1); - } + $("#searchResultDiv").empty().append(html) }, error:function(){ @@ -65,6 +65,48 @@ $(document).on('click', '#searchBtn', function (){ }); }) +function getSearchParam(){ + const param = {board: {}}; + let boardCategoryAry = $("#boardCategoryAry").val(); + if(boardCategoryAry){ + boardCategoryAry = boardCategoryAry.split('|'); + param.boardCategoryList = []; + boardCategoryAry.forEach((value) => { + const boardCategory = value.split(','); + param.boardCategoryList.push({categorySeq: boardCategory[0], depth: boardCategory[1]}); + }) + } + const title = $("#title").val(); + if(title){ + param.board.title = title; + } + const createName = $("#createName").val(); + if(createName){ + param.board.createName = createName; + } + let tagNameAry = $("#tagName").val(); + if(tagNameAry){ + tagNameAry = tagNameAry.split(',') + param.hasTagList = []; + tagNameAry.forEach((value => { + param.hasTagList.push({tagName: value}) + })) + } + const startDate = $("#startDate").val(); + if(startDate){ + param.board.startDate = startDate; + } + const endDate = $("#endDate").val(); + if(endDate){ + param.board.endDate = endDate; + } + const originalName = $("#originalName").val(); + if(originalName){ + param.board.searchFileName = originalName; + } + return param; +} + function parentCheck(categorySeq){ const radio = $("#categoryRadio"+categorySeq); if(radio.length>0){ diff --git a/src/main/resources/templates/board/contentSearch.html b/src/main/resources/templates/board/contentSearch.html index cfb6e37..e498e00 100644 --- a/src/main/resources/templates/board/contentSearch.html +++ b/src/main/resources/templates/board/contentSearch.html @@ -21,9 +21,9 @@
- +
- +
@@ -43,13 +43,13 @@
- +
- - + +
diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index b8d0689..09f8346 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -13,7 +13,7 @@
- 통합 검색 + 통합 검색
자료 등록