Browse Source

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

wubb 8 years ago
parent
commit
af7f4ea8ef
21 changed files with 271 additions and 171 deletions
  1. 2 4
      src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java
  2. 1 1
      src/main/java/com/goafanti/banners/enums/BannersType.java
  3. 54 110
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 6 1
      src/main/java/com/goafanti/common/dao/StarMapper.java
  5. 23 0
      src/main/java/com/goafanti/common/mapper/StarMapper.xml
  6. 6 3
      src/main/java/com/goafanti/news/controller/NewsController.java
  7. 24 5
      src/main/java/com/goafanti/portal/controller/PortalBigShotController.java
  8. 9 5
      src/main/java/com/goafanti/portal/controller/PortalLectureController.java
  9. 24 6
      src/main/java/com/goafanti/portal/controller/PortalStarController.java
  10. 34 0
      src/main/java/com/goafanti/star/bo/BigShotStarInterest.java
  11. 6 1
      src/main/java/com/goafanti/star/service/StarService.java
  12. 13 2
      src/main/java/com/goafanti/star/service/impl/StarServiceImpl.java
  13. 2 2
      src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html
  14. 2 2
      src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html
  15. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  16. 18 0
      src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
  17. 1 1
      src/main/webapp/WEB-INF/views/portal/news/newsDetails.html
  18. 8 8
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html
  19. 9 9
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html
  20. 22 4
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  21. 6 6
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

+ 2 - 4
src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java

@@ -1,12 +1,10 @@
 package com.goafanti.activity.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.activity.service.ActivityService;
-import com.goafanti.common.dao.ActivityMapper;
 @Service
 public class ActivityServiceImpl implements ActivityService {
-	@Autowired
-	private ActivityMapper activityMapper;
+	/*@Autowired
+	private ActivityMapper activityMapper;*/
 }

+ 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 - 110
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,37 +314,11 @@ 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;
 	}
 
 	/**
-	 * 大咖说
-	 */
-	/*@RequestMapping(value = "/portal/scienceTechnology/bigShot", method = RequestMethod.GET)
-	public ModelAndView portalScienceTechnologyBigShot(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/scienceTechnology/bigShot");
-		return modelview;
-	}*/
-
-	/**
-	 * 科技讲堂
-	 */
-	/*@RequestMapping(value = "/portal/scienceTechnology/lecture", method = RequestMethod.GET)
-	public ModelAndView portalScienceTechnologyLecture(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/scienceTechnology/lecture");
-		return modelview;
-	}*/
-
-	/**
-	 * 科技明星
-	 */
-	/*@RequestMapping(value = "/portal/scienceTechnology/star", method = RequestMethod.GET)
-	public ModelAndView portalScienceTechnologyStar(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/scienceTechnology/star");
-		return modelview;
-	}*/
-
-	/**
 	 * 首页
 	 */
 	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
@@ -350,29 +332,12 @@ public class WebpageController extends BaseController {
 	}
 
 	/**
-	 * 新闻页
-	 */
-	@RequestMapping(value = "/portal/news", method = RequestMethod.GET)
-	public ModelAndView portalNews(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/news");
-		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;
 	}
 
@@ -382,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;
 	}
 
@@ -391,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;
 	}
 
@@ -400,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;
 	}
 
@@ -409,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;
 	}
 
@@ -418,6 +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");
+		handleBanners(modelview, BannersType.FU_WU_HUI);
 		return modelview;
 	}
 
@@ -427,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);
-		}
-		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);
+		handleBanners(modelview, BannersType.JI_SHU_JIAO_YI);
 		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 - 1
src/main/java/com/goafanti/common/dao/StarMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import java.util.List;
 
 import com.goafanti.common.model.Star;
+import com.goafanti.star.bo.BigShotStarInterest;
 import com.goafanti.star.bo.BigShotStarListBo;
 import com.goafanti.star.bo.HotStarListBo;
 
@@ -27,5 +28,9 @@ public interface StarMapper {
 
 	void insertBatch(List<Star> startList);
 
-	List<BigShotStarListBo> listBigShotStar(String uid);
+	List<BigShotStarListBo> listBigShotStar();
+
+	List<BigShotStarInterest> findBigShotInterestStatus(String uid);
+
+	List<BigShotStarInterest> findStarInterestStatus(String uid);
 }

+ 23 - 0
src/main/java/com/goafanti/common/mapper/StarMapper.xml

