更新企业圈搜索方法，改为建立索引搜索

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7948 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -76,9 +76,9 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 				}
 			}
 			feePleaseDetails = feePleaseDetailDao.save(feeDetails);
-			id = feePleaseDetails.get(0).getFeePlease().getFp_id();
-			if (feePleaseDetails.get(0).getFpd_id() != null) {
+			if (!CollectionUtils.isEmpty(feePleaseDetails)) {
 				map.put("success", true);
+				id = feePleaseDetails.get(0).getFeePlease().getFp_id();
 				map.put("fp_id", id);
 			} else {
 				map.put("success", false);
@@ -162,6 +162,7 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 						operation = appFlowOperationDao.save(operation);
 						if (operation.getId() != null) {
 							if (id != null) {
+								System.out.println(id + "->id");
 								feePlease = feePleaseDao.findOne(id);
 								feePlease.setFp_status(MobileStatus.COMMITED.getPhrase());
 								feePlease.setFp_statuscode(MobileStatus.COMMITED.name());

src/main/java/com/uas/platform/b2b/search/SearchController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.Component;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.Enterprise;
@@ -290,6 +291,21 @@ public class SearchController {
 		return searchService.searchEnterpriseCheckIds(keyword, pageParams);
 	}
 
+	/**
+	 * 企业圈
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping("/userspacedetail")
+	@ResponseBody
+	public SPage<UserSpaceDetail> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams)
+			throws Exception {
+		return searchService.searchUserSpaceDetailCheckIds(keyword, pageParams);
+	}
+
 	/**
 	 * 代采订单
 	 * 

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.search;
 import java.util.List;
 import java.util.Map;
 
+import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.Component;
 import com.uas.platform.b2b.model.DeputyOrder;
 import com.uas.platform.b2b.model.Enterprise;
@@ -355,4 +356,14 @@ public interface SearchService {
 	Vendor getVendorByEnname(String keyword);
 
 	List<Map<String, Object>> getSimilarVendors(String keyword);
+
+	/**
+	 * 企业圈
+	 * 
+	 * @param keyword
+	 * @param pageParams
+	 * @return
+	 * @throws Exception
+	 */
+	public SPage<UserSpaceDetail> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams) throws Exception;
 }

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.account.entity.UserSpaceDetail;
+import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.dao.BrandDao;
 import com.uas.platform.b2b.dao.ComponentDao;
 import com.uas.platform.b2b.dao.DeputyOrderDao;
@@ -828,4 +830,13 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return vendors;
 	}
 
+	@Override
+	public SPage<UserSpaceDetail> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams)
+			throws Exception {
+		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.AC$US$DETAIL, pageParams);
+		List<UserSpaceDetail> content = AccountUtils.findAll(idsPage.getContent().toString());
+		sortByProperty(content, UserSpaceDetail.class, "id", idsPage.getContent());
+		return toSPage(idsPage, content);
+	}
+
 }

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import com.uas.account.entity.RequsetStatus;
-import com.uas.account.support.Page;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.CartDetailDao;
@@ -420,8 +419,12 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 
 	@Override
 	public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword) throws Exception {
-		Page<com.uas.account.entity.UserSpaceDetail> details = AccountUtils.getUserSpacesByKeyword(keyword,
-				params.getPage(), params.getCount());
+		// Page<com.uas.account.entity.UserSpaceDetail> details =
+		// AccountUtils.getUserSpacesByKeyword(keyword,
+		// params.getPage(), params.getCount());
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		SPage<com.uas.account.entity.UserSpaceDetail> details = searchService.searchUserSpaceDetailCheckIds(keyword,
+				pageParams);
 		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
 		if (!CollectionUtils.isEmpty(details.getContent())) {
@@ -468,7 +471,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				spaceDetails.add(spacetDetail);
 			}
 			userSpaceDetails.setContent(spaceDetails);
-			userSpaceDetails.setTotalElement(details.getTotalElements());
+			userSpaceDetails.setTotalElement(details.getTotalElement());
 		}
 		return userSpaceDetails;
 	}