diff --git a/src/main/java/nlib/cmm/service/CodeService.java b/src/main/java/nlib/cmm/service/CodeService.java index 0a767f7d..a32d30a0 100644 --- a/src/main/java/nlib/cmm/service/CodeService.java +++ b/src/main/java/nlib/cmm/service/CodeService.java @@ -3,6 +3,7 @@ package nlib.cmm.service; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.springframework.stereotype.Service; @@ -11,8 +12,8 @@ import nlib.restful.service.DataApiResVO; public interface CodeService { - public List> listCodes(String iCodeId) throws Exception; + public List> listCodes(String iCodeId) throws Exception; - public List> listCtClsfs() throws Exception; + public List> listCtClsfs() throws Exception; } diff --git a/src/main/java/nlib/cmm/service/impl/CodeDAO.java b/src/main/java/nlib/cmm/service/impl/CodeDAO.java index f6137ff5..e4daf646 100644 --- a/src/main/java/nlib/cmm/service/impl/CodeDAO.java +++ b/src/main/java/nlib/cmm/service/impl/CodeDAO.java @@ -2,6 +2,7 @@ package nlib.cmm.service.impl; import java.util.HashMap; import java.util.List; +import java.util.Map; import egovframework.rte.psl.dataaccess.mapper.Mapper; @@ -30,7 +31,7 @@ import egovframework.rte.psl.dataaccess.mapper.Mapper; @Mapper("codeDAO") public interface CodeDAO { - public List> listCodes(String iCodeId) throws Exception; + public List> listCodes(String iCodeId) throws Exception; - public List> listCtClsfs() throws Exception; + public List> listCtClsfs() throws Exception; } diff --git a/src/main/java/nlib/cmm/service/impl/CodeServiceImpl.java b/src/main/java/nlib/cmm/service/impl/CodeServiceImpl.java index fb8390d6..e815a8c0 100644 --- a/src/main/java/nlib/cmm/service/impl/CodeServiceImpl.java +++ b/src/main/java/nlib/cmm/service/impl/CodeServiceImpl.java @@ -2,6 +2,7 @@ package nlib.cmm.service.impl; import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.Resource; @@ -21,14 +22,14 @@ public class CodeServiceImpl extends EgovAbstractServiceImpl implements CodeServ @Resource(name="codeDAO") private CodeDAO codeDAO; - public List> listCodes(String iCodeId) throws Exception { + public List> listCodes(String iCodeId) throws Exception { if(StringUtil.isEmpty(iCodeId)) return null; return codeDAO.listCodes(iCodeId.toUpperCase()); } - public List> listCtClsfs() throws Exception { + public List> listCtClsfs() throws Exception { return codeDAO.listCtClsfs(); } } \ No newline at end of file diff --git a/src/main/java/nlib/cmm/web/CodeController.java b/src/main/java/nlib/cmm/web/CodeController.java index a5f2dd83..93357cd4 100644 --- a/src/main/java/nlib/cmm/web/CodeController.java +++ b/src/main/java/nlib/cmm/web/CodeController.java @@ -30,7 +30,7 @@ public class CodeController extends NlibCommonController { String lCodeId = paramMap.get("lCodeId"); - List> resultList = codeService.listCodes(lCodeId); + List> resultList = codeService.listCodes(lCodeId); model.addAttribute("resultList", resultList); model.addAttribute("lCodeId", lCodeId); @@ -42,7 +42,7 @@ public class CodeController extends NlibCommonController { String lCodeId = paramMap.get("lCodeId"); - List> resultList = codeService.listCodes(lCodeId); + List> resultList = codeService.listCodes(lCodeId); model.addAttribute("resultList", resultList); model.addAttribute("lCodeId", lCodeId); diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 9dcf1118..70075afc 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -9,28 +9,19 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import cmm.Constant; import cmm.util.CmmUtil; -import cmm.util.DataMap; -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kccf.res.service.ResourcesService; -import kccf.sch.service.SearchCollectionResult; import kccf.sch.service.SearchService; -import kccf.sch.service.vo.SearchCollectionVO; -import kccf.sch.service.vo.Sf1VO; import nlib.cmm.NlibCommonController; import nlib.cmm.service.CodeService; import nlib.cmm.service.NlibProperty; @@ -38,14 +29,10 @@ import nlib.cmm.service.PagingVO; import nlib.col.service.CartService; import nlib.col.service.CollectionService; import nlib.col.service.CollectionVO; -import nlib.col.service.DeptVO; import nlib.col.service.InterestService; import nlib.col.service.RisService; -import nlib.restful.service.DataApiReqVO; -import nlib.restful.service.DataApiResVO; import nlib.sch.service.NlibSearchService; import nlib.sch.service.NlibSearchVO; -import nlib.user.service.NlibLoginVO; import nlib.util.StringUtil; @Controller @@ -92,18 +79,13 @@ public class NlibSearchController extends NlibCommonController { public String searchList( HttpServletRequest req , Authentication authentication - , @RequestParam Map paramMap , ModelMap model , @ModelAttribute("searchVO") NlibSearchVO searchVO , HttpServletRequest request , HttpServletResponse res) throws Exception { List operList = new ArrayList(); - // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) - List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); - - //주제분야 목록 조회 - List> clsf = codeService.listCtClsfs(); + List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); if(searchVO.getPageIndex() < 1) searchVO.setPageIndex(1); if(searchVO.getPageSize() < 1) searchVO.setPageSize(DEFUALT_PAGE_SIZE); @@ -148,24 +130,67 @@ public class NlibSearchController extends NlibCommonController { }catch(Exception e){ e.printStackTrace(); } + //주제분야 목록 조회 + List> clsf = codeService.listCtClsfs(); + //자료유형 + List> firstClassList = codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD); + List> secondClassList = codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD); + //검색엔진 주제분야 카운트 + List> subject= searchVO.getSubjectCountList(); + List> type= searchVO.getTypeCountList(); + + int count = 0; // 검색엔진 건수 자료 조합 - - List councilList = new ArrayList(); - councilList.add("마포문화원"); - councilList.add("서울문화원"); - councilList.add("종로문화원"); - /*List councilList = resourcesService.selectCouncilList(); */ - model.addAttribute("councilList", councilList); - + for(int i=0; i> clsf = codeService.listCtClsfs(); + List> clsf = codeService.listCtClsfs(); model.addAttribute("firstCategoryList", clsf); model.addAttribute("secondCategoryList", clsf); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index d47eba6f..15442e44 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -200,18 +200,18 @@ function fn_search_article(pageIndex) {
  • -
    on"> +
    on">
    - checked="checked" /> - + checked="checked" /> +
      - +
    • -
      checked="checked" /> - +
      checked="checked" /> +
    • @@ -233,15 +233,15 @@ function fn_search_article(pageIndex) {
        - +
      • -
        on"> -
        checked="checked"/>
        +
        on"> +
        checked="checked"/>
          - -
        • checked="checked"/>
        • + +
        • checked="checked"/>