@@ -106,6 +106,7 @@
   	left join user_career uc on uc.uid = s.uid
   	left join achievement_demand_count adc on adc.uid = s.uid 
   	where s.hot = 1 and ui.celebrity = 1
+  	order by adc.achievement_count desc
   </select>
   
   <select id="listStarList"  parameterType="java.lang.String" resultType="com.goafanti.star.bo.HotStarListBo">
@@ -126,6 +127,7 @@
   	left join user_info info on info.uid = s.uid
   	left join user_interest interest on interest.to_uid = s.uid and interest.from_uid = #{uid,jdbcType=VARCHAR}
   	where s.star = 1 and ui.celebrity = 1
+  	order by adc.achievement_count desc
   </select>
   
   <delete id="deleteAll">
@@ -162,5 +164,26 @@
   	left join achievement_demand_count adc on adc.uid = s.uid 
   	left join user_interest interest on interest.to_uid = s.uid and interest.from_uid = #{uid,jdbcType=VARCHAR}
   	where s.hot = 1 
+  	order by adc.achievement_count desc
+  </select>
+  
+  <select id="findBigShotInterestStatus" parameterType="java.lang.String" resultType="com.goafanti.star.bo.BigShotStarInterest">
+  	select
+  		ui.id as interestId,
+  		s.uid as fromUid,
+  		ui.to_uid as toUid
+  	from star s
+  	left join user_interest ui on s.uid = ui.to_uid and ui.from_uid = #{uid,jdbcType=VARCHAR} 
+  	where  s.hot = 1 
+  </select>
+  
+  <select id="findStarInterestStatus" parameterType="java.lang.String" resultType="com.goafanti.star.bo.BigShotStarInterest">
+  	select
+  		ui.id as interestId,
+  		s.uid as fromUid,
+  		ui.to_uid as toUid
+  	from star s
+  	left join user_interest ui on s.uid = ui.to_uid and ui.from_uid = #{uid,jdbcType=VARCHAR} 
+  	where  s.star = 1 
   </select>
 </mapper>

+ 6 - 3
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,4 +105,5 @@ public class NewsController extends BaseController {
 		res.setData(newsService.findNewsDetail(id));
 		return res;
 	}
+
 }

+ 24 - 5
src/main/java/com/goafanti/portal/controller/PortalBigShotController.java

