|
|
@@ -1,11 +1,11 @@
|
|
|
package com.goafanti.news.controller;
|
|
|
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.List;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
+import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
@@ -15,6 +15,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
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.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseController;
|
|
|
import com.goafanti.common.model.Banners;
|
|
|
@@ -28,9 +29,9 @@ import com.goafanti.news.service.NewsService;
|
|
|
@Controller
|
|
|
public class NewsController extends BaseController {
|
|
|
@Resource
|
|
|
- NewsService newsService;
|
|
|
+ NewsService newsService;
|
|
|
@Resource
|
|
|
- private BannersService bannersService;
|
|
|
+ private BannersService bannersService;
|
|
|
|
|
|
/**
|
|
|
* 策源地
|
|
|
@@ -116,9 +117,19 @@ public class NewsController extends BaseController {
|
|
|
Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
|
|
|
News newsDetail = newsService.findNewsDetail(id);
|
|
|
Object news = newsList.getList().get(0);
|
|
|
- SimpleDateFormat fmt = new SimpleDateFormat();
|
|
|
- if(null!=newsDetail)
|
|
|
- newsDetail.setCreateTimeS(fmt.format(newsDetail.getCreateTime()));
|
|
|
+ if (null != newsDetail) {
|
|
|
+ newsDetail.setCreateTimeS(newsDetail.getCreateTime() != null
|
|
|
+ ? DateFormatUtils.format(newsDetail.getCreateTime(), AFTConstants.MMDDYYYY) : "");
|
|
|
+ String summary = newsDetail.getSummary();
|
|
|
+ modelview.addObject("hasHighTech",
|
|
|
+ summary != null && (summary.indexOf("高新") > -1 || summary.indexOf("高企") > -1));
|
|
|
+ modelview.addObject("hasPatent",
|
|
|
+ summary != null && (summary.indexOf("专利") > -1 || summary.indexOf("知识产权") > -1));
|
|
|
+ modelview.addObject("hasCopyright",
|
|
|
+ summary != null && (summary.indexOf("软著") > -1 || summary.indexOf("知识产权") > -1));
|
|
|
+ modelview.addObject("hasTechProj",
|
|
|
+ summary != null && (summary.indexOf("科技") > -1 || summary.indexOf("项目") > -1));
|
|
|
+ }
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<NewsPortalList> la = (List<NewsPortalList>) newsList.getList();
|
|
|
for (NewsPortalList n : la) {
|
|
|
@@ -137,6 +148,7 @@ public class NewsController extends BaseController {
|
|
|
modelview.addObject("banners", banners);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 高新认定APP
|
|
|
*/
|