Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Antiloveg 8 years ago
parent
commit
8f15407284

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -401,7 +401,7 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	protected void handleBanners(ModelAndView modelview, BannersType bannersType) {
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banners", banners);

+ 15 - 3
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -1,5 +1,7 @@
 package com.goafanti.news.controller;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
@@ -10,18 +12,21 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.banners.enums.BannersType;
+import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.WebpageController;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Banners;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
 
 @Controller
-public class NewsController extends WebpageController {
+public class NewsController extends BaseController {
 	@Resource
 	NewsService newsService;
-
+	@Resource
+	private BannersService		bannersService;
 	/**
 	 * 策源地
 	 * 
@@ -105,5 +110,12 @@ public class NewsController extends WebpageController {
 		res.setData(newsService.findNewsDetail(id));
 		return res;
 	}
+	
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
+		}
+	}
 
 }

+ 13 - 2
src/main/java/com/goafanti/portal/controller/PortalBigShotController.java

@@ -12,9 +12,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.banners.enums.BannersType;
+import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.WebpageController;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Banners;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.engagedFieldGlossory.service.EngagedFieldGlossoryService;
@@ -28,7 +30,7 @@ import com.goafanti.user.service.UserInterestService;
  * 大咖说
  */
 @Controller
-public class PortalBigShotController extends WebpageController {
+public class PortalBigShotController extends BaseController {
 	@Resource
 	private StarService					starService;
 	@Resource
@@ -37,6 +39,8 @@ public class PortalBigShotController extends WebpageController {
 	private LectureService				lectureService;
 	@Resource
 	private EngagedFieldGlossoryService	engagedFieldGlossoryService;
+	@Resource
+	private BannersService				bannersService;
 
 	@RequestMapping(value = "/portal/scienceTechnology/bigShot", method = RequestMethod.GET)
 	public ModelAndView bigShot() {
@@ -86,4 +90,11 @@ public class PortalBigShotController extends WebpageController {
 		return res;
 	}
 
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
+		}
+	}
+
 }

+ 14 - 3
src/main/java/com/goafanti/portal/controller/PortalLectureController.java

@@ -13,9 +13,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.banners.enums.BannersType;
+import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.WebpageController;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Banners;
 import com.goafanti.lecture.bo.LectureListBo;
 import com.goafanti.lecture.service.LectureService;
 
@@ -23,10 +25,12 @@ import com.goafanti.lecture.service.LectureService;
  * 科技讲堂
  */
 @Controller
-public class PortalLectureController extends WebpageController {
+public class PortalLectureController extends BaseController {
 	@Resource
 	private LectureService lectureService;
-
+	@Resource
+	private BannersService		bannersService;
+	
 	@RequestMapping(value = "/portal/scienceTechnology/lecture", method = RequestMethod.GET)
 	public ModelAndView lecture() {
 		ModelAndView mv = new ModelAndView();
@@ -58,5 +62,12 @@ public class PortalLectureController extends WebpageController {
 		res.setData(lectureService.loadMore(pSize, pNo));
 		return res;
 	}
+	
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
+		}
+	}
 
 }

+ 13 - 2
src/main/java/com/goafanti/portal/controller/PortalStarController.java

@@ -12,9 +12,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.banners.enums.BannersType;
+import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.WebpageController;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Banners;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.engagedFieldGlossory.service.EngagedFieldGlossoryService;
@@ -28,7 +30,7 @@ import com.goafanti.user.service.UserInterestService;
  * 科技明星
  */
 @Controller
-public class PortalStarController extends WebpageController {
+public class PortalStarController extends BaseController {
 	@Resource
 	private StarService					starService;
 	@Resource
@@ -37,6 +39,8 @@ public class PortalStarController extends WebpageController {
 	private UserInterestService			userInterestService;
 	@Resource
 	private EngagedFieldGlossoryService	engagedFieldGlossoryService;
+	@Resource
+	private BannersService				bannersService;
 
 	@RequestMapping(value = "/portal/scienceTechnology/star", method = RequestMethod.GET)
 	public ModelAndView star() {
@@ -84,4 +88,11 @@ public class PortalStarController extends WebpageController {
 		}
 		return res;
 	}
+
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
+		}
+	}
 }