diff --git a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java index 34fc9ebb..56b910d8 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 bbb711ff..a37a1c70 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 @@ -17,6 +17,28 @@
+ + + +
+ + +
+
@@ -124,11 +146,9 @@
    -
  • 서비스 패치로 인한 중단 예정
  • -
  • 2024년 건설 시추정보 홍보 브로슈어 배포
  • -
  • 2023년 활용통계집 배포
  • -
  • 종무식 안내
  • -
  • 시스템 패치로 인한 간헐적 중단 안내
  • + +
  • ${noticeList.subject }
  • +
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;