@@ -5,13 +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;
@@ -24,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
@@ -38,7 +41,7 @@ public class PortalBigShotController extends BaseController {
 	@RequestMapping(value = "/portal/scienceTechnology/bigShot", method = RequestMethod.GET)
 	public ModelAndView bigShot() {
 		ModelAndView mv = new ModelAndView();
-		List<BigShotStarListBo> starList = starService.listBigShotStar(AFTConstants.BIG_SHOT_STAR_CACHE_KEY, TokenManager.getToken() instanceof User ? TokenManager.getUserId() : null);
+		List<BigShotStarListBo> starList = starService.listBigShotStar(AFTConstants.BIG_SHOT_STAR_CACHE_KEY);
 		if (null != starList && starList.size() > 0) {
 			for (BigShotStarListBo bo : starList) {
 				if (StringUtils.isNotBlank(bo.getUid())) {
@@ -63,8 +66,24 @@ 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)
+	@ResponseBody
+	public Result interestStatus() {
+		Result res = new Result();
+		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;

+ 24 - 6
src/main/java/com/goafanti/portal/controller/PortalStarController.java

@@ -5,13 +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;
@@ -24,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
@@ -35,13 +38,14 @@ public class PortalStarController extends BaseController {
 	@Resource
 	private EngagedFieldGlossoryService	engagedFieldGlossoryService;
 
-	 @RequestMapping(value = "/portal/scienceTechnology/star", method = RequestMethod.GET)
+	@RequestMapping(value = "/portal/scienceTechnology/star", method = RequestMethod.GET)
 	public ModelAndView star() {
 		ModelAndView mv = new ModelAndView();
 		List<LectureListBo> lectureDynamicList = lectureService
 				.listDynamic(AFTConstants.LECTURE_DYNAMIC_LIST_CACHE_KEY);
 		mv.addObject("lectureDynamicList", lectureDynamicList);
-		List<HotStarListBo> starList = starService.listStarList(TokenManager.getToken() instanceof User ? TokenManager.getUserId() : null);
+		List<HotStarListBo> starList = starService
+				.listStarList(TokenManager.getToken() instanceof User ? TokenManager.getUserId() : null);
 		if (null != starList && starList.size() > 0) {
 			for (HotStarListBo bo : starList) {
 				if (StringUtils.isNotBlank(bo.getUid())) {
@@ -63,7 +67,21 @@ public class PortalStarController extends BaseController {
 			}
 			mv.addObject("starList", starList);
 		}
+		handleBanners(mv, BannersType.KE_JI_MING_XING);
 		mv.setViewName("/portal/scienceTechnology/star");
 		return mv;
 	}
+
+	/**
+	 * 当前用户关注"科技明星"页面科技明星状态
+	 */
+	@RequestMapping(value = "/portal/scienceTechnology/star/interestStatus", method = RequestMethod.GET)
+	@ResponseBody
+	public Result interestStatus() {
+		Result res = new Result();
+		if (TokenManager.getToken() instanceof User) {
+			res.setData(starService.findStarInterestStatus(TokenManager.getUserId()));
+		}
+		return res;
+	}
 }

+ 34 - 0
src/main/java/com/goafanti/star/bo/BigShotStarInterest.java

@@ -0,0 +1,34 @@
+package com.goafanti.star.bo;
+
+public class BigShotStarInterest {
+	private String	interestId;
+
+	private String	fromUid;
+
+	private String	toUid;
+
+	public String getInterestId() {
+		return interestId;
+	}
+
+	public void setInterestId(String interestId) {
+		this.interestId = interestId;
+	}
+
+	public String getFromUid() {
+		return fromUid;
+	}
+
+	public void setFromUid(String fromUid) {
+		this.fromUid = fromUid;
+	}
+
+	public String getToUid() {
+		return toUid;
+	}
+
+	public void setToUid(String toUid) {
+		this.toUid = toUid;
+	}
+
+}

+ 6 - 1
src/main/java/com/goafanti/star/service/StarService.java

@@ -3,6 +3,7 @@ package com.goafanti.star.service;
 import java.util.List;
 
 import com.goafanti.common.model.Star;
+import com.goafanti.star.bo.BigShotStarInterest;
 import com.goafanti.star.bo.BigShotStarListBo;
 import com.goafanti.star.bo.HotStarListBo;
 
@@ -15,9 +16,13 @@ public interface StarService {
 
 	void save(List<Star> star, String[] hot);
 
-	public List<BigShotStarListBo> listBigShotStar(Integer bigShotStarCacheKey, String uid);
+	public List<BigShotStarListBo> listBigShotStar(Integer bigShotStarCacheKey);
 	
 	public void clearBigShotStarList(Integer bigShotStarCacheKey);
+
+	List<BigShotStarInterest> findBigShotInterestStatus(String uid);
+
+	List<BigShotStarInterest> findStarInterestStatus(String userId);
 	
 	
 

+ 13 - 2
src/main/java/com/goafanti/star/service/impl/StarServiceImpl.java

@@ -15,6 +15,7 @@ import com.goafanti.common.enums.StarHotType;
 import com.goafanti.common.enums.StarType;
 import com.goafanti.common.model.Star;
 import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.star.bo.BigShotStarInterest;
 import com.goafanti.star.bo.BigShotStarListBo;
 import com.goafanti.star.bo.HotStarListBo;
 import com.goafanti.star.service.StarService;
@@ -60,8 +61,8 @@ public class StarServiceImpl implements StarService {
 
 	@Override
 	@Cacheable(value = "BigShotStarListCache", key = "'BigShotStarList:'+#bigShotStarCacheKey")
-	public List<BigShotStarListBo> listBigShotStar(Integer bigShotStarCacheKey, String uid) {
-		return starMapper.listBigShotStar(uid);
+	public List<BigShotStarListBo> listBigShotStar(Integer bigShotStarCacheKey) {
+		return starMapper.listBigShotStar();
 	}
 
 	@Override
@@ -70,4 +71,14 @@ public class StarServiceImpl implements StarService {
 		LoggerUtils.debug(logger, "清除大咖说科技明星列表缓存:[%s]", bigShotStarCacheKey);
 	}
 
+	@Override
+	public List<BigShotStarInterest> findBigShotInterestStatus(String uid) {
+		return starMapper.findBigShotInterestStatus(uid);
+	}
+
+	@Override
+	public List<BigShotStarInterest> findStarInterestStatus(String uid) {
+		return starMapper.findStarInterestStatus(uid);
+	}
+
 }

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html

@@ -146,8 +146,8 @@
 		</div>
 	</div>
 
-	<input type="hidden" id="achievementId" th:value=${achievement.id}>
-	<input type="hidden" id="interestId" th:value=${achievement.interestId}>
+	<input type="hidden" id="achievementId" th:value="${achievement.id}">
+	<input type="hidden" id="interestId" th:value="${achievement.interestId}">
 
 	<div class="modal fade" tabindex="-1" role="dialog" id="order"
 		aria-labelledby="myModalLabel">

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

@@ -136,8 +136,8 @@
 		</ul>
 	</div>
 
-	<input type="hidden" id="demandId" th:value=${demand.id}>
-	<input type="hidden" id="interestId" th:value=${demand.interestId}>
+	<input type="hidden" id="demandId" th:value="${demand.id}">
+	<input type="hidden" id="interestId" th:value="${demand.interestId}">
 
 	<div class="modal fade" tabindex="-1" role="dialog" id="order"
 		aria-labelledby="myModalLabel">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html

@@ -127,7 +127,7 @@
 			<a th:href="${basePath + '/user/account/demand.html#techDemand'}">发布需求</a>
 			<a th:href="${basePath + '/user/account/achievement.html#techAchievement'}">发布技术</a>
 			<a th:href="${basePath + '/user/account/services.html#evaluate'}">我要评估</a>
-			<a class="customer-service" href="#">成为专家</a>
+			<a class="customer-service" href="javascript:;">成为专家</a>
 		</div>
 	</div>
 	<div class="container news">

+ 18 - 0
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -1,3 +1,20 @@
+<<<<<<< HEAD
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>新闻详情</title>
+	<link th:href="${staticHost+'/portal/news/newsDetail.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/portal/news/newsDetail.css'}"></script>
+	</div>
+</body>
+=======
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
@@ -77,4 +94,5 @@
 	</div>
 </body>
 
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 </html>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html

@@ -6,7 +6,7 @@
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/news/newsDetails.css'}" rel="stylesheet">
 </head>
-
+ 
 <body>
 	<header>
 		<div th:replace="common::{topNav}"></div>

+ 8 - 8
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html

@@ -61,16 +61,16 @@
 						<img th:if="${star.personPortraitUrl!=null && star.personPortraitUrl!=''}" th:src="${avatarUploadHost + star.personPortraitUrl}">
 						<a href="#" class="interest-star">
                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-                            <input type="hidden" id="interestId" th:value=${star.interestId}>
+                            <input type="hidden" id="uid" th:value="${star.uid}">
                             关注
                         </a>
 					</div>
 					<div class="star_content_info">
-						<h4 th:text="${star.username}" th:title="${star.username}">陈政清</h4>
-						<h5 th:text="${star.workUnit}" th:title="${star.workUnit}">湖南大学 土木工程学院</h5>
-						<h5 th:text="${star.professionalTitle}" th:title="${star.professionalTitle}">“985”工程首席科学家</h5>
-						<p class="mt20"><label>技术:</label> <span class="red" th:text="${star.achievementNum}">4</span>项</p>
-						<p><label>粉丝:</label> <span class="red" th:text="${star.fansNum}">456</span>人</p>
+						<h4 th:text="${star.username}" th:title="${star.username}"></h4>
+						<h5 th:text="${star.workUnit}" th:title="${star.workUnit}"></h5>
+						<h5 th:text="${star.professionalTitle}" th:title="${star.professionalTitle}"></h5>
+						<p class="mt20"><label>技术:</label> <span class="red" th:text="${star.achievementNum}"></span>项</p>
+						<p><label>粉丝:</label> <span class="red" th:text="${star.fansNum}"></span>人</p>
 					</div>
 				</li>
 			</ul>
@@ -108,8 +108,8 @@
 						<img th:if="${lecture.lectureUrl != null && lecture.lectureUrl != ''}" th:src="${avatarUploadHost + lecture.lectureUrl}">
 					</div>
 					<div class="lecture_content_info">
-						<h5 th:text="${lecture.name}" th:title="${lecture.name}">科技成果转化项目开展讲座</h5>
-						<p class="mt20" th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}">2017-06-30</p>
+						<h5 th:text="${lecture.name}" th:title="${lecture.name}"></h5>
+						<p class="mt20" th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}"></p>
 						<a href="#" class="customer-service">报名中</a>
 					</div>
 				</li>

+ 9 - 9
src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html

@@ -136,9 +136,9 @@
 				<div class="qimo">
 					<div id="active_notice_ul1">
 						<ul th:each="lectureDynamic,iterStart:${lectureDynamicList}">
-							<li th:text="${lectureDynamic.username}" th:title="${lectureDynamic.username}"><a href='#'>· 袁隆平取得重大突破</a></li>
-							<li th:text="${lectureDynamic.name}" th:title="${lectureDynamic.name}"><a href='#'>· 周凌宇举办科技成果发布会</a></li>
-							<li th:text="${lectureDynamic.lectureTimeFormattedDate}" th:title="${lectureDynamic.lectureTimeFormattedDate}"><a href='#'>· 中国科交会</a></li>
+							<li th:text="${lectureDynamic.username}" th:title="${lectureDynamic.username}"><a href='#'></a></li>
+							<li th:text="${lectureDynamic.name}" th:title="${lectureDynamic.name}"><a href='#'></a></li>
+							<li th:text="${lectureDynamic.lectureTimeFormattedDate}" th:title="${lectureDynamic.lectureTimeFormattedDate}"><a href='#'></a></li>
 						</ul>
 					</div>
 					<div id="active_notice_ul2"></div>
@@ -159,17 +159,17 @@
 						<img th:if="${star.personPortraitUrl} != null" th:src="${avatarUploadHost + star.personPortraitUrl}">
 						<a href="#" class="interest-star">
                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-                            <input type="hidden" id="interestId" th:value=${star.interestId}>
+                            <input type="hidden" id="uid" th:value="${star.uid}">
                             关注
                         </a>
 					</div>
 					<div class="expert_content_info">
-						<h4 th:text="${star.username}" th:title="${star.username}">薛志敏</h4>
+						<h4 th:text="${star.username}" th:title="${star.username}"></h4>
 						<!--<a href="#" class="start">邀请开讲</a>-->
-						<p th:text="${star.workUnit}" th:title="${star.workUnit}">中南大学湘雅二医院</p>
-						<p th:text="${star.engagedField}" th:title="${star.engagedField}">精神病学 精神卫生学 生物精神病学</p>
-						<p class="mt25"><label>技术: </label> <span class="red" th:text="${star.achievementNum}">4</span>项</p>
-						<p><label>粉丝: </label> <span class="red" th:text="${star.fansNum}">654</span>个</p>
+						<p th:text="${star.workUnit}" th:title="${star.workUnit}"></p>
+						<p th:text="${star.engagedField}" th:title="${star.engagedField}"></p>
+						<p class="mt25"><label>技术: </label> <span class="red" th:text="${star.achievementNum}"></span>项</p>
+						<p><label>粉丝: </label> <span class="red" th:text="${star.fansNum}"></span>个</p>
 					</div>
 				</li>
 			</ul>

+ 22 - 4
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -35,11 +35,29 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-
-			<div class="item active">
-				<img th:src="${portalHost + '/img/service_index_banner.jpg'}"
-					alt="First slide">
+	
+	<div id="myCarousel" class="carousel slide" th:if="${banners!=null && banners.size() > 1}">
+		<ol class="carousel-indicators">
+			<th:block th:each="banner,bannerStat:${banners}">
+				<li data-target="#myCarousel" data-slide-to="0" th:class="${bannerStat.first?'active':''}"></li>
+			</th:block>
+		</ol>
+		<div class="carousel-inner">
+			<th:block  th:each="banner,bannerStat:${banners}">
+			<div class="item" th:classappend="${bannerStat.first?'active':''}">
+				<img th:src="${staticDomain +'/upload'+  banner.imgurl}" th:alt="${banner.text}">
 			</div>
+			</th:block>
+		</div>
+		<a class="carousel-control left" href="#myCarousel" data-slide="prev"><span class="glyphicon glyphicon-chevron-left"></span></a>
+		<a class="carousel-control right" href="#myCarousel" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a>
+	</div>
+	<div class="banner-item" th:if="${banners!=null && banners.size()==1}">
+		<img th:src="${staticDomain +'/upload'+  banners[0].imgurl}" th:alt="${banners[0].text}">
+	</div>
+	<div class="banner-item" th:if="${banners==null}">
+		<img th:src="${portalHost + '/img/service_index_banner.jpg'}" alt="First slide">
+	</div>
 
 	<div class="container service_nav">
 		<div class="div_title">

File diff suppressed because it is too large
+ 6 - 6
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html