更新导航顶部企业搜索方法

src/main/java/com/uas/platform/b2b/erp/controller/UserSpaceDetailController.java

@@ -1,8 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.sso.entity.UserSpaceView;
-import com.uas.sso.support.Page;
 import com.uas.platform.b2b.erp.model.B2BCustomer;
 import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.PageInfo;
@@ -21,6 +19,9 @@ import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.support.Page;
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -66,7 +67,7 @@ public class UserSpaceDetailController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	public Page<UserSpaceView> UserSpaceInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		Page<UserSpaceView> userSpaceDetails = new Page<UserSpaceView>();
+		Page<UserSpaceView> details = new Page<UserSpaceView>();
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		PageInfo pageInfo = FlexJsonUtils.fromJson(jsonStr, PageInfo.class);
 		com.uas.platform.core.model.PageParams params = new com.uas.platform.core.model.PageParams();
@@ -75,15 +76,11 @@ public class UserSpaceDetailController {
 		PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("searchstatus", Constant.YES);
 		try {
-			SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(pageInfo.getKeyword(),
-					pageParams);
-			userSpaceDetails.setContent(details.getContent());
-			userSpaceDetails.setNumber(details.getPage());
-			userSpaceDetails.setTotalElements(details.getTotalElement());
+			details = AccountUtils.getUserSpacesByKeyword(pageInfo.getKeyword(), params.getPage(), params.getCount());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return userSpaceDetails;
+		return details;
 	}
 	
 	/**

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

@@ -1,41 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.sso.entity.RequestStatus;
-import com.uas.sso.entity.UserSpaceView;
-import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.b2b.core.util.StringUtil;
 import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.DistributeDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.ProductMatchResultDao;
-import com.uas.platform.b2b.dao.ProductStatusDao;
-import com.uas.platform.b2b.dao.ProductTempDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
-import com.uas.platform.b2b.dao.RoleDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.UserOrderDao;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.model.Distribute;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.EnterpriseInfo;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductStatus;
-import com.uas.platform.b2b.model.ProductTemp;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.Role;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.UserBaseInfo;
-import com.uas.platform.b2b.model.UserOrders;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
@@ -43,12 +12,7 @@ import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.b2b.temporary.model.NewPurcOrder;
-import com.uas.platform.b2b.temporary.model.OrderItems;
-import com.uas.platform.b2b.temporary.model.PartStatus;
-import com.uas.platform.b2b.temporary.model.ProdInfo;
-import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
+import com.uas.platform.b2b.temporary.model.*;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -58,6 +22,10 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import com.uas.sso.entity.RequestStatus;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.support.Page;
+import com.uas.sso.util.AccountUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
@@ -70,12 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import javax.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service
 @Transactional
@@ -584,10 +547,12 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
 		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(keyword,
-				pageParams);
-		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
+//		SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(keyword,
+//				pageParams);
+		Page<UserSpaceView> details = AccountUtils.getUserSpacesByKeyword(keyword, params.getPage(), params.getCount());
+				SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
+
 		if (!CollectionUtils.isEmpty(details.getContent())) {
 			for (UserSpaceView detail : details.getContent()) {
 				UserSpaceDetail spacetDetail = new UserSpaceDetail();
@@ -598,37 +563,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 						spacetDetail.setUu(enterprises.get(0).getUu());
 					}
 				}
-				spacetDetail.setAddress(detail.getRegAddress());
-				spacetDetail.setAdminEmail(detail.getAdmin().getEmail());
-				spacetDetail.setAdminName(detail.getAdmin().getVipName());
-				spacetDetail.setAdminTel(detail.getAdmin().getMobile());
-//				spacetDetail.setApplyApps(detail.getApplyApps());
-//				spacetDetail.setApproveStatus(detail.getApproveStatus());
-				spacetDetail.setArea(detail.getArea());
-				spacetDetail.setBusinessCode(detail.getBusinessCode());
-				spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
-//				spacetDetail.setCity(detail.getci());
-				spacetDetail.setCorporation(detail.getCorporation());
-//				spacetDetail.setDistrict(detail.getDistrict());
-//				spacetDetail.setErrMsg(detail.getErrMsg());
-//				spacetDetail.setFax(detail.getFax());
-//				spacetDetail.setId(detail.getId());
-//				spacetDetail.setIndustry(detail.getIndustry());
-				spacetDetail.setLogoImage(detail.getLogoImage());
-				spacetDetail.setName(detail.getSpaceName());
-//				spacetDetail.setProvince(detail.getProvince());
-				spacetDetail.setRegisterDate(detail.getRegisterDate());
-//				spacetDetail.setShortName(detail.getShortName());
-//				spacetDetail.setStatus(detail.getStatus());
-//				spacetDetail.setStreet(detail.getStreet());
-//				spacetDetail.setTel(detail.getTel());
-//				spacetDetail.setType(detail.getType());
-//				spacetDetail.setUrl(detail.getUrl());
-//				spacetDetail.setContactEmail(detail.getContactEmail());
-//				spacetDetail.setContactTel(detail.getContactTel());
-//				spacetDetail.setContactMan(detail.getContactMan());
-				spacetDetail.setProfession(detail.getProfession());
-				spacetDetail.setTags(detail.getTags());
 				RequestStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
 						SystemSession.getUser().getEnterprise().getEnBussinessCode());
 				if (request != null) {
@@ -641,10 +575,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					spacetDetail.setCurrent(Constant.YES);
 					}
 				}
-				spaceDetails.add(spacetDetail);
+                BeanUtils.copyProperties(detail, spacetDetail, UserSpaceDetail.class);
+                spaceDetails.add(spacetDetail);
 			}
 			userSpaceDetails.setContent(spaceDetails);
-			userSpaceDetails.setTotalElement(details.getTotalElement());
+			userSpaceDetails.setTotalElement(details.getTotalElements());
 		}
 		return userSpaceDetails;
 	}

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

@@ -1,45 +1,19 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.sso.entity.UserSpaceView;
+import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.erp.model.*;
+import com.uas.platform.b2b.erp.model.EnterpriseNameAndUU;
 import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.support.*;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import org.json.JSONString;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.uas.sso.entity.UserSpaceDetail;
-import com.uas.sso.util.AccountUtils;
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.CommBufferedLogger;
+import com.uas.platform.b2b.support.SendMailService;
+import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.exception.SystemException;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
@@ -49,8 +23,23 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
+import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserSpaceView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
-import static com.sun.scenario.effect.impl.state.RenderState.EffectCoordinateSpace.UserSpace;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 /**
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录