|
|
@@ -251,22 +251,29 @@ public class PortalController extends BaseController {
|
|
|
|
|
|
//查询精品成果
|
|
|
List<AchievementListBo> boutiqueAchievement = achievementService.getAchievement(1);
|
|
|
- List<AchievementListBo> ReboutiqueAchievement = null;
|
|
|
- int index1=(int)(1+Math.random()*(12-1+1));
|
|
|
- int index2=(int)(1+Math.random()*(12-1+1));
|
|
|
- int index3=(int)(1+Math.random()*(12-1+1));
|
|
|
+ List<AchievementListBo> reboutiqueAchievement = null;
|
|
|
+ int index=(int)(1+Math.random()*(10-1+1));
|
|
|
|
|
|
for (int i = 0; i < boutiqueAchievement.size(); i++) {
|
|
|
- ReboutiqueAchievement.add(boutiqueAchievement.get(index1));
|
|
|
- ReboutiqueAchievement.add(boutiqueAchievement.get(index2));
|
|
|
- ReboutiqueAchievement.add(boutiqueAchievement.get(index3));
|
|
|
+ reboutiqueAchievement.add(boutiqueAchievement.get(index));
|
|
|
+ reboutiqueAchievement.add(boutiqueAchievement.get(index++));
|
|
|
+ reboutiqueAchievement.add(boutiqueAchievement.get(index+2));
|
|
|
};
|
|
|
|
|
|
//判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
|
|
|
boolean isLogin = TokenManager.isLogin();
|
|
|
+ List<AchievementListBo> achievementlist = achievementService.getAchievement(0);//查询所有专利
|
|
|
+ List<AchievementListBo> reachievementlist = null;
|
|
|
+ for (int i = 0; i < achievementlist.size(); i++) {
|
|
|
+ reachievementlist.add(boutiqueAchievement.get(index));
|
|
|
+ reachievementlist.add(boutiqueAchievement.get(index+1));
|
|
|
+ reachievementlist.add(boutiqueAchievement.get(index+2));
|
|
|
+ reachievementlist.add(boutiqueAchievement.get(index+3));
|
|
|
+ };
|
|
|
+ List<AchievementListBo> customerLikelist = achievementService.getPerhapLike();//猜你喜欢专利
|
|
|
+
|
|
|
|
|
|
if(isLogin) {
|
|
|
- List<AchievementListBo> CustomerLike = achievementService.getPerhapLike();
|
|
|
}else {
|
|
|
|
|
|
}
|
|
|
@@ -274,7 +281,7 @@ public class PortalController extends BaseController {
|
|
|
|
|
|
mv.setViewName("/portal/detail/achievementDetail");
|
|
|
mv.addObject("achievement", achievementdetail);
|
|
|
- mv.addObject("ReboutiqueAchievement", ReboutiqueAchievement);
|
|
|
+ mv.addObject("ReboutiqueAchievement", reboutiqueAchievement);
|
|
|
return mv;
|
|
|
}
|
|
|
|