|
@@ -25,6 +25,7 @@ import com.goafanti.common.model.IndustryCategory;
|
|
|
import com.goafanti.common.model.JtBusinessCategory;
|
|
import com.goafanti.common.model.JtBusinessCategory;
|
|
|
import com.goafanti.common.model.JtBusinessProject;
|
|
import com.goafanti.common.model.JtBusinessProject;
|
|
|
import com.goafanti.common.model.News;
|
|
import com.goafanti.common.model.News;
|
|
|
|
|
+import com.goafanti.common.model.Policy;
|
|
|
import com.goafanti.common.utils.LimitLengthUtil;
|
|
import com.goafanti.common.utils.LimitLengthUtil;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
@@ -39,6 +40,7 @@ import com.goafanti.user.service.UserIdentityService;
|
|
|
import com.goafanti.news.bo.NewsPortalList;
|
|
import com.goafanti.news.bo.NewsPortalList;
|
|
|
import com.goafanti.news.enums.NewsType;
|
|
import com.goafanti.news.enums.NewsType;
|
|
|
import com.goafanti.news.service.NewsService;
|
|
import com.goafanti.news.service.NewsService;
|
|
|
|
|
+import com.goafanti.news.service.PolicyService;
|
|
|
import com.goafanti.portal.bo.AchievementObject;
|
|
import com.goafanti.portal.bo.AchievementObject;
|
|
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
@@ -62,6 +64,9 @@ public class WebpageController extends BaseController {
|
|
|
@Resource
|
|
@Resource
|
|
|
private NewsService newsService;
|
|
private NewsService newsService;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private PolicyService policyService;
|
|
|
|
|
+
|
|
|
@Resource
|
|
@Resource
|
|
|
private JtBusinessService jtBusinessService;
|
|
private JtBusinessService jtBusinessService;
|
|
|
|
|
|
|
@@ -264,14 +269,16 @@ public class WebpageController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 服务汇
|
|
* 服务汇
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
|
|
|
public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/service/serviceIndex");
|
|
modelview.setViewName("/portal/service/serviceIndex");
|
|
|
//政策
|
|
//政策
|
|
|
- List<PolicyEntity>policyEntities=achievementService.getIntellectualProperty(8);
|
|
|
|
|
- modelview.addObject("policyList",policyEntities);
|
|
|
|
|
|
|
+// List<PolicyEntity>policyEntities=achievementService.getIntellectualProperty(8);
|
|
|
|
|
+ List<Policy>policies=(List<Policy>) policyService.searchPolicy(null, null, null, null, "web_tech_service_index", 1, 8).getList();
|
|
|
|
|
+ modelview.addObject("policyList",policies);
|
|
|
//新闻
|
|
//新闻
|
|
|
- List<News>news=newsService.getNewsList(5);
|
|
|
|
|
|
|
+ List<News>news=(List<News>) newsService.portalNewsList(5, 1, null, null, null, null).getList();
|
|
|
modelview.addObject("newsList",news);
|
|
modelview.addObject("newsList",news);
|
|
|
//高企服务
|
|
//高企服务
|
|
|
JtBusinessCategory gaoqi=jtBusinessService.getBusinessCategoryByLayerAndName(1, "高企服务");
|
|
JtBusinessCategory gaoqi=jtBusinessService.getBusinessCategoryByLayerAndName(1, "高企服务");
|
|
@@ -509,8 +516,10 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("projects",jtBusinessProjects);
|
|
modelview.addObject("projects",jtBusinessProjects);
|
|
|
List<AchievementObject> achievementObjects=achievementService.getHotAchievements(9, url, "web_index");
|
|
List<AchievementObject> achievementObjects=achievementService.getHotAchievements(9, url, "web_index");
|
|
|
modelview.addObject("achievements",achievementObjects);
|
|
modelview.addObject("achievements",achievementObjects);
|
|
|
- List<PolicyEntity> policyEntities=achievementService.getIntellectualProperty(4);
|
|
|
|
|
- modelview.addObject("policys",policyEntities);
|
|
|
|
|
|
|
+// List<PolicyEntity> policyEntities=achievementService.getIntellectualProperty(4);
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
|
|
+ List<Policy>policies=(List<Policy>) policyService.searchPolicy("", null, null, null, "web_index", 1, 4).getList();
|
|
|
|
|
+ modelview.addObject("policys",policies);
|
|
|
List<DemandListBo> demandListBos=demandService.getHotDemand(9, url, "web_index");
|
|
List<DemandListBo> demandListBos=demandService.getHotDemand(9, url, "web_index");
|
|
|
for(DemandListBo demandListBo:demandListBos) {
|
|
for(DemandListBo demandListBo:demandListBos) {
|
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
if(demandListBo.getPictureUrl()==null || !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
|
|
@@ -642,6 +651,7 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
|
//成果首页
|
|
//成果首页
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
|
|
|
public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
|
|
public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
|
|
|
String showLocation="web_achievement_main";
|
|
String showLocation="web_achievement_main";
|
|
@@ -665,8 +675,9 @@ public class WebpageController extends BaseController {
|
|
|
List<AchievementObject>practicalTechnology=achievementService.getPracticalTechnologys(8,url,showLocation);
|
|
List<AchievementObject>practicalTechnology=achievementService.getPracticalTechnologys(8,url,showLocation);
|
|
|
modelview.addObject("practicalTechnology",practicalTechnology);
|
|
modelview.addObject("practicalTechnology",practicalTechnology);
|
|
|
|
|
|
|
|
- List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
|
|
|
|
|
- modelview.addObject("policyList",intellectualPropertyPolicyList);
|
|
|
|
|
|
|
+// List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
|
|
|
|
|
+ List<Policy> policies=(List<Policy>) policyService.searchPolicy("", null, null, null, "web_index", 1, 5);
|
|
|
|
|
+ modelview.addObject("policyList",policies);
|
|
|
return modelview;
|
|
return modelview;
|
|
|
}
|
|
}
|
|
|
|
|
|