|
|
@@ -845,15 +845,9 @@ public class WebpageController extends BaseController {
|
|
|
.listNews(0, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
|
|
|
modelview.addObject("news", newsList);//资讯
|
|
|
//
|
|
|
- List<News> subscriptions = (List<News>) newsService
|
|
|
- .listNews(99, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
|
|
|
- modelview.addObject("subscription", subscriptions);//技淘观点精选
|
|
|
-
|
|
|
- if (subscriptions != null && subscriptions.size() > 0 && subscriptions.get(0).getSourceUrl() != null
|
|
|
- && subscriptions.get(0).getSourceUrl().contains(".")) {
|
|
|
- modelview.addObject("videoUrl", subscriptions.get(0).getSourceUrl());
|
|
|
- }
|
|
|
-
|
|
|
+ List<News> encyclopedias = (List<News>) newsService
|
|
|
+ .listNews(98, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
|
|
|
+ modelview.addObject("encyclopedias", encyclopedias);//技淘观点精选
|
|
|
//获得轮播图数据
|
|
|
List<Banners> blist = bannersService.findBannersList("index", 0, 4, 1);
|
|
|
if(null != blist){
|
|
|
@@ -862,32 +856,7 @@ public class WebpageController extends BaseController {
|
|
|
//视频
|
|
|
String url = adminVideoService.getIndexVideo(1).getUrl();//首页
|
|
|
modelview.addObject("vurl", url);
|
|
|
- // List<AchievementObject>
|
|
|
- // achievementObjects=achievementService.getHotAchievements(9, url,
|
|
|
- // "web_index");
|
|
|
- // modelview.addObject("achievements",achievementObjects);
|
|
|
- //
|
|
|
- //
|
|
|
- //
|
|
|
- //
|
|
|
- // List<DemandListBo> demandListBos=demandService.getHotDemand(9, url,
|
|
|
- // "web_index");
|
|
|
- // for(DemandListBo demandListBo:demandListBos) {
|
|
|
- // if(demandListBo.getPictureUrl()==null ||
|
|
|
- // !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
|
- // else
|
|
|
- // demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
|
|
|
- // }
|
|
|
- // //专家
|
|
|
- // List<UserIdentityBo>aExperts=userIdentityService.getExperts(8);
|
|
|
- // for(UserIdentityBo u:aExperts) {
|
|
|
- // if(u.getHeadPortraitUrl()!=null &&
|
|
|
- // u.getHeadPortraitUrl().length()<=0) {
|
|
|
- // u.setHeadPortraitUrl(null);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // modelview.addObject("experts",aExperts);
|
|
|
- // modelview.addObject("demands",demandListBos);
|
|
|
+
|
|
|
|
|
|
return modelview;
|
|
|
}
|
|
|
@@ -1641,7 +1610,6 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 新闻详情
|
|
|
- * @param request
|
|
|
* @param modelview
|
|
|
* @return
|
|
|
*/
|