diff --git a/src/main/java/itn/com/uss/ion/pwm/service/EgovPopupManageService.java b/src/main/java/itn/com/uss/ion/pwm/service/EgovPopupManageService.java index 8060e8d8..6e3eabdb 100644 --- a/src/main/java/itn/com/uss/ion/pwm/service/EgovPopupManageService.java +++ b/src/main/java/itn/com/uss/ion/pwm/service/EgovPopupManageService.java @@ -157,5 +157,8 @@ public interface EgovPopupManageService { public void insertSocial(SocialVO socialVO) throws Exception; public void deleteSocial(String id) throws Exception; + + //사용자 메인화면 롤링 배너 이미지 조회 + public List selectMainzoneListRolling() throws Exception; } \ No newline at end of file diff --git a/src/main/java/itn/com/uss/ion/pwm/service/MainzoneVO.java b/src/main/java/itn/com/uss/ion/pwm/service/MainzoneVO.java index b5004ed9..1afdcb34 100644 --- a/src/main/java/itn/com/uss/ion/pwm/service/MainzoneVO.java +++ b/src/main/java/itn/com/uss/ion/pwm/service/MainzoneVO.java @@ -87,7 +87,14 @@ public class MainzoneVO extends ComDefaultVO implements Serializable { private String deviceType = ""; + private String ntceBgnde = ""; + private String ntceEndde = ""; + private String ntceBgndeHH = ""; + private String ntceBgndeMM = ""; + + private String ntceEnddeHH = ""; + private String ntceEnddeMM = ""; public int getSeq() { return seq; @@ -225,5 +232,53 @@ public class MainzoneVO extends ComDefaultVO implements Serializable { this.deviceType = deviceType; } + public String getNtceBgnde() { + return ntceBgnde; + } + + public void setNtceBgnde(String ntceBgnde) { + this.ntceBgnde = ntceBgnde; + } + + public String getNtceEndde() { + return ntceEndde; + } + + public void setNtceEndde(String ntceEndde) { + this.ntceEndde = ntceEndde; + } + + public String getNtceBgndeHH() { + return ntceBgndeHH; + } + + public void setNtceBgndeHH(String ntceBgndeHH) { + this.ntceBgndeHH = ntceBgndeHH; + } + + public String getNtceBgndeMM() { + return ntceBgndeMM; + } + + public void setNtceBgndeMM(String ntceBgndeMM) { + this.ntceBgndeMM = ntceBgndeMM; + } + + public String getNtceEnddeHH() { + return ntceEnddeHH; + } + + public void setNtceEnddeHH(String ntceEnddeHH) { + this.ntceEnddeHH = ntceEnddeHH; + } + + public String getNtceEnddeMM() { + return ntceEnddeMM; + } + + public void setNtceEnddeMM(String ntceEnddeMM) { + this.ntceEnddeMM = ntceEnddeMM; + } + } diff --git a/src/main/java/itn/com/uss/ion/pwm/service/impl/EgovPopupManageServiceImpl.java b/src/main/java/itn/com/uss/ion/pwm/service/impl/EgovPopupManageServiceImpl.java index b4c89828..49edb2fc 100644 --- a/src/main/java/itn/com/uss/ion/pwm/service/impl/EgovPopupManageServiceImpl.java +++ b/src/main/java/itn/com/uss/ion/pwm/service/impl/EgovPopupManageServiceImpl.java @@ -294,7 +294,16 @@ public class EgovPopupManageServiceImpl extends EgovAbstractServiceImpl implemen public void updateMainzone(MainzoneVO mainzoneVO) throws Exception { dao.updateMainzone(mainzoneVO); } + + //사용자 메인화면 롤링 배너 이미지 조회 + @Override + public List selectMainzoneListRolling() throws Exception{ + + return dao.selectMainzoneListRolling(); + + } + @Override public int selectPopupzoneListTotCnt(PopupzoneVO popupzoneVo) throws Exception { return dao.selectPopupzoneListTotCnt(popupzoneVo); diff --git a/src/main/java/itn/com/uss/ion/pwm/service/impl/PopupManageDAO.java b/src/main/java/itn/com/uss/ion/pwm/service/impl/PopupManageDAO.java index 5919d63f..6b5e31a6 100644 --- a/src/main/java/itn/com/uss/ion/pwm/service/impl/PopupManageDAO.java +++ b/src/main/java/itn/com/uss/ion/pwm/service/impl/PopupManageDAO.java @@ -222,6 +222,11 @@ public class PopupManageDAO extends EgovComAbstractDAO { public void updateMainzone(MainzoneVO mainzoneVO) throws Exception{ update("MainzoneManage.updateMainzone", mainzoneVO); } + + @SuppressWarnings("unchecked") + public List selectMainzoneListRolling() throws Exception{ + return (List) list("MainzoneManage.selectMainzoneListRolling"); + } public int selectPopupzoneListTotCnt(PopupzoneVO popupzoneVo) throws Exception { return (int)select("PopupzoneManage.selectPopupzoneListTotCnt", popupzoneVo); diff --git a/src/main/java/itn/com/uss/ion/pwm/web/EgovPopupManageController.java b/src/main/java/itn/com/uss/ion/pwm/web/EgovPopupManageController.java index 0b8e86fb..872ddf51 100644 --- a/src/main/java/itn/com/uss/ion/pwm/web/EgovPopupManageController.java +++ b/src/main/java/itn/com/uss/ion/pwm/web/EgovPopupManageController.java @@ -849,7 +849,30 @@ public class EgovPopupManageController { if("Modify".equals((String)commandMap.get("pageType"))){ //수정 String mazId = (String)commandMap.get("selectedId"); mainzoneVO = egovPopupManageService.selectMainzoneVO(mazId); - if(mainzoneVO != null){ + String sNtceBgnde = mainzoneVO.getNtceBgnde(); + String sNtceEndde = mainzoneVO.getNtceEndde(); + + if(sNtceBgnde != null && sNtceEndde != null ) { + + mainzoneVO.setNtceBgndeHH(sNtceBgnde.substring(8, 10)); + mainzoneVO.setNtceBgndeMM(sNtceBgnde.substring(10, 12)); + + mainzoneVO.setNtceEnddeHH(sNtceEndde.substring(8, 10)); + mainzoneVO.setNtceEnddeMM(sNtceEndde.substring(10, 12)); + + //게시기간 시작일자(시) + model.addAttribute("ntceBgndeHH", getTimeHH()); + //게시기간 시작일자(분) + model.addAttribute("ntceBgndeMM", getTimeMM()); + //게시기간 종료일자(시) + model.addAttribute("ntceEnddeHH", getTimeHH()); + //게시기간 종료일자(분) + model.addAttribute("ntceEnddeMM", getTimeMM()); + + + } + + if(mainzoneVO != null){ mainzoneVO.setBeSort(mainzoneVO.getSort()); FileVO fileVO = new FileVO(); @@ -860,6 +883,15 @@ public class EgovPopupManageController { } }else{ //등록 + //게시기간 시작일자(시) + model.addAttribute("ntceBgndeHH", getTimeHH()); + //게시기간 시작일자(분) + model.addAttribute("ntceBgndeMM", getTimeMM()); + //게시기간 종료일자(시) + model.addAttribute("ntceEnddeHH", getTimeHH()); + //게시기간 종료일자(분) + model.addAttribute("ntceEnddeMM", getTimeMM()); + } //model.addAttribute("sortList", sortList); @@ -870,6 +902,7 @@ public class EgovPopupManageController { vo.setCodeId("COM037"); //List targetList = cmmUseService.selectCmmCodeDetail(vo); //model.addAttribute("targetList", targetList); + return "uss/ion/pwm/MainZoneModify"; } diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index 8e8d5dc2..cc45838a 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -258,6 +258,7 @@ public class MainController { @Resource(name = "mberManageService") private EgovMberManageService mberManageService; + @Value("#{globalSettings['Globals.email.host']}") private String Globals_email_host; @Value("#{globalSettings['Globals.email.port']}") @@ -679,6 +680,276 @@ public class MainController { return "web/main/mainPage"; } + + //================================================================================================================== + + + @RequestMapping(value = "/web/main/mainPageTest.do") + public String siteMainPageTest(HttpServletRequest request, ModelMap model, HttpSession session, + @RequestParam(value="message", defaultValue="0") String message, LetterVO letterVO) throws Exception{ + //메인이미지 + String referer = (String)request.getHeader("REFERER"); + + //로그인 실패시 메세지 + if(!"0".equals(message)) { + model.addAttribute("messageflag", "1"); + model.addAttribute("message", message); + } + +/* *//** 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 + List mainzoneList = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지 + mainzoneVO.setDeviceType("M"); //모바일 + List mainzoneListM = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지 + + model.addAttribute("mainzoneList", mainzoneList); //PC + model.addAttribute("mainzoneListM", mainzoneListM); //모바일 + + *//** 팝업존 알림창괸리 *//* + 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); + + } + + 하단 배너 + BannerVO bannerVO = new BannerVO(); + bannerVO.setRecordCountPerPage(50); //50개까지 + bannerVO.setFirstIndex(0); + bannerVO.setSeCd("01"); + bannerVO.setReflctAt("Y"); + bannerVO.setSearchSortCnd("SORTORDR"); + bannerVO.setSearchSortOrd("asc"); + ArrayList bannerVOList= (ArrayList) egovBannerService.selectBannerList(bannerVO) ;//배너6개 안되면 좌측 버튼이 안보임 + bannerVO.setBannerList(bannerVOList); + model.addAttribute("bannerList", bannerVO.getBannerList()) ; + + 소셜 허브 하단 배너 + bannerVO.setSeCd("02"); + ArrayList bannerVOSocList= (ArrayList) egovBannerService.selectBannerList(bannerVO) ;//배너6개 안되면 좌측 버튼이 안보임 + bannerVO.setBannerList(bannerVOSocList); + model.addAttribute("bannerVOSocList", bannerVO.getBannerList()) ; + + //대표이미지 가져오기 + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + vo.setCodeId("ITN005"); */ + + //kisa 사용자 경고 팝업 + LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + if(EgovUserDetailsHelper.isAuthenticated() && user!=null) { + KisaVO kisaVO = new KisaVO(); + kisaVO.setMberId(user.getId()); + kisaVO.setKisaPopupYn("Y"); + List kisaList = kisaService.selectKisaListMberId(kisaVO); + if(kisaList.size() > 0) { + //kisa 코드 조회 + ComDefaultCodeVO kisacodeVO = new ComDefaultCodeVO(); + kisacodeVO.setCodeId("ITN034"); + List kisacodeResult = cmmUseService.selectCmmCodeDetail(kisacodeVO); + model.addAttribute("kisacodeResult", kisacodeResult); + + //위반 사항 안내 종합 (아이디별 kisalist의 각각 kisaWarnMessage를 한번에 보여주기 위해) + String[] chk = {}; + ArrayList kisaWarnMessagelist = new ArrayList(); + for(KisaVO tmpVO : kisaList) { + if(!"".equals(tmpVO.getKisaWarnMessage()) && tmpVO.getKisaWarnMessage() != null) { + chk = tmpVO.getKisaWarnMessage().split(","); + for(int i = 0 ; i < chk.length ; i++) { + if(!kisaWarnMessagelist.contains(chk[i])) { + kisaWarnMessagelist.add(chk[i]); + } + } + } + } + model.addAttribute("chk", kisaWarnMessagelist); + model.addAttribute("kisaListSize", kisaList.size()); + model.addAttribute("kisaList", kisaList); + } + } + + //공지사항 게시글 불러오기 + BoardMasterVO boardMasterVO = new BoardMasterVO(); + //공지사항 url로 전체게시글 불러오기 + boardMasterVO.setUrl("/web/cop/bbs/NoticeList.do"); + BoardMasterVO bmVO = new BoardMasterVO(); + + BoardVO boardVO = new BoardVO(); + boardVO.setPageUnit(7); + boardVO.setPageSize(10); + + if("".equals(boardMasterVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + boardMasterVO.setSearchSortCnd("nttId"); + boardMasterVO.setSearchSortOrd("desc"); + } + //전체 게시글 불러오기 + Map map = new HashMap(); + + if(boardMasterVO.getPageUnit() != 10) { + bmVO.setPageUnit(boardMasterVO.getPageUnit()); + } + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(bmVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(bmVO.getPageUnit()); + paginationInfo.setPageSize(bmVO.getPageSize()); + + paginationInfo.setCurrentPageNo(boardVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(boardVO.getPageUnit()); + paginationInfo.setPageSize(boardVO.getPageSize()); + + boardMasterVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + boardMasterVO.setLastIndex(paginationInfo.getLastRecordIndex()); + boardMasterVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + String temp = boardMasterVO.getUrl(); //Url 패턴에 Ajax 구문 삭제처리 + boardMasterVO.setUrl(temp.replace("Ajax", "")); + + Map noticeMap = bbsMngService.selectBoardArticlesWebUrl(boardMasterVO, null); + + if(!noticeMap.get("resultCnt").equals("0")){ + @SuppressWarnings("unchecked") + ArrayList boardList= (ArrayList)noticeMap.get("resultList") ; //nttcn 태그 삭제 처리 + for( BoardVO tempBoardVO : boardList){ + if("".equals(tempBoardVO.getNttCn().replaceAll("<(/)?([a-zA-Z]*)(\\s[a-zA-Z]*=[^>]*)?(\\s)*(/)?>", "").split("<")[0].equals(""))){ + tempBoardVO.setNttCn ( tempBoardVO.getNttCn().replaceAll("<(/)?([a-zA-Z]*)(\\s[a-zA-Z]*=[^>]*)?(\\s)*(/)?>", "")) ; + }else { + tempBoardVO.setNttCn( tempBoardVO.getNttCn().replaceAll("<(/)?([a-zA-Z]*)(\\s[a-zA-Z]*=[^>]*)?(\\s)*(/)?>", "").split("<")[0] ) ; + } + } + model.addAttribute("noticeList", noticeMap.get("resultList")); + } + + // 문자 카테고리 리스트 불러오기 + List cateConfList = letterService.selectCateConfWithList("N"); + model.addAttribute("cateCodeList", cateConfList); + + // 맞춤문자 카테고리 리스트 불러오기 + List cateConfCustomList = letterService.selectCateConfWithList("C"); + model.addAttribute("cateConfCustomList", cateConfCustomList); + + /* + // 문자 카테고리 리스트 불러오기 & // 맞춤문자 카테고리 리스트 불러오기 + { + //merge list data + List cateConfListMerge = letterService.selectCateConfWithList4Main("N"); + + // 문자 카테고리 리스트 불러오기 + List cateConfList = new ArrayList(); + //model.addAttribute("cateCodeList", cateConfList); + + // 맞춤문자 카테고리 리스트 불러오기 + List cateConfCustomList = new ArrayList(); + //model.addAttribute("cateConfCustomList", cateConfCustomList); + + for (int i=0;i mainMsgTagList = letterService.selectMainMsgTagWebList(letterMsgVO); + model.addAttribute("mainMsgTagList", mainMsgTagList); + + + {//상단 메인배너 롤링 이미지 불러오기 + + List resultMainzoneList = egovPopupManageService.selectMainzoneListRolling(); + model.addAttribute("mainzoneList", resultMainzoneList); + + } + + return "web/main/mainPageTest"; + } + + + + + + //==================================================================================================================== + + + + + /** * KISA 수정 Ajax * @param kisaVO diff --git a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml index f1105542..a2e2054f 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml @@ -520,7 +520,9 @@ MAZ_NM, USE_YN, (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_ID , - DEVICETYPE + DEVICETYPE, + STR_TO_DATE(NTCE_BGNDE,'%Y%m%d') AS ntceBgnde, + STR_TO_DATE(NTCE_ENDDE,'%Y%m%d') AS ntceEndde FROM MAINZONE MB WHERE 1=1 ]]> @@ -577,9 +579,11 @@ DEVICETYPE, - REGISTER_ID + REGISTER_ID, + NTCE_BGNDE, + NTCE_ENDDE ) VALUES ( - #mazId#, + #mazId#, #upfile#, #content#, #mlink#, @@ -595,7 +599,9 @@ #deviceType#, - #registerId# + #registerId#, + #ntceBgnde#, + #ntceEndde# ) @@ -633,7 +639,9 @@ USE_YN AS USEYN, DATE_FORMAT(MODDT, '%Y-%m-%d %T') MODDT , (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTERID, - DEVICETYPE AS deviceType + DEVICETYPE AS deviceType, + NTCE_BGNDE AS ntceBgnde, + NTCE_ENDDE AS ntceEndde FROM MAINZONE WHERE MAZ_ID=#mazId# @@ -676,6 +684,8 @@ DEVICETYPE = #deviceType# , + NTCE_BGNDE = #ntceBgnde#, + NTCE_ENDDE = #ntceEndde#, MODDT = now() WHERE MAZ_ID=#mazId# @@ -898,4 +908,25 @@ DELETE FROM SOCIAL_HUB WHERE SOCIAL_ID=#socialId# + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pwm/MainZoneModify.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pwm/MainZoneModify.jsp index 85bb63a9..939951cb 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pwm/MainZoneModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pwm/MainZoneModify.jsp @@ -33,6 +33,7 @@ 팝업창관리 관리 +