|
|
@@ -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;
|
|
|
}
|
|
|
|