albertshaw 8 years ago
parent
commit
bbb76c5523

+ 1 - 1
src/main/java/com/goafanti/banners/enums/BannersType.java

@@ -11,7 +11,7 @@ public enum BannersType {
 	DA_KA_SHUO_3("DA_KA_SHUO_3", "大咖说活动广告图"),
 	KE_JI_MING_XING("KE_JI_MING_XING", "科技明星广告图"),
 	KE_JI_JIANG_TANG("KE_JI_JIANG_TANG", "科技讲堂广告图"),
-	HUO_DONG_QUAN("HUO_DONG_QUAN", "科技讲堂广告图"),
+	HUO_DONG_QUAN("HUO_DONG_QUAN", "活动圈广告图"),
 	HUO_DONG_XIANG_QING("HUO_DONG_XIANG_QING", "活动详情广告图"),
 	JIAN_SHE_BING_TUAN("JIAN_SHE_BING_TUAN", "建设兵团广告图"),
 	GUO_JI_YE_WU("GUO_JI_YE_WU", "国际业务广告图"),

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

@@ -9,26 +9,16 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.view.RedirectView;
 
 import com.goafanti.achievement.service.AchievementService;
-import com.goafanti.admin.service.AdminService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Banners;
-import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.service.DemandService;
-import com.goafanti.user.service.UserService;
 
 @Controller
 public class WebpageController extends BaseController {
-	@Resource
-	private UserService			userService;
-
-	@Resource
-	private AdminService		adminService;
 
 	@Resource
 	private DemandService		demandService;
@@ -41,27 +31,32 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/account/index");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/evaluateInfo", method = RequestMethod.GET)
 	public ModelAndView evaluateInfo(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/account/evaluateInfo");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/set", method = RequestMethod.GET)
 	public ModelAndView userSet(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/account/set");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/achievement", method = RequestMethod.GET)
 	public ModelAndView userAchievement(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/account/achievement");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/account/demand", method = RequestMethod.GET)
 	public ModelAndView userDemand(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/account/demand");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/login", method = RequestMethod.GET)
@@ -82,17 +77,20 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/user/certify", method = RequestMethod.GET)
 	public ModelAndView userCertify(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/certify");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/groupCertify", method = RequestMethod.GET)
 	public ModelAndView userGroupCertify(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/groupCertify");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/index", method = RequestMethod.GET)
 	public ModelAndView userIndex(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/index");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
@@ -102,15 +100,10 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/user/account/services", method = RequestMethod.GET)
 	public ModelAndView userServices(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/account/services");
+		modelview.setViewName("/portal/search/subscriberOrg");
+		return modelview;
 	}
 
-	/*
-	 * @RequestMapping(value = "/admin/index", method = RequestMethod.GET)
-	 * public String adminIndex(HttpServletRequest request, ModelAndView
-	 * modelview) { return "/admin/index"; }
-	 */
-
 	@RequestMapping(value = "/admin/login", method = RequestMethod.GET)
 	public String adminLogin(HttpServletRequest request, ModelAndView modelview) {
 		return "/admin/login";
@@ -133,47 +126,56 @@ public class WebpageController extends BaseController {
 
 	@RequestMapping(value = "/admin/userManage", method = RequestMethod.GET)
 	public ModelAndView adminUserManage(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/userManage");
+		modelview.setViewName("/admin/userManage");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/servicesManage/technology", method = RequestMethod.GET)
 	public ModelAndView adminServicesManageTechnology(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/servicesManage/technology");
+		modelview.setViewName("/admin/servicesManage/technology");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/servicesManage/patent", method = RequestMethod.GET)
 	public ModelAndView adminServicesManagePatent(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/servicesManage/patent");
+		modelview.setViewName("/admin/servicesManage/patent");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/servicesManage/contract", method = RequestMethod.GET)
 	public ModelAndView adminServicesManageContract(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/servicesManage/contract");
+		modelview.setViewName("/admin/servicesManage/contract");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/servicesManage/highTech", method = RequestMethod.GET)
 	public ModelAndView adminServicesManageHighTech(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/servicesManage/highTech");
+		modelview.setViewName("/admin/servicesManage/highTech");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/servicesManage/highTechInfo", method = RequestMethod.GET)
 	public ModelAndView adminServicesManageHighTechInfo(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/servicesManage/highTechInfo");
+		modelview.setViewName("/admin/servicesManage/highTechInfo");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/servicesManage/copyright", method = RequestMethod.GET)
 	public ModelAndView adminServicesManageCopyright(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/servicesManage/copyright");
+		modelview.setViewName("/admin/servicesManage/copyright");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
 	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/index");
+		modelview.setViewName("/admin/index");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/admin/idea", method = RequestMethod.GET)
 	public ModelAndView adminIdea(HttpServletRequest request, ModelAndView modelview) {
-		return adminToLogin(request, modelview, "/admin/idea");
+		modelview.setViewName("/admin/idea");
+		return modelview;
 	}
 
 	@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
@@ -206,6 +208,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/activity/activityIndex", method = RequestMethod.GET)
 	public ModelAndView portalActivityActivityIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/activity/activityIndex");
+		handleBanners(modelview, BannersType.HUO_DONG_QUAN);
 		return modelview;
 	}
 
@@ -215,6 +218,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/activity/details", method = RequestMethod.GET)
 	public ModelAndView portalActivityDetails(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/activity/details");
+		handleBanners(modelview, BannersType.HUO_DONG_XIANG_QING);
 		return modelview;
 	}
 
@@ -225,6 +229,7 @@ public class WebpageController extends BaseController {
 	public ModelAndView portalEntrepreneurshipEntrepreneurshipIndex(HttpServletRequest request,
 			ModelAndView modelview) {
 		modelview.setViewName("/portal/entrepreneurship/entrepreneurshipIndex");
+		handleBanners(modelview, BannersType.CHUANG_YE_QUAN);
 		return modelview;
 	}
 
@@ -279,6 +284,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/highTech/authentication", method = RequestMethod.GET)
 	public ModelAndView portalHighTechAuthentication(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/highTech/authentication");
+		handleBanners(modelview, BannersType.GAO_QI_REN_DING);
 		return modelview;
 	}
 
@@ -288,6 +294,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/international/internationalIndex", method = RequestMethod.GET)
 	public ModelAndView portalInternationalInternationalIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/international/internationalIndex");
+		handleBanners(modelview, BannersType.GUO_JI_YE_WU);
 		return modelview;
 	}
 
@@ -297,6 +304,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/ipr/apply", method = RequestMethod.GET)
 	public ModelAndView portalIprApply(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/ipr/apply");
+		handleBanners(modelview, BannersType.ZHI_SHI_CHAN_QUAN_SHEN_QING);
 		return modelview;
 	}
 
@@ -306,6 +314,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/ipr/service", method = RequestMethod.GET)
 	public ModelAndView portalIprService(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/ipr/service");
+		handleBanners(modelview, BannersType.ZHI_SHI_CHAN_QUAN_FU_WU);
 		return modelview;
 	}
 
@@ -323,29 +332,12 @@ public class WebpageController extends BaseController {
 	}
 
 	/**
-	 * 新闻详情页(非列表页)
-	 */
-	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
-	public ModelAndView portalNews(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/news/newsDetail");
-		return modelview;
-	}
-
-	/**
-	 * 专利咨询
-	 */
-	@RequestMapping(value = "/portal/patent", method = RequestMethod.GET)
-	public ModelAndView portalPatent(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/patent");
-		return modelview;
-	}
-
-	/**
 	 * 金融圈
 	 */
 	@RequestMapping(value = "/portal/financial/financialIndex", method = RequestMethod.GET)
 	public ModelAndView portalFinancialFinancialIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/financial/financialIndex");
+		handleBanners(modelview, BannersType.JIN_RONG_QUAN);
 		return modelview;
 	}
 
@@ -355,6 +347,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/websiteBuild/websiteBuildIndex", method = RequestMethod.GET)
 	public ModelAndView portalWebsiteBuildWebsiteBuildIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/websiteBuild/websiteBuildIndex");
+		handleBanners(modelview, BannersType.JIAN_SHE_BING_TUAN);
 		return modelview;
 	}
 
@@ -364,6 +357,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/ipr/iso", method = RequestMethod.GET)
 	public ModelAndView portalIprIso(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/ipr/iso");
+		handleBanners(modelview, BannersType.ZHI_SHI_CHAN_QUAN_GUAN_BIAO);
 		return modelview;
 	}
 
@@ -373,6 +367,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/ipr/patentOperation", method = RequestMethod.GET)
 	public ModelAndView portalIprPatentOperation(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/ipr/patentOperation");
+		handleBanners(modelview, BannersType.ZHUAN_LI_YUN_YING);
 		return modelview;
 	}
 
@@ -382,6 +377,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/evaluation/index", method = RequestMethod.GET)
 	public ModelAndView evaluation(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/evaluation/index");
+		handleBanners(modelview, BannersType.JI_SHU_PING_GU);
 		return modelview;
 	}
 
@@ -391,10 +387,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
 	public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/service/serviceIndex");
-		List<Banners> banners = bannersService.findPortalBanners(BannersType.FU_WU_HUI.getKey());
-		if (!banners.isEmpty()) {
-			modelview.addObject("banners", banners);
-		}
+		handleBanners(modelview, BannersType.FU_WU_HUI);
 		return modelview;
 	}
 
@@ -404,41 +397,15 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/technologyTrading/index", method = RequestMethod.GET)
 	public ModelAndView portalTechnologyTradingIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/technologyTrading/index");
-		List<Banners> banners = bannersService.findPortalBanners(BannersType.JI_SHU_JIAO_YI.getKey());
-		if (!banners.isEmpty()) {
-			modelview.addObject("banners", banners);
-		}
+		handleBanners(modelview, BannersType.JI_SHU_JIAO_YI);
 		return modelview;
 	}
 
-	private ModelAndView userLogin(HttpServletRequest request, ModelAndView modelview, String next) {
-		String key = TokenManager.getUserId();
-		if (!TokenManager.isLogin() || key == null || key == "") {
-			RedirectView rv = new RedirectView();
-			rv.setUrl(request.getContextPath() + "/user/login");
-			rv.setExposeModelAttributes(false);
-			modelview.setView(rv);
-			return modelview;
-		}
-		User user = userService.selectByPrimaryKey(key);
-		modelview.getModel().put("user", user);
-		modelview.setViewName(next);
-		return modelview;
-	}
-
-	private ModelAndView adminToLogin(HttpServletRequest request, ModelAndView modelview, String next) {
-		String key = TokenManager.getAdminId();
-		if (!TokenManager.isLogin() || key == null || key == "") {
-			RedirectView rv = new RedirectView();
-			rv.setUrl(request.getContextPath() + "/admin/login");
-			rv.setExposeModelAttributes(false);
-			modelview.setView(rv);
-			return modelview;
+	protected void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
 		}
-		Admin admin = adminService.selectByPrimaryKey(key);
-		modelview.getModel().put("admin", admin);
-		modelview.setViewName(next);
-		return modelview;
 	}
 
 }

+ 6 - 4
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -9,15 +9,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.goafanti.common.utils.StringUtils;
+import com.goafanti.banners.enums.BannersType;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.controller.WebpageController;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
 
 @Controller
-public class NewsController extends BaseController {
+public class NewsController extends WebpageController {
 	@Resource
 	NewsService newsService;
 
@@ -39,6 +40,7 @@ public class NewsController extends BaseController {
 		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3));
 		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3));
 		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3));
+		handleBanners(modelview, BannersType.CE_YUAN_DI);
 		return modelview;
 	}
 
@@ -103,5 +105,5 @@ public class NewsController extends BaseController {
 		res.setData(newsService.findNewsDetail(id));
 		return res;
 	}
-	
+
 }

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

