Antiloveg лет назад: 8
Родитель
Сommit
093cde9473

+ 0 - 7
src/main/java/com/goafanti/lecture/service/impl/LectureServiceImpl.java

@@ -159,13 +159,6 @@ public class LectureServiceImpl extends BaseMybatisDao<LectureMapper> implements
 
 	@Override
 	public List<LectureListBo> loadMore(Integer pageSize, Integer pageNo) {
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 2;
-		}
-
-		if (pageSize == null || pageSize < 0 || pageSize > 10) {
-			pageSize = 10;
-		}
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("pageSize", pageSize);
 		params.put("pageNo", pageNo);

+ 8 - 21
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -15,14 +15,14 @@ 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.controller.BaseApiController;
 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 BaseController {
+public class NewsController extends BaseApiController {
 	@Resource
 	NewsService newsService;
 	@Resource
@@ -55,7 +55,7 @@ public class NewsController extends BaseController {
 	@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")) {
+		/*if (StringUtils.equals(noCache, "clear")) {
 			newsService.cleanPortalList();
 		}
 		modelview.addObject("complete", newsService.findPortalList(5, 0, NewsType.ALL.getCode()));
@@ -63,12 +63,12 @@ public class NewsController extends BaseController {
 		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()));
+		modelview.addObject("dfzc", newsService.findPortalList(5, 0, NewsType.DFZC.getCode()));*/
 		return modelview;
 	}
 
 	/**
-	 * 新闻列表
+	 * 新闻详情列表
 	 */
 	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
 	@ResponseBody
@@ -77,22 +77,9 @@ public class NewsController extends BaseController {
 		if (StringUtils.equals(noCache, "clear")) {
 			newsService.cleanPortalList();
 		}
-		Integer pSize = null;
-		Integer pNo = null;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		if (pNo == null || pNo < 0) {
-			pNo = 0;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 5) {
-			pSize = 5;
-		}
-		res.setData(newsService.findPortalList(pSize, pNo, type));
+		Integer pN = getPageNo(pageNo);
+		Integer pS = getPageSize(pageSize);
+		res.setData(newsService.findPortalList(pS, (pN - 1) * pS, type));
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/news/service/NewsService.java

@@ -126,7 +126,7 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return newsMapper.batchDeleteByPrimaryKey(id);
 	}
 	
-	//@Cacheable(value = "NewsPortalListCache", key = "'NewsPortalList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
+	@Cacheable(value = "NewsPortalListCache", key = "'NewsPortalList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
 	public List<NewsPortalList> findPortalList(Integer pSize, Integer pNo, Integer type) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("type", type);

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

@@ -5,7 +5,6 @@ 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;
@@ -16,7 +15,7 @@ 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.BaseController;
+import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Banners;
 import com.goafanti.lecture.bo.LectureListBo;
 import com.goafanti.lecture.service.LectureService;
@@ -25,7 +24,7 @@ import com.goafanti.lecture.service.LectureService;
  * 科技讲堂
  */
 @Controller
-public class PortalLectureController extends BaseController {
+public class PortalLectureController extends BaseApiController {
 	@Resource
 	private LectureService lectureService;
 	@Resource
@@ -51,15 +50,9 @@ public class PortalLectureController extends BaseController {
 	@ResponseBody
 	public Result loadMore(String pageSize, String pageNo) {
 		Result res = new Result();
-		Integer pNo = 2;
-		Integer pSize = 5;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(lectureService.loadMore(pSize, pNo));
+		Integer pN = getPageNo(pageNo);
+		Integer pS = getPageSize(pageSize);
+		res.setData(lectureService.loadMore(pS, (pN - 1) * pS));
 		return res;
 	}