|
|
@@ -427,7 +427,7 @@ public class WebpageController extends BaseController {
|
|
|
}
|
|
|
modelview.addObject("owner", owner);
|
|
|
modelview.addObject("pj", jtBusinessProject);
|
|
|
- System.out.println(jtBusinessProject.toString());
|
|
|
+ //System.out.println(jtBusinessProject.toString());
|
|
|
if (jtBusinessProject != null) {
|
|
|
JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
|
|
|
modelview.addObject("tree", tree);
|
|
|
@@ -474,7 +474,7 @@ public class WebpageController extends BaseController {
|
|
|
}
|
|
|
modelview.addObject("owner", owner);
|
|
|
modelview.addObject("pj", jtBusinessProject);
|
|
|
- System.out.println(jtBusinessProject.toString());
|
|
|
+ //System.out.println(jtBusinessProject.toString());
|
|
|
if (jtBusinessProject != null) {
|
|
|
JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
|
|
|
modelview.addObject("tree", tree);
|
|
|
@@ -504,7 +504,7 @@ public class WebpageController extends BaseController {
|
|
|
public ModelAndView demandList(HttpServletRequest request, ModelAndView modelview) {
|
|
|
String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
|
|
|
modelview.setViewName("/portal/technologyTrading/demandList");
|
|
|
- List<DemandListBo> boutiques = demandService.getHotDemand(3, url, "web_demand_list");
|
|
|
+ List<DemandListBo> boutiques = demandService.getHotDemand(3, url, "web_demand_list", 0);
|
|
|
modelview.addObject("boutiques", boutiques);
|
|
|
return modelview;
|
|
|
}
|
|
|
@@ -512,7 +512,7 @@ public class WebpageController extends BaseController {
|
|
|
@RequestMapping(value = "/portal/technologyTrading/achievementList", method = RequestMethod.GET)
|
|
|
public ModelAndView achievementList(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/technologyTrading/achievementList");
|
|
|
- List<AchievementObject> boutiques = achievementService.getBoutiquePatent(3);
|
|
|
+ List<AchievementObject> boutiques = achievementService.getBoutiquePatent(3,0);
|
|
|
modelview.addObject("boutiques", boutiques);
|
|
|
return modelview;
|
|
|
}
|
|
|
@@ -778,7 +778,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("urgentDemand3", urgentDemand3);
|
|
|
|
|
|
// 热点需求
|
|
|
- List<DemandListBo> hotDemand = demandService.getHotDemand(5, url, showLocation);
|
|
|
+ List<DemandListBo> hotDemand = demandService.getHotDemand(5, url, showLocation,0);
|
|
|
List<DemandListBo> hotDemand2 = hotDemand.subList(0, Math.min(2, hotDemand.size()));
|
|
|
List<DemandListBo> hotDemand3 = hotDemand.subList(Math.min(2, hotDemand.size()), Math.min(5, hotDemand.size()));
|
|
|
System.out.print("u2:" + hotDemand2.size() + " u3:" + hotDemand3.size());
|
|
|
@@ -859,7 +859,7 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
// 精品需求
|
|
|
List<DemandListBo> boutiqueDemandList = LimitLengthUtil
|
|
|
- .LimitListLengthRandomly(demandService.getHotDemand(10, url, "web_demand_list"), 3, 10);
|
|
|
+ .LimitListLengthRandomly(demandService.getHotDemand(10, url, "web_demand_list",0), 3, 10);
|
|
|
modelAndView.addObject("reboutiquedemand", boutiqueDemandList);
|
|
|
|
|
|
// 猜你喜欢
|
|
|
@@ -924,7 +924,7 @@ public class WebpageController extends BaseController {
|
|
|
modelAndView.addObject("achievementdetail", achievementObject);
|
|
|
// 精品
|
|
|
List<AchievementObject> boutiques = LimitLengthUtil
|
|
|
- .LimitListLengthRandomly(achievementService.getBoutiquePatent(10), 3, 10);
|
|
|
+ .LimitListLengthRandomly(achievementService.getBoutiquePatent(10,0), 3, 10);
|
|
|
modelAndView.addObject("reboutiqueachievement", boutiques);
|
|
|
|
|
|
// 猜你喜欢
|
|
|
@@ -1018,7 +1018,7 @@ public class WebpageController extends BaseController {
|
|
|
modelAndView.addObject("achievement", achievementObjects);
|
|
|
|
|
|
// 需求
|
|
|
- List<DemandListBo> demandListBos = demandService.getHotDemand(2, url, "web_demand_trading_index");
|
|
|
+ List<DemandListBo> demandListBos = demandService.getHotDemand(2, url, "web_demand_trading_index",0);
|
|
|
for (DemandListBo d : demandListBos) {
|
|
|
if (null != d.getFirstPic() && d.getFirstPic().contains(",")) {
|
|
|
d.setFirstPic(d.getFirstPic().substring(0, d.getFirstPic().indexOf(",")));
|
|
|
@@ -1193,43 +1193,4 @@ public class WebpageController extends BaseController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * 服务预览详情
|
|
|
- *
|
|
|
- * @param id String
|
|
|
- */
|
|
|
- @RequestMapping(value = "/portal/service/serviceDetailPreview", method = RequestMethod.GET)
|
|
|
- public ModelAndView portalServiceServiceDetailPreview(HttpServletRequest request, ModelAndView modelview, String id) {
|
|
|
- modelview.setViewName("/portal/service/serviceDetails");
|
|
|
- JtBusinessProject jtBusinessProject = jtBusinessService.getBusinessProjectDetail(id);
|
|
|
- if (jtBusinessProject != null) {
|
|
|
- if (jtBusinessProject.getMaxImgUrl() != null && jtBusinessProject.getMaxImgUrl().length() <= 0)
|
|
|
- jtBusinessProject.setMaxImgUrl(null);
|
|
|
- }
|
|
|
- if (jtBusinessProject.getCreateTime() != null
|
|
|
- && 7 >= differentDaysByMillisecond(jtBusinessProject.getCreateTime(), new Date())) {
|
|
|
- modelview.addObject("newly", true);
|
|
|
- } else
|
|
|
- modelview.addObject("newly", false);
|
|
|
- String owner = "平台管理员";
|
|
|
- if (jtBusinessProject.getOwnerId() != null) {
|
|
|
- User user = userService.selectByPrimaryKey(jtBusinessProject.getOwnerId());
|
|
|
- if (user != null && user.getIdentifyName() != null) {
|
|
|
- owner = user.getIdentifyName();
|
|
|
- }
|
|
|
- }
|
|
|
- modelview.addObject("owner", owner);
|
|
|
- modelview.addObject("pj", jtBusinessProject);
|
|
|
- if (jtBusinessProject != null) {
|
|
|
- JtBusinessCategoryTree tree = jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
|
|
|
- modelview.addObject("tree", tree);
|
|
|
- }
|
|
|
- JtBusinessCategory jtBusinessCategory = jtBusinessService.getCategoryById(jtBusinessProject.getCategoryId());
|
|
|
- if (jtBusinessCategory != null && jtBusinessCategory.getModule() != null)
|
|
|
- modelview.addObject("module", jtBusinessCategory.getModule());
|
|
|
- else
|
|
|
- modelview.addObject("module", 0);
|
|
|
-
|
|
|
- return modelview;
|
|
|
- }
|
|
|
-}
|
|
|
+}
|