|
|
@@ -11,6 +11,7 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import com.kede.core.mybatis.page.Pagination;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
@@ -166,6 +167,20 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("banners",o);
|
|
|
return modelview;
|
|
|
}
|
|
|
+
|
|
|
+ @RequestMapping(value = "/htmlmap", method = RequestMethod.GET)
|
|
|
+ public ModelAndView htmlmap(HttpServletRequest request, ModelAndView modelview,Integer id) {
|
|
|
+ modelview.setViewName("/portal/htmlmap");
|
|
|
+ InputBannerDetails ibd=new InputBannerDetails(1,7);
|
|
|
+ OutBannerDetails o=new OutBannerDetails();
|
|
|
+ List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
|
|
|
+ o=list.size()>0?list.get(0):null;
|
|
|
+ modelview.addObject("banners",o);
|
|
|
+ InputNews inputNews = new InputNews();
|
|
|
+ List<OutNews> news = (List<OutNews>) newsService.listnewsDetails(inputNews, 5, 1).getList();
|
|
|
+ modelview.addObject("news",news);
|
|
|
+ return modelview;
|
|
|
+ }
|
|
|
/**
|
|
|
* 战略合作
|
|
|
* @param request
|
|
|
@@ -414,7 +429,7 @@ public class WebpageController extends BaseController {
|
|
|
InputNews in=new InputNews(type,1,1);
|
|
|
List<OutNews>list=(List<OutNews>) newsService.listnewsDetails(in, 4, 1).getList();
|
|
|
for (OutNews o : list) {
|
|
|
- o.setReleaseTimeConvert(DateUtils.formatDate(o.getReleaseTime(), AFTConstants.MMDD));
|
|
|
+ o.setReleaseTimeConvert(DateUtils.formatDate(o.getReleaseTime(), AFTConstants.YYYYMMDD));
|
|
|
o.setContent(displayRestriction(o.getContent()));
|
|
|
}
|
|
|
return list;
|