|
|
@@ -1,177 +1,247 @@
|
|
|
package com.goafanti.common.controller;
|
|
|
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
import org.springframework.web.servlet.view.RedirectView;
|
|
|
|
|
|
+import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.admin.service.AdminService;
|
|
|
+import com.goafanti.common.enums.UserType;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.User;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import com.goafanti.demand.service.DemandService;
|
|
|
+import com.goafanti.portal.bo.AchievementPortalDetailBo;
|
|
|
+import com.goafanti.portal.bo.DemandPortalDetailBo;
|
|
|
+import com.goafanti.portal.bo.DemandPortalSimilarListBo;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@Controller
|
|
|
public class WebpageController extends BaseController {
|
|
|
@Resource
|
|
|
- private UserService userService;
|
|
|
-
|
|
|
+ private UserService userService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private AdminService adminService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private DemandService demandService;
|
|
|
+
|
|
|
@Resource
|
|
|
- private AdminService adminService;
|
|
|
-
|
|
|
- @RequestMapping(value = "user/account/index", method = RequestMethod.GET)
|
|
|
+ private AchievementService achievementService;
|
|
|
+
|
|
|
+ @RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
|
|
|
public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/account/index");
|
|
|
+ return userLogin(request, modelview, "/user/account/index");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/account/set", method = RequestMethod.GET)
|
|
|
public ModelAndView userSet(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/account/set");
|
|
|
+ return userLogin(request, modelview, "/user/account/set");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/account/achievement", method = RequestMethod.GET)
|
|
|
public ModelAndView userAchievement(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/account/achievement");
|
|
|
+ return userLogin(request, modelview, "/user/account/achievement");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/account/demand", method = RequestMethod.GET)
|
|
|
public ModelAndView userDemand(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/account/demand");
|
|
|
+ return userLogin(request, modelview, "/user/account/demand");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/login", method = RequestMethod.GET)
|
|
|
public String userLogin(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return "/user/login";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/logout", method = RequestMethod.GET)
|
|
|
public String userLogout(HttpServletRequest request, ModelAndView modelview) {
|
|
|
TokenManager.logout();
|
|
|
return userLogin(request, modelview);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/signIn", method = RequestMethod.GET)
|
|
|
public String userSignin(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return "/user/signIn";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/certify", method = RequestMethod.GET)
|
|
|
public ModelAndView userCertify(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/certify");
|
|
|
+ return userLogin(request, modelview, "/user/certify");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/groupCertify", method = RequestMethod.GET)
|
|
|
public ModelAndView userGroupCertify(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/groupCertify");
|
|
|
+ return userLogin(request, modelview, "/user/groupCertify");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/index", method = RequestMethod.GET)
|
|
|
public ModelAndView userIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/index");
|
|
|
+ return userLogin(request, modelview, "/user/index");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
|
|
|
public ModelAndView userSubscriberDetail(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/subscriberDetail");
|
|
|
+ return userLogin(request, modelview, "/user/subscriberDetail");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/user/account/services", method = RequestMethod.GET)
|
|
|
public ModelAndView userServices(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return userLogin(request,modelview,"/user/account/services");
|
|
|
- }
|
|
|
-
|
|
|
- /*@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
|
|
|
- public String adminIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return "/admin/index";
|
|
|
- }*/
|
|
|
-
|
|
|
+ return userLogin(request, modelview, "/user/account/services");
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * @RequestMapping(value = "/admin/index", method = RequestMethod.GET)
|
|
|
+ * public String adminIndex(HttpServletRequest request, ModelAndView
|
|
|
+ * modelview) { return "/admin/index"; }
|
|
|
+ */
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/login", method = RequestMethod.GET)
|
|
|
public String adminLogin(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return "/admin/login";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/demand", method = RequestMethod.GET)
|
|
|
public String adminDemand(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return "/admin/demand";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/achievement", method = RequestMethod.GET)
|
|
|
public String adminAchievement(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return "/admin/achievement";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/set", method = RequestMethod.GET)
|
|
|
public String adminSet(HttpServletRequest request, ModelAndView modelview) {
|
|
|
return "/admin/set";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/userManage", method = RequestMethod.GET)
|
|
|
public ModelAndView adminUserManage(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/userManage");
|
|
|
+ return adminToLogin(request, modelview, "/admin/userManage");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/servicesManage/technology", method = RequestMethod.GET)
|
|
|
public ModelAndView adminServicesManageTechnology(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/servicesManage/technology");
|
|
|
+ return adminToLogin(request, modelview, "/admin/servicesManage/technology");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/servicesManage/patent", method = RequestMethod.GET)
|
|
|
public ModelAndView adminServicesManagePatent(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/servicesManage/patent");
|
|
|
+ return adminToLogin(request, modelview, "/admin/servicesManage/patent");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/servicesManage/contract", method = RequestMethod.GET)
|
|
|
public ModelAndView adminServicesManageContract(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/servicesManage/contract");
|
|
|
+ return adminToLogin(request, modelview, "/admin/servicesManage/contract");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/servicesManage/highTech", method = RequestMethod.GET)
|
|
|
public ModelAndView adminServicesManageHighTech(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/servicesManage/highTech");
|
|
|
+ return adminToLogin(request, modelview, "/admin/servicesManage/highTech");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/servicesManage/highTechInfo", method = RequestMethod.GET)
|
|
|
public ModelAndView adminServicesManageHighTechInfo(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/servicesManage/highTechInfo");
|
|
|
+ return adminToLogin(request, modelview, "/admin/servicesManage/highTechInfo");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/servicesManage/copyright", method = RequestMethod.GET)
|
|
|
public ModelAndView adminServicesManageCopyright(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/servicesManage/copyright");
|
|
|
+ return adminToLogin(request, modelview, "/admin/servicesManage/copyright");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
|
|
|
public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- return adminToLogin(request,modelview,"/admin/index");
|
|
|
+ return adminToLogin(request, modelview, "/admin/index");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
|
|
|
public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/search/achievement");
|
|
|
return modelview;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/portal/search/demand", method = RequestMethod.GET)
|
|
|
public ModelAndView portalSearchDemand(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/search/demand");
|
|
|
return modelview;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/portal/search/subscriber", method = RequestMethod.GET)
|
|
|
public ModelAndView portalSearchSubscriber(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/search/subscriber");
|
|
|
return modelview;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 科技需求详情
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/portal/detail/demandDetail", method = RequestMethod.GET)
|
|
|
+ public ModelAndView portalDemandDetail(String id, Integer type) {
|
|
|
+ ModelAndView mv = new ModelAndView();
|
|
|
+ DemandPortalDetailBo demand = null;
|
|
|
+ if (UserType.PERSONAL.getCode().equals(type)) {
|
|
|
+ demand = demandService.findUserPortalDemandDetail(id);
|
|
|
+ } else if (UserType.ORGANIZATION.getCode().equals(type)) {
|
|
|
+ demand = demandService.findOrgPortalDemandDetail(id);
|
|
|
+ }
|
|
|
+ if (null != demand) {
|
|
|
+ String keyword = demand.getKeyword();
|
|
|
+ if (StringUtils.isNotBlank(keyword)) {
|
|
|
+ demand.setKeywordList(Arrays.asList(keyword.trim().split(",|,")));
|
|
|
+ }
|
|
|
+ Integer industryCategoryA = demand.getIndustryCategoryA();
|
|
|
+ if (null != industryCategoryA) {
|
|
|
+ List<DemandPortalSimilarListBo> similarList = demandService.findByIndustryCategoryA(industryCategoryA,
|
|
|
+ demand.getId());
|
|
|
+ mv.addObject("similarList", similarList);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ mv.setViewName("/portal/detail/demandDetail");
|
|
|
+ mv.addObject("demand", demand);
|
|
|
+
|
|
|
+ return mv;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 科技成果详情
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/portal/detail/achievementDetail", method = RequestMethod.GET)
|
|
|
+ public ModelAndView portalAchievementDetail(String id, Integer type) {
|
|
|
+ ModelAndView mv = new ModelAndView();
|
|
|
+ AchievementPortalDetailBo achievement = null;
|
|
|
+ if (UserType.PERSONAL.getCode().equals(type)) {
|
|
|
+ achievement = achievementService.findUserPortalAchievementDetail(id);
|
|
|
+ } else if (UserType.ORGANIZATION.getCode().equals(type)) {
|
|
|
+ achievement = achievementService.findOrgPortalAchievementDetail(id);
|
|
|
+ }
|
|
|
+ if (null != achievement){
|
|
|
+ String keyword = achievement.getKeyword();
|
|
|
+ if (StringUtils.isNotBlank(keyword)) {
|
|
|
+ achievement.setKeywordList(Arrays.asList(keyword.trim().split(",|,")));
|
|
|
+ }
|
|
|
+ Integer fieldA = achievement.getFieldA();
|
|
|
+ if (null != fieldA){
|
|
|
+ //List<AchievementPortalSimilarListBo>
|
|
|
+ }
|
|
|
+ }
|
|
|
+ mv.setViewName("/portal/detail/achievementDetail");
|
|
|
+
|
|
|
+ //if
|
|
|
+ return mv;
|
|
|
+ }
|
|
|
+
|
|
|
private ModelAndView userLogin(HttpServletRequest request, ModelAndView modelview, String next) {
|
|
|
String key = TokenManager.getUserId();
|
|
|
if (!TokenManager.isLogin() || key == null || key == "") {
|
|
|
@@ -186,7 +256,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.setViewName(next);
|
|
|
return modelview;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
private ModelAndView adminToLogin(HttpServletRequest request, ModelAndView modelview, String next) {
|
|
|
String key = TokenManager.getAdminId();
|
|
|
if (!TokenManager.isLogin() || key == null || key == "") {
|