@@ -5,14 +5,16 @@ import java.util.List;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.goafanti.banners.enums.BannersType;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.controller.WebpageController;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.engagedFieldGlossory.service.EngagedFieldGlossoryService;
@@ -25,8 +27,8 @@ import com.goafanti.user.service.UserInterestService;
 /**
  * 大咖说
  */
-@RestController
-public class PortalBigShotController extends BaseController {
+@Controller
+public class PortalBigShotController extends WebpageController {
 	@Resource
 	private StarService					starService;
 	@Resource
@@ -64,17 +66,21 @@ public class PortalBigShotController extends BaseController {
 		List<BigShotLectureListBo> lectureList = lectureService
 				.listBigShotLecture(AFTConstants.BIG_SHOT_LECTURE_CACHE_KEY);
 		mv.addObject("lectureList", lectureList);
+		handleBanners(mv, BannersType.DA_KA_SHUO_1);
+		handleBanners(mv, BannersType.DA_KA_SHUO_2);
+		handleBanners(mv, BannersType.DA_KA_SHUO_3);
 		mv.setViewName("/portal/scienceTechnology/bigShot");
 		return mv;
 	}
-	
+
 	/**
 	 * 关注状态
 	 */
 	@RequestMapping(value = "/portal/scienceTechnology/bigShot/interestStatus", method = RequestMethod.GET)
-	public Result interestStatus(){
+	@ResponseBody
+	public Result interestStatus() {
 		Result res = new Result();
-		if (TokenManager.getToken() instanceof User){
+		if (TokenManager.getToken() instanceof User) {
 			res.setData(starService.findBigShotInterestStatus(TokenManager.getUserId()));
 		}
 		return res;

+ 9 - 5
src/main/java/com/goafanti/portal/controller/PortalLectureController.java

@@ -6,26 +6,28 @@ import java.util.List;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.goafanti.banners.enums.BannersType;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.controller.WebpageController;
 import com.goafanti.lecture.bo.LectureListBo;
 import com.goafanti.lecture.service.LectureService;
 
 /**
  * 科技讲堂
  */
-@RestController
-public class PortalLectureController extends BaseController {
+@Controller
+public class PortalLectureController extends WebpageController {
 	@Resource
 	private LectureService lectureService;
 
-	 @RequestMapping(value = "/portal/scienceTechnology/lecture", method = RequestMethod.GET)
+	@RequestMapping(value = "/portal/scienceTechnology/lecture", method = RequestMethod.GET)
 	public ModelAndView lecture() {
 		ModelAndView mv = new ModelAndView();
 		List<LectureListBo> lectureList = lectureService.findLectureList(AFTConstants.LECTURE_LIST_CACHE_KEY);
@@ -33,6 +35,7 @@ public class PortalLectureController extends BaseController {
 			Collections.reverse(lectureList);
 		}
 		mv.addObject("lectureList", lectureList);
+		handleBanners(mv, BannersType.KE_JI_JIANG_TANG);
 		mv.setViewName("/portal/scienceTechnology/lecture");
 		return mv;
 	}
@@ -41,6 +44,7 @@ public class PortalLectureController extends BaseController {
 	 * 查看更多
 	 */
 	@RequestMapping(value = "/portal/scienceTechnology/lecture/loadMore", method = RequestMethod.GET)
+	@ResponseBody
 	public Result loadMore(String pageSize, String pageNo) {
 		Result res = new Result();
 		Integer pNo = 2;

+ 8 - 4
src/main/java/com/goafanti/portal/controller/PortalStarController.java

@@ -5,14 +5,16 @@ import java.util.List;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.goafanti.banners.enums.BannersType;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.controller.WebpageController;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.engagedFieldGlossory.service.EngagedFieldGlossoryService;
@@ -25,8 +27,8 @@ import com.goafanti.user.service.UserInterestService;
 /**
  * 科技明星
  */
-@RestController
-public class PortalStarController extends BaseController {
+@Controller
+public class PortalStarController extends WebpageController {
 	@Resource
 	private StarService					starService;
 	@Resource
@@ -65,6 +67,7 @@ public class PortalStarController extends BaseController {
 			}
 			mv.addObject("starList", starList);
 		}
+		handleBanners(mv, BannersType.KE_JI_MING_XING);
 		mv.setViewName("/portal/scienceTechnology/star");
 		return mv;
 	}
@@ -73,6 +76,7 @@ public class PortalStarController extends BaseController {
 	 * 当前用户关注"科技明星"页面科技明星状态
 	 */
 	@RequestMapping(value = "/portal/scienceTechnology/star/interestStatus", method = RequestMethod.GET)
+	@ResponseBody
 	public Result interestStatus() {
 		Result res = new Result();
 		if (TokenManager.getToken() instanceof User) {