|
@@ -1,21 +1,17 @@
|
|
|
package com.goafanti.common.controller;
|
|
package com.goafanti.common.controller;
|
|
|
|
|
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-
|
|
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
-
|
|
|
|
|
import com.goafanti.achievement.service.AchievementInterestService;
|
|
import com.goafanti.achievement.service.AchievementInterestService;
|
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.banners.service.BannersService;
|
|
import com.goafanti.banners.service.BannersService;
|
|
@@ -701,7 +697,7 @@ public class WebpageController extends BaseController {
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/index")
|
|
@RequestMapping(value = "/portal/index")
|
|
|
public ModelAndView mainIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
public ModelAndView mainIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
|
- String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
|
|
|
|
|
|
|
+// String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
|
|
|
modelview.setViewName("/portal/index");
|
|
modelview.setViewName("/portal/index");
|
|
|
|
|
|
|
|
List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getCategoryBoList(1);
|
|
List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getCategoryBoList(1);
|
|
@@ -1121,7 +1117,7 @@ public class WebpageController extends BaseController {
|
|
|
return modelAndView;
|
|
return modelAndView;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void businessHelper(ModelAndView modelAndView, String categoryName,
|
|
|
|
|
|
|
+/* private void businessHelper(ModelAndView modelAndView, String categoryName,
|
|
|
List<JtBusinessCategory> jtBusinessCategories, int[] sizes) {
|
|
List<JtBusinessCategory> jtBusinessCategories, int[] sizes) {
|
|
|
for (int i = 0; i < jtBusinessCategories.size(); i++) {
|
|
for (int i = 0; i < jtBusinessCategories.size(); i++) {
|
|
|
List<JtBusinessProject> projects = jtBusinessService
|
|
List<JtBusinessProject> projects = jtBusinessService
|
|
@@ -1130,7 +1126,7 @@ public class WebpageController extends BaseController {
|
|
|
modelAndView.addObject(categoryName + "List" + i, projects);
|
|
modelAndView.addObject(categoryName + "List" + i, projects);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
|
|
public static int differentDaysByMillisecond(Date date1, Date date2) {
|
|
public static int differentDaysByMillisecond(Date date1, Date date2) {
|
|
|
int days = (int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24));
|
|
int days = (int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24));
|