Browse Source

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

wubb 8 years ago
parent
commit
2251ee592f
24 changed files with 116 additions and 40 deletions
  1. 4 0
      src/main/java/com/goafanti/activity/service/ActivityService.java
  2. 19 0
      src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java
  3. 0 20
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 58 0
      src/main/java/com/goafanti/portal/controller/PortalActivityController.java
  5. 1 1
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  6. 2 1
      src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
  7. 2 1
      src/main/webapp/WEB-INF/views/portal/activity/details.html
  8. 2 1
      src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html
  9. 2 1
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  10. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/authentication.html
  11. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html
  12. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html
  13. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html
  14. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html
  15. 1 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html
  16. 2 1
      src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html
  17. 2 1
      src/main/webapp/WEB-INF/views/portal/ipr/apply.html
  18. 2 1
      src/main/webapp/WEB-INF/views/portal/ipr/iso.html
  19. 2 1
      src/main/webapp/WEB-INF/views/portal/ipr/patentOperation.html
  20. 2 1
      src/main/webapp/WEB-INF/views/portal/ipr/service.html
  21. 2 1
      src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
  22. 2 1
      src/main/webapp/WEB-INF/views/portal/news/newsDetails.html
  23. 2 1
      src/main/webapp/WEB-INF/views/portal/news/newsIndex.html
  24. 2 1
      src/main/webapp/WEB-INF/views/portal/websiteBuild/websiteBuildIndex.html

+ 4 - 0
src/main/java/com/goafanti/activity/service/ActivityService.java

@@ -21,4 +21,8 @@ public interface ActivityService {
 
 	Activity findActivityDetail(Long id);
 
+	List<Activity> findPortalList();
+
+	void cleanActivityIndexList();
+
 }

+ 19 - 0
src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java

@@ -7,7 +7,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.activity.bo.ActivityListBo;
@@ -16,9 +19,11 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.ActivityMapper;
 import com.goafanti.common.model.Activity;
 import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.news.service.NewsService;
 
 @Service
 public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implements ActivityService {
@@ -26,6 +31,8 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 	private ActivityMapper	activityMapper;
 	@Autowired
 	private JDBCIdGenerator	idGenerator;
+	
+	private static final Logger	logger	= LoggerFactory.getLogger(NewsService.class);
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -113,4 +120,16 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 		return activityMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public List<Activity> findPortalList() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@CacheEvict(value = "ActivityPortalListCache", allEntries = true)
+	public void cleanActivityIndexList() {
+		LoggerUtils.debug(logger, "清除门户端新闻列表缓存:[%s]");
+		
+	}
+
 }

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

@@ -203,26 +203,6 @@ 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;
-	}
-
-	/**
-	 * 活动详情
-	 */
-	@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;
-	}
-
-	/**
 	 * 创业圈
 	 */
 	@RequestMapping(value = "/portal/entrepreneurship/entrepreneurshipIndex", method = RequestMethod.GET)

+ 58 - 0
src/main/java/com/goafanti/portal/controller/PortalActivityController.java

@@ -0,0 +1,58 @@
+package com.goafanti.portal.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+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 com.goafanti.activity.service.ActivityService;
+import com.goafanti.banners.enums.BannersType;
+import com.goafanti.banners.service.BannersService;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Banners;
+import com.goafanti.common.utils.StringUtils;
+
+@Controller
+public class PortalActivityController extends BaseController {
+	@Resource
+	private ActivityService	activityService;
+	@Resource
+	private BannersService	bannersService;
+
+	/**
+	 * 活动圈
+	 */
+	@RequestMapping(value = "/portal/activity/activityIndex", method = RequestMethod.GET)
+	public ModelAndView portalActivityActivityIndex(HttpServletRequest request, ModelAndView modelview,
+			String noCache) {
+		modelview.setViewName("/portal/activity/activityIndex");
+		if (StringUtils.equals(noCache, "clear")) {
+			activityService.cleanActivityIndexList();
+		}
+		modelview.addObject("activityList", activityService.findPortalList());
+		handleBanners(modelview, BannersType.HUO_DONG_QUAN);
+		return modelview;
+	}
+
+	/**
+	 * 活动详情
+	 */
+	@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;
+	}
+
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
+		}
+	}
+}

