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 4107d68b..8e224fb7 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 @@ -10,6 +10,7 @@ import java.util.stream.IntStream; import javax.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; @@ -386,13 +387,14 @@ public class EgovPopupManageServiceImpl extends EgovAbstractServiceImpl implemen public void insertMainPopup(MainPopupVO mainPopupVO) { dao.insertMainPopup(mainPopupVO); - List mainPopupLinkListVO = getMainPopupLinkList(mainPopupVO); - - mainPopupLinkListVO.stream().forEach(t-> System.out.println(t.toString())); - - - dao.insertMainPopupLinkInfo(mainPopupLinkListVO); + + if(CollectionUtils.isNotEmpty(mainPopupVO.getMainPopupLinkList())) { + + List mainPopupLinkListVO = getMainPopupLinkList(mainPopupVO); +// mainPopupLinkListVO.stream().forEach(t-> System.out.println(t.toString())); + dao.insertMainPopupLinkInfo(mainPopupLinkListVO); + } } @Override @@ -400,11 +402,15 @@ public class EgovPopupManageServiceImpl extends EgovAbstractServiceImpl implemen dao.updateMainPopup(mainPopupVO); - List mainPopupLinkListVO = getMainPopupLinkList(mainPopupVO); - dao.deleteMainPopupLinkInfo(mainPopupVO.getPopId()); + if(CollectionUtils.isNotEmpty(mainPopupVO.getMainPopupLinkList())) { - dao.insertMainPopupLinkInfo(mainPopupLinkListVO); + List mainPopupLinkListVO = getMainPopupLinkList(mainPopupVO); + + dao.deleteMainPopupLinkInfo(mainPopupVO.getPopId()); + + dao.insertMainPopupLinkInfo(mainPopupLinkListVO); + } } diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index 4f010818..cfaf8028 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -78,6 +78,8 @@ import itn.com.cmm.service.EgovFileMngUtil; import itn.com.cmm.service.FileVO; import itn.com.cmm.util.StringUtil; import itn.com.cmm.util.WebUtil; +import itn.com.uss.ion.bnr.pop.service.MainPopupManageService; +import itn.com.uss.ion.bnr.pop.service.MainPopupVO; import itn.com.uss.ion.bnr.service.BannerVO; import itn.com.uss.ion.bnr.service.EgovBannerService; import itn.com.uss.ion.bnr.sub.service.SubMainZoneManageService; @@ -264,10 +266,13 @@ public class MainController { @Resource(name = "mjonCandidateService") private MjonCandidateService mjonCandidateService; - /** EgovPopupManageService */ @Resource(name = "subMainZoneManageService") private SubMainZoneManageService subMainZoneManageService; + /** 메인팝업 service */ + @Resource(name = "mainPopupManageService") + private MainPopupManageService mainPopupManageService; + @Value("#{globalSettings['Globals.email.host']}") private String Globals_email_host; @@ -701,6 +706,15 @@ public class MainController { } + + {//팝업 롤링 이미지 불러오기 + + List resultMainPopupList = mainPopupManageService.selectMainPopupListRolling(); + model.addAttribute("mainPopupList", resultMainPopupList); + System.out.println("===================mainPopupList"); + + } + return "web/main/mainPage"; } 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 a3178cab..8ea353ef 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -13,116 +13,18 @@