Antiloveg 8 years ago
parent
commit
1cdde04166

+ 24 - 16
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -15,18 +15,19 @@ 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.BaseApiController;
+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 BaseApiController {
+public class NewsController extends BaseController {
 	@Resource
-	NewsService newsService;
+	NewsService				newsService;
 	@Resource
-	private BannersService		bannersService;
+	private BannersService	bannersService;
+
 	/**
 	 * 策源地
 	 * 
@@ -55,15 +56,6 @@ public class NewsController extends BaseApiController {
 	@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
 	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview, String noCache) {
 		modelview.setViewName("/portal/news/newsDetails");
-		/*if (StringUtils.equals(noCache, "clear")) {
-			newsService.cleanPortalList();
-		}
-		modelview.addObject("complete", newsService.findPortalList(5, 0, NewsType.ALL.getCode()));
-		modelview.addObject("kjkx", newsService.findPortalList(5, 0, NewsType.KJZX.getCode()));
-		modelview.addObject("jtdt", newsService.findPortalList(5, 0, NewsType.JTDT.getCode()));
-		modelview.addObject("zfwl", newsService.findPortalList(5, 0, NewsType.ZFWL.getCode()));
-		modelview.addObject("gjzc", newsService.findPortalList(5, 0, NewsType.GJZC.getCode()));
-		modelview.addObject("dfzc", newsService.findPortalList(5, 0, NewsType.DFZC.getCode()));*/
 		return modelview;
 	}
 
@@ -97,18 +89,34 @@ public class NewsController extends BaseApiController {
 		res.setData(newsService.findNewsDetail(id));
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
 	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/news/newsDetail");
 		return modelview;
-	} 
-	
+	}
+
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banners", banners);
 		}
 	}
+	
+	private Integer getPageNo(String pageNo){
+		if (StringUtils.isNumeric(pageNo)) {
+			Integer pn = Integer.parseInt(pageNo);
+			return pn < 1 ? 1 : pn;
+		}
+		return 1;
+	}
+	
+	private Integer getPageSize(String pageSize){
+		if (StringUtils.isNumeric(pageSize)) {
+			Integer ps = Integer.parseInt(pageSize);
+			return ps > 50 ? 50 : (ps < 10 ? 10 : ps);
+		}
+		return 10;
+	}
 
 }

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

@@ -8,11 +8,14 @@ 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.bind.annotation.ResponseBody;
 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.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.Banners;
 import com.goafanti.common.utils.StringUtils;
@@ -48,6 +51,42 @@ public class PortalActivityController extends BaseController {
 		handleBanners(modelview, BannersType.HUO_DONG_XIANG_QING);
 		return modelview;
 	}
+	
+	/**
+	 * 活动列表
+	 */
+	@RequestMapping(value = "/portal/activity/list", method = RequestMethod.GET)
+	@ResponseBody
+	public Result portalActivityList(String pageSize, String pageNo, Integer form, String noCache){
+		Result res = new Result();
+		if (StringUtils.equals(noCache, "clear")) {
+			activityService.cleanActivityPortalList();
+		}
+		
+		Integer pN = getPageNo(pageNo);
+		Integer pS = getPageSize(pageSize);
+		res.setData(activityService.findPortalList((pN - 1) * pS, pS, form));
+		return res;
+	}
+	
+	/**
+	 * 活动详情info
+	 */
+	@RequestMapping(value = "/portal/activity/detail", method = RequestMethod.GET)
+	@ResponseBody
+	public Result portalActivityDetail(String id){
+		Result res = new Result();
+		if (StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动ID"));
+			return res;
+		}
+		if (!StringUtils.isNumeric(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "活动ID"));
+			return res;
+		}
+		res.setData(activityService.findActivityDetail(Long.parseLong(id)));
+		return res;
+	}
 
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
@@ -55,4 +94,20 @@ public class PortalActivityController extends BaseController {
 			modelview.addObject("banners", banners);
 		}
 	}
+	
+	private Integer getPageNo(String pageNo){
+		if (StringUtils.isNumeric(pageNo)) {
+			Integer pn = Integer.parseInt(pageNo);
+			return pn < 1 ? 1 : pn;
+		}
+		return 1;
+	}
+	
+	private Integer getPageSize(String pageSize){
+		if (StringUtils.isNumeric(pageSize)) {
+			Integer ps = Integer.parseInt(pageSize);
+			return ps > 50 ? 50 : (ps < 10 ? 10 : ps);
+		}
+		return 10;
+	}
 }