diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 6637bf81..634cf6a7 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -242,8 +242,8 @@ public class EgovLoginController { // 1. Spring Security 사용자권한 처리 if (!ipCheck) { - rttr.addFlashAttribute("message", "접근이 불가능한 아이피 입니다."); - return "redirect:/web/main/mainPage.do"; +// rttr.addFlashAttribute("message", "접근이 불가능한 아이피 입니다."); +// return "redirect:/web/main/mainPage.do"; } if (!isAuthenticated) { diff --git a/src/main/java/kcc/let/utl/sim/service/EgovClntInfo.java b/src/main/java/kcc/let/utl/sim/service/EgovClntInfo.java index 1446e5a2..33b1538c 100644 --- a/src/main/java/kcc/let/utl/sim/service/EgovClntInfo.java +++ b/src/main/java/kcc/let/utl/sim/service/EgovClntInfo.java @@ -1,5 +1,8 @@ package kcc.let.utl.sim.service; +import java.net.Inet6Address; +import java.net.InetAddress; + import javax.servlet.http.HttpServletRequest; //import kcc.com.cmm.service.EgovProperties; @@ -35,29 +38,44 @@ public class EgovClntInfo { return ipAddr; }*/ public static String getClntIP(HttpServletRequest request) throws Exception { - - // IP주소 - //String ipAddr = request.getRemoteAddr(); - - String ip = request.getHeader("X-Forwarded-For"); - - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + String ip = request.getHeader("X-Forwarded-For"); + if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("HTTP_CLIENT_IP"); } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("HTTP_X_FORWARDED_FOR"); } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } - - return ip; + + // 여러 IP가 있을 경우 첫 번째 IP 사용 + if (ip != null && ip.contains(",")) { + ip = ip.split(",")[0].trim(); + } + + // IPv6 → IPv4 변환 + try { + InetAddress inetAddress = InetAddress.getByName(ip); + if (inetAddress instanceof Inet6Address) { + if (ip.startsWith("::ffff:")) { // IPv4-mapped IPv6 + ip = ip.substring(7); + } else { + // 실제 IPv6이면 그대로 두거나 원하는 경우 공백 반환 + // ip = ""; // IPv6은 제외하고 싶을 때 + } + } + } catch (Exception e) { + // 무시 (유효하지 않은 IP일 수 있음) + } + + return ip; } /** diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java index 943184a5..b795d400 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java @@ -696,8 +696,9 @@ public class CmdTrgtController { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); + vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getTrgtNm()); vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); - vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setPhone(vEPrcsDetailVO.getPhone()); vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); String result = ""; diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index ad12b6c0..74843b23 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -1,5 +1,7 @@ package kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.web; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.List; import javax.annotation.Resource; @@ -28,6 +30,8 @@ import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.oprtn.qestnr.service.VEALettnQestnrMIXService; /** @@ -92,6 +96,9 @@ public class ScholInfoController { @Resource(name = "vEALettnQestnrMIXService") private VEALettnQestnrMIXService vEALettnQestnrMIXService; + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + /** * 학교정보 검색 팝업 리스트 */ @@ -448,71 +455,23 @@ public class ScholInfoController { */ @RequestMapping("popup/certPopList.do") public String certPopList( - @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , QustnrRespondInfoVO qustnrRespondInfoVO , ModelMap model , HttpServletRequest request ) throws Exception { - String s_action = request.getParameter("action"); //insert or select - System.out.println("s_action"); - System.out.println(s_action); - System.out.println(vEEduChasiVO.getQustnrTmplatId()); - System.out.println(vEEduChasiVO.getQestnrId()); - System.out.println(vEEduChasiVO.getQustnrRespondId()); - + vEPrcsDetailVO = vEPrcsAplctPrdService.selectCompleteDocDetail(vEPrcsDetailVO); + vEPrcsDetailVO.setTrgtNm(egovCryptoUtil.decrypt(vEPrcsDetailVO.getTrgtNm())); - System.out.println(qustnrRespondInfoVO.getQustnrTmplatId()); - System.out.println(qustnrRespondInfoVO.getQestnrId()); - System.out.println(qustnrRespondInfoVO.getQustnrRespondId()); - //차시 정보 - /* - try { - vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10); //10-청소년 강사, 20-성인강사 VE0001 - - VEEduChasiVO ChasiInfo = vEEduMIXService.selectChasiInfo(vEEduChasiVO); - ChasiInfo.setInstrNm(egovCryptoUtil.decrypt(ChasiInfo.getInstrNm())); - - ChasiInfo.setStrtTm(ChasiInfo.getStrtTm().substring(0,2)+":"+ChasiInfo.getStrtTm().substring(2,4)); - ChasiInfo.setEndTm(ChasiInfo.getEndTm().substring(0,2)+":"+ChasiInfo.getEndTm().substring(2,4)); - - model.addAttribute("chasiInfo", ChasiInfo); - - }catch(Exception ex) { - System.out.println("Exception vEEduAplctOnlnService.updateBulk"); - } -*/ - //참석 답변 정보 - try { - List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyFndtnList202312(qustnrRespondInfoVO); - //model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); - //model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); - System.out.println("chasiSrvyList.get(0).getPrcsAplctPrdOrd()"); - System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd()); - System.out.println(chasiSrvyList.get(0).getPrcsAplctPrdOrd()); - model.addAttribute("chasiSrvyList", chasiSrvyList); - model.addAttribute("chasiSrvyListCnt", chasiSrvyList.size()); - }catch(Exception ex) { - System.out.println("Exception vEEduAplctOnlnService.updateBulk"); - } + //기본정보 + model.addAttribute("completeDocDetail", vEPrcsDetailVO); - - //설문 참여 정보 - /* - try { - model = qustnrCommonUtil._qustnrQesItm( - model - , VeConstants.LCTR_DIV_CD_10 //청소년 -10, 성인-20, ...VE0012 - , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012 - , "QTMPLA_0000000000001" - , vEALettnQestnrMIXService - , egovQustnrRespondInfoService - ); - - }catch(Exception ex) { - ex.printStackTrace(); - } - */ + LocalDate today = LocalDate.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy년 M월 d일"); + String todayStr = today.format(formatter); + + model.addAttribute("todayStr", todayStr); return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/certPopList"; } diff --git a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java index d3120228..5e5de0e5 100644 --- a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java +++ b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java @@ -697,7 +697,7 @@ public class PreventController { vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getTrgtNm()); vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); - vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setPhone(vEPrcsDetailVO.getPhone()); vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); String result = ""; diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index a8eddd83..6c09f71c 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -686,8 +686,9 @@ public class SspnIdtmtController { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); + vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getTrgtNm()); vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); - vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setPhone(vEPrcsDetailVO.getPhone()); vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); String result = ""; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index 7e747dfc..2ebbf563 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.impl.VEPrcsAplctPrdDAO; public interface VEPrcsAplctPrdService { @@ -95,4 +96,8 @@ public interface VEPrcsAplctPrdService { //신청목록-실무역량강화, 기소유예 new -설문조사, 이수증 처리용 List findByAprvlQustnrAllList(VEPrcsDetailVO vEPrcsDetailVO); + + public VEPrcsDetailVO selectCompleteDocDetail(VEPrcsDetailVO vEPrcsDetailVO); + + public List selectMainContent() throws Exception ; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java index ea014590..2b8aa817 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java @@ -174,4 +174,13 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO { return (List) list("VEPrcsAplctPrdDAO.findByAprvlQustnrAllList", vEPrcsDetailVO); } + public VEPrcsDetailVO selectCompleteDocDetail(VEPrcsDetailVO vEPrcsDetailVO) { + return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectCompleteDocDetail", vEPrcsDetailVO); + } + + public List selectMainContent() throws Exception { + List tlist = (List) list("VEPrcsAplctPrdDAO.selectMainContent"); + return tlist; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index 01487922..c08152ad 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -409,5 +409,15 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { return vEPrcsAplctPrdDAO.findByAprvlQustnrAllList(vEPrcsDetailVO); } + @Override + public VEPrcsDetailVO selectCompleteDocDetail(VEPrcsDetailVO vEPrcsDetailVO) { + return vEPrcsAplctPrdDAO.selectCompleteDocDetail(vEPrcsDetailVO); + } + + @Override + public List selectMainContent() throws Exception { + return vEPrcsAplctPrdDAO.selectMainContent(); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java index 58a434cc..92cacc0e 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java @@ -2404,8 +2404,9 @@ public class CmdPrcsInfoMngController { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); + vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getTrgtNm()); vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); - vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setPhone(vEPrcsDetailVO.getPhone()); vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); String result = ""; diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index ed8f1b50..3e66a791 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -2584,8 +2584,9 @@ public class CndtnPrcsInfoMngController { vEEduAplctVO.setUserId(loginVO.getUniqId()); vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); + vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getTrgtNm()); vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); - vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setPhone(vEPrcsDetailVO.getPhone()); vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); String result = ""; diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 81be5265..5d0016c5 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -7,6 +7,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -97,6 +98,8 @@ import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.uss.notify.service.NotifyManageService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -190,6 +193,9 @@ public class MainController { @Resource(name="vEInstrService") private VEInstrService vEInstrService; + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + @Value("#{globalSettings['Globals.email.host']}") private String Globals_email_host; @Value("#{globalSettings['Globals.email.port']}") @@ -386,93 +392,28 @@ public class MainController { public String siteMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{ //메인이미지 try { - String referer = (String)request.getHeader("REFERER"); - - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userAuthority = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getAuthority()); - model.addAttribute("userAuthority", userAuthority); //권한 - 강사일 시 메인의 청소년, 성인, 체험교실, 콘텐츠 메뉴 링크이동 막기 위해 추가 - - /** EgovPropertyService.sample */ - MainzoneVO mainzoneVO = new MainzoneVO(); - mainzoneVO.setPageUnit(propertiesService.getInt("pageUnit")); - mainzoneVO.setPageSize(propertiesService.getInt("pageSize")); - - /** pageing */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(mainzoneVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(mainzoneVO.getPageUnit()); - paginationInfo.setPageSize(mainzoneVO.getPageSize()); - - mainzoneVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - mainzoneVO.setLastIndex(paginationInfo.getLastRecordIndex()); - mainzoneVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - mainzoneVO.setUseYn("Y"); //사용하는것만 - mainzoneVO.setDeviceType("P"); //PC - - //디자인이 슬라이드가 아닌 한개의 메인화면으로 변경되어 수정 - mainzoneVO.setRecordCountPerPage(1); - List mainzoneList = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지 -// mainzoneVO.setDeviceType("M"); //모바일 -// List mainzoneListM = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지 - - model.addAttribute("mainzoneList", mainzoneList); //PC -// model.addAttribute("mainzoneListM", mainzoneListM); //모바일 - + /** 메인존 */ + model.addAttribute("mainzoneList", mainZone()); //PC /** 팝업 알림창괸리 */ - //if(!isMobile(request)){ //PC인경우만 - PopupManageVO popupManageVO = new PopupManageVO(); - popupManageVO.setRecordCountPerPage(10); //10개만 - popupManageVO.setNtceAt("Y"); //사용만 - popupManageVO.setMainPageFlag("Y") ; //메인화면의 용도(시작일 종료일 사이 조회) - List popupList = egovPopupManageService.selectPopupMainList(popupManageVO); - model.addAttribute("popupList", popupList); - //} + model.addAttribute("popupList", popupList()); /** 팝업존 알림창괸리 */ - //if(!isMobile(request)){ - PopupzoneVO popupzoneVo = new PopupzoneVO(); - popupzoneVo.setFirstIndex(0); - popupzoneVo.setSeCd("02"); //좌측팝업 - popupzoneVo.setUseYn("Y"); - - List popupzoneList = egovPopupManageService.selectPopupzoneList(popupzoneVo); - model.addAttribute("popupzoneList", popupzoneList); - //popupzoneVo.setSeCd("03"); - //List popupzoneTopList = egovPopupManageService.selectPopupzoneList(popupzoneVo); - //model.addAttribute("popupzoneTopList", popupzoneTopList); - - //} + model.addAttribute("popupzoneList", popupzoneList()); /** 게시판 조회 - 공지사항 */ - BoardVO boardVO = new BoardVO(); - boardVO.setRecordCountPerPage(5); //게시글 수 - boardVO.setFirstIndex(0); // - boardVO.setBbsId("BBSMSTR_000000000010"); - List vo = bbsMngService.selectMainBoardRecent(boardVO); - //게시글 내용 html 태그 삭제 - for(int i=0; i]*)?(\\s)*(/)?>", "").split("<")[0]); - } - - model.addAttribute("bbsList", vo); + Map noticeBbsList = noticeBbsList(); + model.addAttribute("noticeBbsList", noticeBbsList.get("noticeBbsList")); + model.addAttribute("noticeBbsUrl", noticeBbsList.get("noticeBbsUrl")); /** 게시판 조회 - 교육자료실 */ - BoardVO boardVO_2 = new BoardVO(); - boardVO_2.setRecordCountPerPage(5); //게시글 수 - boardVO_2.setFirstIndex(0); // - boardVO_2.setBbsId("BBSMSTR_000000000000"); - List vo_2 = bbsMngService.selectMainBoardRecent(boardVO_2); - //게시글 내용 html 태그 삭제 - for(int i=0; i]*)?(\\s)*(/)?>", "").split("<")[0]); - } + Map atchBbsList = atchBbsList(); + model.addAttribute("atchBbsList", atchBbsList.get("atchBbsList")); + model.addAttribute("atchBbsUrl", atchBbsList.get("atchBbsUrl")); - model.addAttribute("bbsList_2", vo_2); + /** 주요 교육일정 */ + List eduAplctList = eduAplctList(); - System.out.println("zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"); - System.out.println("zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"); - }catch(Exception ex) { ex.printStackTrace(); System.out.println(ex.getMessage()); @@ -2078,5 +2019,120 @@ public class MainController { //mbp.setContent(html.replaceAll("(\r\n|\n)", "
"), "text/html; charset=utf-8"); //줄바꿈이 필요해서 return mbp; } + + private List mainZone() throws Exception{ + /** EgovPropertyService.sample */ + MainzoneVO mainzoneVO = new MainzoneVO(); + mainzoneVO.setPageUnit(propertiesService.getInt("pageUnit")); + mainzoneVO.setPageSize(propertiesService.getInt("pageSize")); + + /** pageing */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(mainzoneVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(mainzoneVO.getPageUnit()); + paginationInfo.setPageSize(mainzoneVO.getPageSize()); + + mainzoneVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + mainzoneVO.setLastIndex(paginationInfo.getLastRecordIndex()); + mainzoneVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + mainzoneVO.setUseYn("Y"); //사용하는것만 + mainzoneVO.setDeviceType("P"); //PC + + //디자인이 슬라이드가 아닌 한개의 메인화면으로 변경되어 수정 + mainzoneVO.setRecordCountPerPage(1); + List mainzoneList = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지 + + return mainzoneList; + } + + private List popupList() throws Exception{ + PopupManageVO popupManageVO = new PopupManageVO(); + popupManageVO.setRecordCountPerPage(10); //10개만 + popupManageVO.setNtceAt("Y"); //사용만 + popupManageVO.setMainPageFlag("Y") ; //메인화면의 용도(시작일 종료일 사이 조회) + List popupList = egovPopupManageService.selectPopupMainList(popupManageVO); + + return popupList; + } + + private List popupzoneList() throws Exception{ + PopupzoneVO popupzoneVo = new PopupzoneVO(); + popupzoneVo.setFirstIndex(0); + popupzoneVo.setSeCd("02"); //좌측팝업 + popupzoneVo.setUseYn("Y"); + + List popupzoneList = egovPopupManageService.selectPopupzoneList(popupzoneVo); + + return popupzoneList; + } + + private Map noticeBbsList() throws Exception{ + Map returnMap = new HashMap(); + BoardVO boardVO = new BoardVO(); + boardVO.setRecordCountPerPage(5); //게시글 수 + boardVO.setFirstIndex(0); // + boardVO.setBbsId("BBSMSTR_000000000010"); + List vo = bbsMngService.selectMainBoardRecent(boardVO); + //게시글 내용 html 태그 삭제 + for(int i=0; i]*)?(\\s)*(/)?>", "").split("<")[0]); + } + + returnMap.put("noticeBbsList", vo); + returnMap.put("noticeBbsUrl", boardVO.getBbsId()); + + return returnMap; + } + + private Map atchBbsList() throws Exception{ + Map returnMap = new HashMap(); + BoardVO boardVO_2 = new BoardVO(); + boardVO_2.setRecordCountPerPage(5); //게시글 수 + boardVO_2.setFirstIndex(0); // + boardVO_2.setBbsId("BBSMSTR_000000000040"); + List vo_2 = bbsMngService.selectMainBoardRecent(boardVO_2); + //게시글 내용 html 태그 삭제 + for(int i=0; i]*)?(\\s)*(/)?>", "").split("<")[0]); + } + + returnMap.put("atchBbsList", vo_2); + returnMap.put("atchBbsUrl", boardVO_2.getBbsId()); + + return returnMap; + } + + private List eduAplctList() throws Exception{ + + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + + //1.pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(1); + paginationInfo.setRecordCountPerPage(12); + paginationInfo.setPageSize(12); + //로그인 처리==================================== + + //1.pageing step1 + + //임시로 페이징 처리를 안하기 위해서 RecordCountPerPage 수를 10000 으로 셋팅함 + //paginationInfo.setRecordCountPerPage(10000); + + //2. pageing step2 + vEPrcsDetailVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + vEPrcsDetailVO.setLastIndex(paginationInfo.getLastRecordIndex()); + vEPrcsDetailVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + vEPrcsDetailVO.setSearchSortCnd("prcs_ord"); + vEPrcsDetailVO.setSearchSortOrd("desc"); + + //기반강화 조회 +// vEPrcsDetailVO.setLctrDivCd(p_lctr_div_cd); + + vEPrcsDetailVO.setUseYn("Y"); //공개 여부만 조회 + + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectMainContent(); + + return vEPrcsDetailVOList; + } } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index d057e011..8661d8d7 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -1966,4 +1966,178 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp index 8a0ba28c..6d040e46 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -809,7 +809,8 @@ ${status.count} -
() + <%--
() --%> +
() <%--
() --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp index d8bdb180..81098dd8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp @@ -24,12 +24,6 @@ //$(".btnSearch").keyup(function(e){if(e.keyCode == 13) linkPage('1');}); }); - function fn_egov_addNotice(){ - document.frm.method = "post"; - document.frm.action = ""; - document.frm.submit(); - } - function linkPage(pageNo) { if (pageNo != 1) { document.frm.searchWrd.value = ""; @@ -52,13 +46,6 @@ document.frm.submit(); } - function fn_egov_pdfView(atchFileId, fileSn){ - window.open("/cmm/fms/pdfView.do?atchFileId=" + atchFileId + "&fileSn=" + fileSn); - } - - function fn_egov_downFile(atchFileId, fileSn){ - window.open("/cmm/fms/FileDown.do?atchFileId=" + atchFileId + "&fileSn=" + fileSn); - } @@ -228,14 +215,6 @@ -
-
-
-
- -
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 017d1127..330bc748 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -75,15 +75,7 @@ function fn_egov_inqire_notice(bbsId, nttId) { document.frm.nttId.value = nttId; document.frm.bbsId.value = bbsId; document.frm.method = "post"; - document.frm.action = "?pubDetail=Y"; - document.frm.submit(); -} - -function fn_egov_inqire_data(bbsId, nttId) { - document.frm.nttId.value = nttId; - document.frm.bbsId.value = bbsId; - document.frm.method = "get"; - document.frm.action = ""; + document.frm.action = ""; document.frm.submit(); } @@ -346,14 +338,14 @@ function fn_egov_inqire_data(bbsId, nttId) {