diff --git a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java index c646a408..4dab3c56 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -144,14 +144,14 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } } - - System.out.println(" :: SOLR_CORE.values().length :: "+ SOLR_CORE.values().length); - System.out.println(" :: SOLR_CORE.values() :: "+ SOLR_CORE.values()); Map>> resultMap = new HashMap>>(); Map resultCntMap = new HashMap(); long totalCount = 0; for (SOLR_CORE sc : SOLR_CORE.values()) { + + log.debug(" :: sc.getValue() :: [{}]", sc.getValue()); + resultCntMap.put(sc.getValue(), new Long(0)); resultMap.put(sc.getValue(), Collections.>emptyList()); List> resultList = getResultList(sc, fieldMap.get(sc.getValue()), commandMap); @@ -214,11 +214,14 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } finally { IOUtils.closeQuietly(client); } + log.debug(" :: resultList :: [{}]", resultList); return resultList; } private SolrQuery makeQuery(SOLR_CORE core, Map commandMap, Set fieldSet){ SolrQuery query = new SolrQuery(); + + log.debug(" :: commandMap :: [{}]", commandMap); String q = StringUtils.defaultString((String)commandMap.get("q")); q = q.replaceAll(SPECIAL_REGEX, ""); String re = (String)commandMap.get("re"); @@ -228,6 +231,10 @@ public class SearchServiceImpl implements InitializingBean, SearchService { int pageIndex = 1; String rangeView = (String)commandMap.get("rangeView"); + +// log.debug(" :: rangeView :: [{}]", rangeView); +// log.debug(" :: core.getValue() :: [{}]", core.getValue()); + if (core.getValue().equals(rangeView)) { String pi = (String)commandMap.get("pageIndex"); if (StringUtils.isNotBlank(pi)) { diff --git a/src/main/java/kcc/let/solr/search/web/SearchContorller.java b/src/main/java/kcc/let/solr/search/web/SearchContorller.java index f53b8f3d..1f9bb04f 100644 --- a/src/main/java/kcc/let/solr/search/web/SearchContorller.java +++ b/src/main/java/kcc/let/solr/search/web/SearchContorller.java @@ -1,126 +1,126 @@ -package kcc.let.solr.search.web; - -import java.util.Map; -import java.util.Set; - -import javax.annotation.Resource; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import egovframework.rte.fdl.string.EgovStringUtil; -import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kcc.let.solr.search.service.SearchService; -@Controller -public class SearchContorller { - - Logger log = LoggerFactory.getLogger(this.getClass()); - - @Resource(name = "searchService") - protected SearchService searchService; - - //TODO test URL - // http://192.168.0.125:8983/solr/kcc_adr_advc/select?q=*:*&wt=json&indent=true - @SuppressWarnings("unchecked") - @RequestMapping(value = "/web/search/search.do") - public String search(@RequestParam Map commandMap, ModelMap model) throws Exception { - log.debug("commandMap : {}", commandMap); - - String searchWrd = (String) commandMap.get("q"); - - if (searchWrd!= null && !("").equals(searchWrd)) { - searchService.search(commandMap, model); - } - - PaginationInfo paginationInfo = new PaginationInfo(); - int totalRecordCount = 0; - String rangeView = (String)commandMap.get("rangeView"); - if ( StringUtils.isNotBlank(rangeView) ) { - Map resultCntMap = (Map)model.get("resultCntMap"); - log.debug("resultCntMap : {}", resultCntMap); - Long total = resultCntMap.get(rangeView); - if (total != null) { - totalRecordCount = total.intValue(); - } - log.debug("totalRecordCount : {}", totalRecordCount); - - String pi = (String)commandMap.get("pageIndex"); - if ( StringUtils.isBlank(pi) ) { - pi = "1"; - } - int pageIndex = EgovStringUtil.string2integer(pi); - log.debug("pageIndex : {}", pageIndex); - paginationInfo.setCurrentPageNo(pageIndex); - paginationInfo.setRecordCountPerPage(10); - paginationInfo.setPageSize(10); - paginationInfo.setTotalRecordCount(totalRecordCount); - model.addAttribute("paginationInfo", paginationInfo); - } - model.addAttribute("totalRecordCount", totalRecordCount); - - return "web/search/search"; - //return "web/search/search_0529.jsp"; - //return "kopost/search/search"; - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/{siteId}/web/search/search.do") - public String siteSearch(@PathVariable("siteId") String siteId , @RequestParam Map commandMap, ModelMap model) throws Exception { - log.debug("commandMap : {}", commandMap); - - String searchWrd = (String) commandMap.get("q"); - if (searchWrd!= null && !("").equals(searchWrd)) { - searchService.search(commandMap, model); - } - - PaginationInfo paginationInfo = new PaginationInfo(); - int totalRecordCount = 0; - String rangeView = (String)commandMap.get("rangeView"); - if ( StringUtils.isNotBlank(rangeView) ) { - Map resultCntMap = (Map)model.get("resultCntMap"); - log.debug("resultCntMap : {}", resultCntMap); - Long total = resultCntMap.get(rangeView); - if (total != null) { - totalRecordCount = total.intValue(); - } - log.debug("totalRecordCount : {}", totalRecordCount); - - String pi = (String)commandMap.get("pageIndex"); - if ( StringUtils.isBlank(pi) ) { - pi = "1"; - } - int pageIndex = EgovStringUtil.string2integer(pi); - log.debug("pageIndex : {}", pageIndex); - paginationInfo.setCurrentPageNo(pageIndex); - paginationInfo.setRecordCountPerPage(10); - paginationInfo.setPageSize(10); - paginationInfo.setTotalRecordCount(totalRecordCount); - model.addAttribute("paginationInfo", paginationInfo); - } - model.addAttribute("totalRecordCount", totalRecordCount); - - model.addAttribute("siteId", siteId); - String siteFolder = "site/"+siteId ; - model.addAttribute("site_path", "/"+siteFolder); - - //return "kopost/search/search"; - return "web/"+siteFolder+"/search/search"; - } - - @RequestMapping(value = "/json/ajaxSuggest.do") - public ModelAndView ajaxEditorCopy(@RequestParam Map commandMap) throws Exception { - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("jsonView"); - - Set resultList = searchService.suggest(commandMap); - modelAndView.addObject("resultList", resultList); - return modelAndView; - } -} +package kcc.let.solr.search.web; + +import java.util.Map; +import java.util.Set; + +import javax.annotation.Resource; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.fdl.string.EgovStringUtil; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.let.solr.search.service.SearchService; +@Controller +public class SearchContorller { + + Logger log = LoggerFactory.getLogger(this.getClass()); + + @Resource(name = "searchService") + protected SearchService searchService; + + //TODO test URL + // http://192.168.0.125:8983/solr/kcc_adr_advc/select?q=*:*&wt=json&indent=true + @SuppressWarnings("unchecked") + @RequestMapping(value = "/web/search/search.do") + public String search(@RequestParam Map commandMap, ModelMap model) throws Exception { + log.debug("commandMap : {}", commandMap); + + String searchWrd = (String) commandMap.get("q"); + + if (searchWrd!= null && !("").equals(searchWrd)) { + searchService.search(commandMap, model); + } + + PaginationInfo paginationInfo = new PaginationInfo(); + int totalRecordCount = 0; + String rangeView = (String)commandMap.get("rangeView"); + if ( StringUtils.isNotBlank(rangeView) ) { + Map resultCntMap = (Map)model.get("resultCntMap"); + log.debug("resultCntMap : {}", resultCntMap); + Long total = resultCntMap.get(rangeView); + if (total != null) { + totalRecordCount = total.intValue(); + } + log.debug("totalRecordCount : {}", totalRecordCount); + + String pi = (String)commandMap.get("pageIndex"); + if ( StringUtils.isBlank(pi) ) { + pi = "1"; + } + int pageIndex = EgovStringUtil.string2integer(pi); + log.debug("pageIndex : {}", pageIndex); + paginationInfo.setCurrentPageNo(pageIndex); + paginationInfo.setRecordCountPerPage(10); + paginationInfo.setPageSize(10); + paginationInfo.setTotalRecordCount(totalRecordCount); + model.addAttribute("paginationInfo", paginationInfo); + } + model.addAttribute("totalRecordCount", totalRecordCount); + + return "web/search/search"; + //return "web/search/search_0529.jsp"; + //return "kopost/search/search"; + } + + @SuppressWarnings("unchecked") + @RequestMapping(value = "/{siteId}/web/search/search.do") + public String siteSearch(@PathVariable("siteId") String siteId , @RequestParam Map commandMap, ModelMap model) throws Exception { + log.debug("commandMap : {}", commandMap); + + String searchWrd = (String) commandMap.get("q"); + if (searchWrd!= null && !("").equals(searchWrd)) { + searchService.search(commandMap, model); + } + + PaginationInfo paginationInfo = new PaginationInfo(); + int totalRecordCount = 0; + String rangeView = (String)commandMap.get("rangeView"); + if ( StringUtils.isNotBlank(rangeView) ) { + Map resultCntMap = (Map)model.get("resultCntMap"); + log.debug("resultCntMap : {}", resultCntMap); + Long total = resultCntMap.get(rangeView); + if (total != null) { + totalRecordCount = total.intValue(); + } + log.debug("totalRecordCount : {}", totalRecordCount); + + String pi = (String)commandMap.get("pageIndex"); + if ( StringUtils.isBlank(pi) ) { + pi = "1"; + } + int pageIndex = EgovStringUtil.string2integer(pi); + log.debug("pageIndex : {}", pageIndex); + paginationInfo.setCurrentPageNo(pageIndex); + paginationInfo.setRecordCountPerPage(10); + paginationInfo.setPageSize(10); + paginationInfo.setTotalRecordCount(totalRecordCount); + model.addAttribute("paginationInfo", paginationInfo); + } + model.addAttribute("totalRecordCount", totalRecordCount); + + model.addAttribute("siteId", siteId); + String siteFolder = "site/"+siteId ; + model.addAttribute("site_path", "/"+siteFolder); + + //return "kopost/search/search"; + return "web/"+siteFolder+"/search/search"; + } + + @RequestMapping(value = "/json/ajaxSuggest.do") + public ModelAndView ajaxEditorCopy(@RequestParam Map commandMap) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + Set resultList = searchService.suggest(commandMap); + modelAndView.addObject("resultList", resultList); + return modelAndView; + } +} diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index 1ae0874a..4e7ae6ec 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -68,8 +68,10 @@ function fnGoCrtfc(){

조정신청

+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp index 9a65e0e7..0ca395a6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp @@ -547,7 +547,7 @@ $( document ).ready(function(){
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp index c3c46a49..f407d4af 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp @@ -470,7 +470,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp index fc0427af..b4a8cd9c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp @@ -241,7 +241,7 @@ function fn_adjstReq_preview() { - +