From 026f66f827342dee42216f66dcfaacc84d8c6f63 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 29 Nov 2022 14:07:35 +0900 Subject: [PATCH] =?UTF-8?q?2022-11-29=2014:07=20=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EC=A2=85=EA=B2=B0=EB=AA=A9=EB=A1=9D=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=EC=8B=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjclsmgr/web/AdjClsMgrController.java | 133 +++++++++++------- .../solr/search/impl/SearchServiceImpl.java | 37 +++++ .../solr/search/service/SearchService.java | 2 + .../iam/internalApprovManageDetail.jsp | 27 +++- .../iam/internalApprovManageEndDetail.jsp | 16 ++- .../kccadr/adjclsmgr/adjCloseMangeDetail.jsp | 14 +- .../kccadr/adjclsmgr/adjCloseMangeList.jsp | 10 +- .../jsp/kccadr/adjclsmgr/adjCloseTab0.jsp | 12 +- .../webapp/WEB-INF/jsp/main/EgovMainView.jsp | 31 ++++ 9 files changed, 221 insertions(+), 61 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index ccb974e5..72a6aec4 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -124,64 +124,101 @@ public class AdjClsMgrController { @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeList.do") // public String adjCloseMangeList(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { public String search(@RequestParam Map commandMap, ModelMap model) throws Exception { - log.debug("commandMap : {}", commandMap); - log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty()); - - if(commandMap.isEmpty()) { - commandMap.put("q", ":"); - commandMap.put("rangeView", "kcc_adr_advc"); - commandMap.put("searchKeyword", ""); - commandMap.put("footerSite", ""); - } - - - String searchWrd = (String) commandMap.get("q"); - - log.info(" + searchWrd :: [{}]", searchWrd); - 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"); - Long total = resultCntMap.get(rangeView); - if (total != null) { - totalRecordCount = total.intValue(); - } - log.debug("totalRecordCount : {}", totalRecordCount); + try{ + log.debug("commandMap : {}", commandMap); + log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty()); - String pi = (String)commandMap.get("pageIndex"); - if ( StringUtils.isBlank(pi) ) { - pi = "1"; + //기본값설정 + commandMap.put("rangeView", "kcc_adr_advc"); + String searchWrd = (String) commandMap.get("q"); + + if (searchWrd==null) { + commandMap.put("q", ":"); + searchWrd = (String) commandMap.get("q"); + } + + + if(commandMap.isEmpty()) { + commandMap.put("q", ":"); + commandMap.put("rangeView", "kcc_adr_advc"); + commandMap.put("searchKeyword", ""); + commandMap.put("footerSite", ""); + } + + + log.info(" + searchWrd :: [{}]", searchWrd); + if (searchWrd!= null && !("").equals(searchWrd)) { + searchService.search(commandMap, model); } - 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); - } - String q = (String) commandMap.get("q"); - if(q.length() == 1 && ":".equals(q)) - { - commandMap.put("q", ""); + PaginationInfo paginationInfo = new PaginationInfo(); + int totalRecordCount = 0; + + + String rangeView = (String)commandMap.get("rangeView"); + if ( StringUtils.isNotBlank(rangeView) ) { + Map resultCntMap = (Map)model.get("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); + } + + String q = (String) commandMap.get("q"); + try { + if(q.length() == 1 && ":".equals(q)) + { + commandMap.put("q", ""); + } + }catch(Exception ex) { + commandMap.put("q", ""); + } + + + + model.addAttribute("commandMap", commandMap); + model.addAttribute("totalRecordCount", totalRecordCount); + }catch(Exception ex) { + ex.printStackTrace(); } - - model.addAttribute("commandMap", commandMap); - model.addAttribute("totalRecordCount", totalRecordCount); return "/kccadr/adjclsmgr/adjCloseMangeList"; } + /** + * + * 서류 발급 요청 승인/반려 + */ + //@RequestMapping("/kccadr/adjclsmgr/docIssReqSave.do") + @RequestMapping(value = "/kccadr/adjclsmgr/solrDataImportAjax.do") + public ModelAndView solrDataImport( + HttpServletRequest request + ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + //core name data import + searchService.coreImport("kcc_adr_advc"); + + modelAndView.addObject("result", KccadrConstants.SUCCESS); + + return modelAndView; + } + @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeDetail.do") public String adjCloseMangeDetail(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception { 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 d0ca8186..f00010ea 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -183,6 +183,12 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } + @Override + public void coreImport(String p_coreName) throws Exception { + this.solrDataImport(p_coreName); + + } + private List> getResultList(SOLR_CORE core, Set fieldSet, Map commandMap){ List> resultList = new ArrayList>(); @@ -241,6 +247,37 @@ public class SearchServiceImpl implements InitializingBean, SearchService { return resultList; } + //solr dataimport 용 + private void solrDataImport( + String p_coreName + ){ + //Globals.Solr.url=http://localhost:8983/solr + String serverUrl = SERVER_URL.endsWith("/") ? SERVER_URL : SERVER_URL + "/"; + serverUrl = serverUrl + p_coreName; + + HttpSolrClient client = null; + SolrQuery query = new SolrQuery(); + query.set("qt", "/dataimport"); + query.set("command", "full-import"); + + log.debug(" ++ serverUrl :: {} , query :: {}", serverUrl, query); + try { + client = new HttpSolrClient(serverUrl); + client.setConnectionTimeout(1000); + QueryResponse rsp = client.query(query); + + System.out.println("rsp.getElapsedTime()"); + System.out.println(rsp.getElapsedTime()); + + } catch (Exception e) { + System.out.println("Exception Occured!!!"); + e.printStackTrace(); + } finally { + IOUtils.closeQuietly(client); + } + + } + private SolrQuery makeQuery(SOLR_CORE core, Map commandMap, Set fieldSet){ SolrQuery query = new SolrQuery(); diff --git a/src/main/java/kcc/let/solr/search/service/SearchService.java b/src/main/java/kcc/let/solr/search/service/SearchService.java index 1bc60ed0..ed04405b 100644 --- a/src/main/java/kcc/let/solr/search/service/SearchService.java +++ b/src/main/java/kcc/let/solr/search/service/SearchService.java @@ -34,4 +34,6 @@ public interface SearchService { public void search(Map commandMap, ModelMap model) throws Exception; + public void coreImport(String p_coreName) throws Exception; + } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index a59bad47..93f43bcf 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -1045,7 +1045,8 @@ - + +

조정부

@@ -1063,8 +1064,32 @@

장소

+ + + + 조정 조사관 + +

+ +

+ + 진행상태 + +

+ + + + + + + + +

+ + +

조정결과

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp index 0398b8a2..d66c9bf1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp @@ -973,6 +973,16 @@ function getPageUrl(idx) { <%--

장소

--%> + + + 조정 조사관 + +

+ +

+ + + <%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%> <%-- 205010 --%> @@ -1037,14 +1047,14 @@ function getPageUrl(idx) { -

조정결과

- +

조정결과

+

<%-- --%> <%-- --%> ${endResult}

- +

${memoVO.adrAdmMemo} diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeDetail.jsp index 90bae7b1..64bd40a2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeDetail.jsp @@ -52,9 +52,9 @@ } function fncGoList(){ - var detailForm = document.detailForm ; - detailForm.action = ""; - detailForm.submit(); + var listForm = document.listForm ; + listForm.action = ""; + listForm.submit(); } // 기일통지서, 기일변경통지서 상세페이지 이동 @@ -129,6 +129,14 @@ + + + + + " /> + " /> + " /> + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp index b2b2dff7..b801f441 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -275,9 +275,13 @@ -

- -
+ + +
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseTab0.jsp index 70d0d160..50442f10 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseTab0.jsp @@ -131,11 +131,12 @@ function goToEntDetailNotice(){

- 종결상태 + 장소 -

+

+ 조정부 @@ -153,11 +154,16 @@ function goToEntDetailNotice(){ 조정 조사관 - +

+ 종결상태 + +

+

+ diff --git a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp index 8faf0da2..ce4dd2b9 100644 --- a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp @@ -33,6 +33,13 @@