ソースを参照

Merge remote-tracking branch 'origin/test'

limin 7 年 前
コミット
4e357d9b48

+ 10 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1386,6 +1386,16 @@ public class WebpageController extends BaseController {
 		res.setData(globalSearchService.globalSearchList(name,pageNo,pageSize));
 		return res;
 	}
+	/**
+	 * 手机网站全局搜索
+	 */
+	@RequestMapping(value = "/api/portal/globalSearch", method = RequestMethod.GET)
+	@ResponseBody
+	public Result appWebGlobalSearch(String  name,String keyword,Integer pageSize,Integer pageNo) {
+		Result res = new Result();
+		res.setData(globalSearchService.globalSearchList(name,pageNo,pageSize));
+		return res;
+	}
 	
 	/**
 	 * 知识产权维权

+ 0 - 11
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -1,7 +1,5 @@
 package com.goafanti.portal.controller;
 
-import java.math.BigDecimal;
-import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -11,19 +9,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
-import com.goafanti.common.enums.AchievementMaturity;
-import com.goafanti.common.enums.DemandPortalSearchSignType;
-import com.goafanti.common.enums.UserLevel;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.service.DemandService;
-import com.goafanti.portal.bo.AchievementSearchListBo;
-import com.goafanti.portal.bo.BoutiqueListBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;