|
@@ -15,18 +15,19 @@ import com.goafanti.banners.enums.BannersType;
|
|
|
import com.goafanti.banners.service.BannersService;
|
|
import com.goafanti.banners.service.BannersService;
|
|
|
import com.goafanti.common.bo.Result;
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
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.model.Banners;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.news.enums.NewsType;
|
|
import com.goafanti.news.enums.NewsType;
|
|
|
import com.goafanti.news.service.NewsService;
|
|
import com.goafanti.news.service.NewsService;
|
|
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
|
-public class NewsController extends BaseApiController {
|
|
|
|
|
|
|
+public class NewsController extends BaseController {
|
|
|
@Resource
|
|
@Resource
|
|
|
- NewsService newsService;
|
|
|
|
|
|
|
+ NewsService newsService;
|
|
|
@Resource
|
|
@Resource
|
|
|
- private BannersService bannersService;
|
|
|
|
|
|
|
+ private BannersService bannersService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 策源地
|
|
* 策源地
|
|
|
*
|
|
*
|
|
@@ -55,15 +56,6 @@ public class NewsController extends BaseApiController {
|
|
|
@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
|
|
|
public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview, String noCache) {
|
|
public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview, String noCache) {
|
|
|
modelview.setViewName("/portal/news/newsDetails");
|
|
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;
|
|
return modelview;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -97,18 +89,34 @@ public class NewsController extends BaseApiController {
|
|
|
res.setData(newsService.findNewsDetail(id));
|
|
res.setData(newsService.findNewsDetail(id));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
|
|
|
public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview) {
|
|
public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/news/newsDetail");
|
|
modelview.setViewName("/portal/news/newsDetail");
|
|
|
return modelview;
|
|
return modelview;
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private void handleBanners(ModelAndView modelview, BannersType bannersType) {
|
|
private void handleBanners(ModelAndView modelview, BannersType bannersType) {
|
|
|
List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
|
|
List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
|
|
|
if (!banners.isEmpty()) {
|
|
if (!banners.isEmpty()) {
|
|
|
modelview.addObject("banners", banners);
|
|
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;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
}
|
|
}
|