+ 1 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -75,7 +75,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	public OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(String userId) {
 		OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(userId);
 		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(userId,
-				Calendar.getInstance().get(Calendar.YEAR - 1));
+				Calendar.getInstance().get(Calendar.YEAR) - 1);
 		OrganizationIndentityUserBo bo = new OrganizationIndentityUserBo();
 		BeanUtils.copyProperties(oi, bo);
 		if (null != ratepay && StringUtils.isNotBlank(ratepay.getId())) {

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html

@@ -32,7 +32,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/activity_index_banner.jpg'}" alt="First slide">
 	</div>
 

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -35,7 +35,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost +'/img/activity_detail_banner.jpg'}" alt="First slide">
 	</div>
 

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html

@@ -33,7 +33,8 @@
 		<div class="secondary_navigation"></div>
 	</div>
 
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/entrepreneurshipIndex_banner.jpg'}" alt="First slide">
 	</div>
 

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html

@@ -33,7 +33,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/financial_hot_img.jpg'}" width="100%"/>
 	</div>
 	<div class="container financial">

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/authentication.html

@@ -34,7 +34,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div id="myCarousel" class="carousel slide">
+	<div th:replace="common::banners"></div>
+	<div id="myCarousel" class="carousel slide" th:if="${banners==null}">
 		<!-- 轮播(Carousel)指标 -->
 		<ol class="carousel-indicators">
 			<li data-target="#myCarousel" data-slide-to="0" class="active"></li>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html


+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html

@@ -34,7 +34,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div id="myCarousel" class="carousel slide">
+	<div th:replace="common::banners"></div>
+	<div id="myCarousel" class="carousel slide" th:if="${banners==null}">
 		<!-- 轮播(Carousel)指标 -->
 		<ol class="carousel-indicators">
 			<li data-target="#myCarousel" data-slide-to="0" class="active"></li>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html


+ 2 - 1
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html

@@ -26,7 +26,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/international_banner.jpg'}" alt="First slide">
 	</div>
 

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/ipr/apply.html

@@ -34,7 +34,8 @@
 		<div class="secondary_navigation"></div>
 	</div>
 
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/ipr_service_apply_banner.jpg'}"
 			alt="First slide">
 	</div>

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/ipr/iso.html

@@ -31,7 +31,8 @@
 		<div class="secondary_navigation"></div>
 	</div>
 
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/ipr_service_iso_banner.jpg'}"
 			alt="First slide">
 	</div>

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/ipr/patentOperation.html

@@ -31,7 +31,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div id="myCarousel" class="carousel slide">
+	<div th:replace="common::banners"></div>
+	<div id="myCarousel" class="carousel slide" th:if="${banners==null}">
 		<!-- 轮播(Carousel)指标 -->
 		<ol class="carousel-indicators">
 			<li data-target="#myCarousel" data-slide-to="0" class="active"></li>

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/ipr/service.html

@@ -26,7 +26,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div id="myCarousel" class="carousel slide">
+	<div th:replace="common::banners"></div>
+	<div id="myCarousel" class="carousel slide" th:if="${banners==null}">
 		<!-- 轮播(Carousel)指标 -->
 		<ol class="carousel-indicators">
 			<li data-target="#myCarousel" data-slide-to="0" class="active"></li>

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

@@ -24,7 +24,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div>
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/newsDetail_banner.jpg'}" alt="First slide">
 	</div>
 

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

@@ -24,7 +24,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div>
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/newsDetail_banner.jpg'}" alt="First slide">
 	</div>
 

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

@@ -32,7 +32,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/newsIndex_banner.jpg'}" alt="First slide">
 	</div>
 

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/websiteBuild/websiteBuildIndex.html

@@ -35,7 +35,8 @@
 		<div class="secondary_navigation"></div>
 	</div>
 
-	<div class="item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/websiteBuild_index_banner.jpg'}"
 			alt="First slide">
 	</div>