From 3997f3d262e4cfafdb87a7dca60de0a557ce4db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Wed, 11 Jun 2025 11:14:21 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=205?= =?UTF-8?q?=EA=B0=9C=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20JSON=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drilling/home/DrillingHomeController.java | 66 +++++++++++-------- .../views/drilling/home/drilling_index.jsp | 30 +++++++-- 2 files changed, 64 insertions(+), 32 deletions(-) diff --git a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java index 2b9782c3..0f0ff75c 100644 --- a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java +++ b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java @@ -48,6 +48,7 @@ import geoinfo.drilling.home.service.DrillingHomeService; import geoinfo.drilling.input.service.DrillingInputService; import geoinfo.drilling.inquiry.service.DrillingInquiryService; import geoinfo.main.login.service.LoginService; +import geoinfo.main.notice.service.NoticeService; import geoinfo.map.mapControl.service.MapControlService; import geoinfo.regi.selectClassInfo.service.SelectClassService; import geoinfo.regi.status.service.RegiPageService; @@ -72,52 +73,63 @@ public class DrillingHomeController { @Autowired DrillingInquiryService drillingInquiryService; + + @Autowired + private NoticeService noticeService; @RequestMapping(value = "/drilling/index.do") - public String drillingInquiry(@RequestParam HashMap params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView drillingInquiry(@RequestParam HashMap params, HttpServletRequest request, HttpServletResponse response) throws Exception { - if(request.getSession().getAttribute("USERNAME") == null){ - return "redirect:/index.do"; + ModelAndView mav = new ModelAndView(); + + + + params.put("firstIndex", 0); + params.put("recordCountPerPage", 5); + List noticeList = noticeService.selectInfoList(params); + + if (request.getSession().getAttribute("USERNAME") == null) { + mav.setViewName("redirect:/index.do"); + return mav; } - - - String userId = MyUtil.getStringFromObject( request.getSession().getAttribute("USERID") ); - String cls = MyUtil.getStringFromObject( request.getSession().getAttribute("CLS") ); - model.addAttribute("userId", userId); - model.addAttribute("cls", cls); - + String userId = MyUtil.getStringFromObject(request.getSession().getAttribute("USERID")); + String cls = MyUtil.getStringFromObject(request.getSession().getAttribute("CLS")); + + mav.addObject("userId", userId); + mav.addObject("cls", cls); + try { - - if(request.getSession().getAttribute("USERNAME") == null){ - return "isError"; - } + if (request.getSession().getAttribute("USERNAME") == null) { + mav.setViewName("isError"); + return mav; + } - model.put("userName", String.valueOf(request.getSession().getAttribute("USERNAME"))); - model.put("cls", String.valueOf(request.getSession().getAttribute("CLS"))); - model.put("companyName", request.getSession().getAttribute("COMPANYNAME")); - + mav.addObject("userName", String.valueOf(request.getSession().getAttribute("USERNAME"))); + mav.addObject("cls", String.valueOf(request.getSession().getAttribute("CLS"))); + mav.addObject("companyName", request.getSession().getAttribute("COMPANYNAME")); - Map map = new HashMap(); - map.put("userid", String.valueOf(request.getSession().getAttribute("USERID"))); + Map map = new HashMap<>(); + map.put("userid", String.valueOf(request.getSession().getAttribute("USERID"))); + + Map result = loginService.selectWebMemberIn(map); + + mav.addObject("masterCompanyCode", result.get("master_company_code")); - Map result = loginService.selectWebMemberIn(map); - - model.put("masterCompanyCode", result.get("master_company_code")); } catch (Exception e) { - // TODO Auto-generated catch block String strTxt = "---------- BUG REPORTING START ----------" + "\n" + "에러 문구:[" + request.getRequestURI() + " " + "]" + "\n" + "params:[\n" + params.toString() + "\n]\n" + "e.getMessage():[\n" + e.getMessage() + "\n]\n" + "\n" + "new Date().toString():[" + new Date().toString() + "]\n" + "\n" + - "---------- BUG REPORTING END ----------" + "\n" + - ""; + "---------- BUG REPORTING END ----------" + "\n"; System.out.println(strTxt); } - return "/drilling/home/drilling_index"; + mav.addObject("noticeList", noticeList); + mav.setViewName("/drilling/home/drilling_index"); + return mav; } // 지도에서 발주기관 소속 시추공 표시 diff --git a/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp b/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp index 56a1a817..f60a8039 100644 --- a/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp @@ -10,6 +10,28 @@
+ + + +
+ + +
+
@@ -118,11 +140,9 @@
    -
  • 서비스 패치로 인한 중단 예정
    • -
  • 2024년 건설 시추정보 홍보 브로슈어 배포
    • -
  • 2023년 활용통계집 배포
    • -
  • 종무식 안내
    • -
  • 시스템 패치로 인한 간헐적 중단 안내
    • + +
  • ${noticeList.subject }
    • +
From feb90632dafb8df65ffed64524a9df433b6a61a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Wed, 11 Jun 2025 11:22:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EC=8B=9C=20header=EA=B0=80=20=EC=9C=A0?= =?UTF-8?q?=EC=A7=80=EB=90=98=EB=8F=84=EB=A1=9D=20src=20=EC=A0=84=EC=86=A1?= =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/drilling/home/drilling_index.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp b/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp index f60a8039..10e1e38a 100644 --- a/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp @@ -14,7 +14,7 @@ function noticeDetail(idx, src) { - var documentFrmAction = "topMenuSelect.do?url=noticeView"; + var documentFrmAction = "/topMenuSelect.do?url=noticeView"; if( src ) { documentFrmAction += "&" + "src=" + src; } @@ -141,7 +141,7 @@
From c1431c01e24a15511ece5636affc1772ab0a546d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Wed, 11 Jun 2025 16:16:27 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B1=B4=EC=84=A4=ED=98=84=EC=9E=A5=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=AA=A9=EB=A1=9D=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EB=B2=84=ED=8A=BC=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drilling/inquiry/drilling_inquiry.jsp | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp index 17de0a84..8ca6fdb2 100644 --- a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp @@ -117,22 +117,29 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe - let pagingEleHTML = ` -
    -
  • Chevron-prev
    • - `; - - for( let i = 1; i` + i + ``; - } else { - pagingEleHTML += `
  • ` + i + `
    • `; - } + let firstIndicator = (Math.floor((nPage - 1) / nCount) * nCount) + 1; // 현재 페이지의 첫번째 페이지인디케이터 번호 + let lastIndicator = Math.ceil(nPage / nCount) * 10; // 현재 페이지의 마지막 페이지인디케이터 번호 + let totalIndicator = Math.ceil(obj.count / nCount); // 총 페이지인디케이터 번호 + let pagingEleHTML = "
      " + if (!(firstIndicator-1) < 1) { + pagingEleHTML += `
    • Chevron-prev
      • + `; + } + + for( let i = firstIndicator; i` + i + ``; + } else { + pagingEleHTML += `
    • ` + i + `
      • `; + } + } } - pagingEleHTML += ` -
    • Chevron-next
      • -
    - `; + + if (lastIndicator < totalIndicator) { + pagingEleHTML += `
  • Chevron-next
    • `; + } + pagingEleHTML += "
"; pagingEle.innerHTML = pagingEleHTML;