|
@@ -28,9 +28,9 @@ import com.goafanti.news.service.NewsService;
|
|
|
@Controller
|
|
@Controller
|
|
|
public class NewsController extends BaseController {
|
|
public class NewsController extends BaseController {
|
|
|
@Resource
|
|
@Resource
|
|
|
- NewsService newsService;
|
|
|
|
|
|
|
+ NewsService newsService;
|
|
|
@Resource
|
|
@Resource
|
|
|
- private BannersService bannersService;
|
|
|
|
|
|
|
+ private BannersService bannersService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 策源地
|
|
* 策源地
|
|
@@ -46,11 +46,11 @@ public class NewsController extends BaseController {
|
|
|
newsService.cleanList();
|
|
newsService.cleanList();
|
|
|
}
|
|
}
|
|
|
String domainName = request.getServerName();
|
|
String domainName = request.getServerName();
|
|
|
- modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2,domainName));
|
|
|
|
|
- modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2,domainName));
|
|
|
|
|
- modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3,domainName));
|
|
|
|
|
- modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3,domainName));
|
|
|
|
|
- modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3,domainName));
|
|
|
|
|
|
|
+ modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2, domainName, false));
|
|
|
|
|
+ modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2, domainName, false));
|
|
|
|
|
+ modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3, domainName, false));
|
|
|
|
|
+ modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3, domainName, false));
|
|
|
|
|
+ modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3, domainName, false));
|
|
|
handleBanners(modelview, BannersType.CE_YUAN_DI);
|
|
handleBanners(modelview, BannersType.CE_YUAN_DI);
|
|
|
return modelview;
|
|
return modelview;
|
|
|
}
|
|
}
|
|
@@ -63,7 +63,7 @@ public class NewsController extends BaseController {
|
|
|
modelview.setViewName("/portal/news/newsDetails");
|
|
modelview.setViewName("/portal/news/newsDetails");
|
|
|
return modelview;
|
|
return modelview;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 新闻详情APP
|
|
* 新闻详情APP
|
|
|
*/
|
|
*/
|
|
@@ -78,16 +78,17 @@ public class NewsController extends BaseController {
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
- public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot,Integer provinceId,String keyword) {
|
|
|
|
|
|
|
+ public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot, Integer provinceId,
|
|
|
|
|
+ String keyword) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
- Integer pNo = 1,pSize = 4;
|
|
|
|
|
|
|
+ Integer pNo = 1, pSize = 4;
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNumeric(pageSize)) {
|
|
if (StringUtils.isNumeric(pageSize)) {
|
|
|
pSize = Integer.parseInt(pageSize);
|
|
pSize = Integer.parseInt(pageSize);
|
|
|
}
|
|
}
|
|
|
- res.setData(newsService.portalNewsList(pSize,pNo, type,hot,provinceId,keyword));
|
|
|
|
|
|
|
+ res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -102,24 +103,24 @@ public class NewsController extends BaseController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻ID"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻ID"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- /*newsService.portalNewsList(6,1, type,hot,provinceId,keyword)*/
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /* newsService.portalNewsList(6,1, type,hot,provinceId,keyword) */
|
|
|
|
|
+
|
|
|
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,Long id) {
|
|
|
|
|
|
|
+ public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview, Long id) {
|
|
|
modelview.setViewName("/portal/news/newsDetail");
|
|
modelview.setViewName("/portal/news/newsDetail");
|
|
|
- Pagination<NewsPortalList> newsList = newsService.portalNewsList(6,1,5,null,null,null);
|
|
|
|
|
|
|
+ Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
|
|
|
News newsDetail = newsService.findNewsDetail(id);
|
|
News newsDetail = newsService.findNewsDetail(id);
|
|
|
Object news = newsList.getList().get(0);
|
|
Object news = newsList.getList().get(0);
|
|
|
- SimpleDateFormat fmt =new SimpleDateFormat();
|
|
|
|
|
- newsDetail.setCreateTimeS(fmt.format( newsDetail.getCreateTime()));
|
|
|
|
|
|
|
+ SimpleDateFormat fmt = new SimpleDateFormat();
|
|
|
|
|
+ newsDetail.setCreateTimeS(fmt.format(newsDetail.getCreateTime()));
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
- List<NewsPortalList> la = (List<NewsPortalList>)newsList.getList();
|
|
|
|
|
- for(NewsPortalList n : la) {
|
|
|
|
|
|
|
+ List<NewsPortalList> la = (List<NewsPortalList>) newsList.getList();
|
|
|
|
|
+ for (NewsPortalList n : la) {
|
|
|
String createTimeFormattedDate = n.getCreateTimeFormattedDate();
|
|
String createTimeFormattedDate = n.getCreateTimeFormattedDate();
|
|
|
n.setDataS(createTimeFormattedDate);
|
|
n.setDataS(createTimeFormattedDate);
|
|
|
}
|
|
}
|
|
@@ -127,14 +128,14 @@ public class NewsController extends BaseController {
|
|
|
modelview.addObject("newsList", newsList.getList());
|
|
modelview.addObject("newsList", newsList.getList());
|
|
|
modelview.addObject("news", news);
|
|
modelview.addObject("news", news);
|
|
|
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);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-}
|
|
|
|
|
|
|
+}
|