物料个人物料获取数据方法更新

src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -88,7 +88,7 @@ public class BaseInfoController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**
@@ -123,7 +123,7 @@ public class BaseInfoController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**
@@ -157,7 +157,7 @@ public class BaseInfoController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/controller/ComponentController.java

@@ -30,10 +30,7 @@ public class ComponentController {
 	@RequestMapping(value = "/cmplist/{kindId}", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Component> getCmpListByKindId(@PathVariable("kindId") Long kindId, PageParams params, String keyword) {
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		//以当前获取的KindId做过滤条件
-		pageParams.getFilters().put("cmp_kiid", kindId);
-		return searchService.searchProductComponentCheckIds(keyword, pageParams);
+		return null;
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/controller/ProductController.java

@@ -65,7 +65,7 @@ public class ProductController {
 			List<Sort> sortList = new ArrayList<>();
 			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-			return searchService.searchProductsCheckIds(keyword, pageParams);
+			return ProductUtils.searchProducts(keyword, pageParams);
 		} else {
 			return null;
 		}
@@ -92,7 +92,7 @@ public class ProductController {
 			List<Sort> sortList = new ArrayList<>();
 			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-			return searchService.searchProductsCheckIds(keyword, pageParams);
+			return ProductUtils.searchProducts(keyword, pageParams);
 		} else {
 			return null;
 		}
@@ -115,7 +115,7 @@ public class ProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**
@@ -149,7 +149,7 @@ public class ProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**
@@ -181,7 +181,7 @@ public class ProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/controller/ProductUsersController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.ProductUsers;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -11,11 +12,11 @@ import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -28,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户个人产品库
@@ -56,8 +58,13 @@ public class ProductUsersController {
     @RequestMapping(method = RequestMethod.GET)
     public SPage<ProductUsers> getProductInfo(PageParams params, String keyword) {
         logger.log("查看个人物料", SystemSession.getUser().getUserName() + "查看了个人物料信息");
-        PageInfo pageInfo = new PageInfo(params);
-        return productUsersService.findProductInfoByPageInfo(pageInfo);
+        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+        Map<String, Object> filters = new HashedMap();
+        filters.put("enuu", SystemSession.getUser().getEnterprise().getUu());
+        filters.put("useruu", SystemSession.getUser().getUserUU());
+        pageParams.setFilters(filters);
+        SPage<ProductUsers> productUsersSPage = ProductUtils.searchProductUsers(keyword, pageParams);
+        return productUsersSPage;
     }
 
     /**
@@ -72,7 +79,7 @@ public class ProductUsersController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchProductUsersCheckIds(keyword, pageParams);
+        return ProductUtils.searchProductUsers(keyword, pageParams);
     }
 
     /**

src/main/java/com/uas/platform/b2b/controller/PurcProductController.java

@@ -190,7 +190,7 @@ public class PurcProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**
@@ -225,7 +225,7 @@ public class PurcProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**
@@ -258,7 +258,7 @@ public class PurcProductController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
+		return ProductUtils.searchProducts(keyword, pageParams);
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/dao/ProductUsersDao.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
+ * 个人物料
+ *
  * Created by hejq on 2017-11-08.
  */
 @Repository

src/main/java/com/uas/platform/b2b/model/ProductUsers.java

@@ -71,13 +71,6 @@ public class ProductUsers implements Serializable {
 
     }
 
-    public ProductUsers(Long prId, Long enUU, Long userUU, Date date) {
-        this.setPrid(prId);
-        this.setEnuu(enUU);
-        this.setUseruu(userUU);
-        this.setDate(date);
-    }
-
     public Long getId() {
         return id;
     }

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -13,6 +13,8 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.PageParams;
+import com.uas.search.b2b.model.SPage;
 import com.uas.sso.support.Page;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.http.protocol.HTTP;
@@ -476,6 +478,60 @@ public class ProductUtils {
         return null;
     }
 
+    /**
+     * 搜索物料资料
+     *
+     * @param pageParams 分页参数
+     * @param keyword 关键字
+     * @return
+     */
+    public static SPage<Product> searchProducts(String keyword, PageParams pageParams) {
+        Response res = null;
+        try {
+            JSONObject formData = JSON.parseObject(JSON.toJSONString(pageParams));
+            if (null != keyword) {
+                formData.put("keyword", keyword);
+            }
+            res = HttpUtil.sendGetRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/get/searchProducts", formData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (HttpStatus.OK.value() == res.getStatusCode()) {
+            return (SPage)JSONObject.parseObject(res.getResponseText(), new TypeReference<SPage<Product>>() {
+            }, new Feature[0]);
+        } else {
+            logger.error("searchProducts http response status error: " + res.getStatusCode());
+        }
+        return null;
+    }
+
+    /**
+     * 搜索个人物料资料
+     *
+     * @param pageParams 分页参数
+     * @param keyword 关键字
+     * @return
+     */
+    public static SPage<ProductUsers> searchProductUsers(String keyword, PageParams pageParams) {
+        Response res = null;
+        try {
+            JSONObject formData = JSON.parseObject(JSON.toJSONString(pageParams));
+            if (null != keyword) {
+                formData.put("keyword", keyword);
+            }
+            res = HttpUtil.sendGetRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/get/findProductUsers", formData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (HttpStatus.OK.value() == res.getStatusCode()) {
+            return (SPage)JSONObject.parseObject(res.getResponseText(), new TypeReference<SPage<ProductUsers>>() {
+            }, new Feature[0]);
+        } else {
+            logger.error("searchProducts http response status error: " + res.getStatusCode());
+        }
+        return null;
+    }
+
     /**
      * 将List转为StringBuffer
      *
@@ -564,4 +620,5 @@ public class ProductUtils {
         }
         return null;
     }
+
 }

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

@@ -54,7 +54,7 @@ public class RestTempSearchServiceImpl implements RestTempSearchService {
     @Override
     public SPage<Long> searchIds(String keyword, com.uas.search.b2b.service.SearchService.Table_name tableName, PageParams pageParams) throws SearchException {
         Map<String, Object> map = initSearchMap(tableName.toString(), keyword, pageParams);
-        String str = restTemplate.getForObject(SEARCH_URL + SearchUrl.ID_LIST_URL, String.class, map);
+        String str = restTemplate.getForObject("http://10.1.51.24:9000" + SearchUrl.ID_LIST_URL, String.class, map);
         if (StringUtils.isEmpty(str)) {
             return new SPage<>();
         } else {

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.search;
 
-import com.uas.sso.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.*;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
@@ -230,46 +229,6 @@ public class SearchController {
 		return searchService.searchPurchaseApCheckIds(keyword, pageParams);
 	}
 
-	/**
-	 * 物料信息表：products全部
-	 */
-	@RequestMapping("/products")
-	@ResponseBody
-	public SPage<Product> searchProductsCheckIds(String keyword, PageParams pageParams) {
-		return searchService.searchProductsCheckIds(keyword, pageParams);
-	}
-	
-	/**
-	 * 物料信息表：products标准
-	 */
-	@RequestMapping("/products_standard")
-	@ResponseBody
-	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams) {
-		return searchService.searchProductsStandardCheckIds(keyword, pageParams);
-	}
-
-	/**
-	 * 物料信息表：products非标准
-	 */
-	@RequestMapping("/products_nonstandard")
-	@ResponseBody
-	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams) {
-		return searchService.searchProductsNonStandardCheckIds(keyword, pageParams);
-	}
-
-	/**
-	 * 器件信息表
-	 * 
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	@RequestMapping("/component")
-	@ResponseBody
-	public SPage<Component> searchProductComponentCheckIds(String keyword,PageParams pageParams) {
-		return searchService.searchProductComponentCheckIds(keyword, pageParams);
-	}
-	
 	/**
 	 * 企业列表
 	 * 

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

@@ -284,41 +284,6 @@ public interface SearchService {
 	public com.uas.search.b2b.model.PageParams convertPageParams(com.uas.platform.core.model.PageParams params,
 			String searchFilter);
 
-	/**
-	 * 物料资料
-	 * 
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	public SPage<Product> searchProductsCheckIds(String keyword, PageParams pageParams);
-
-	/**
-	 * 物料资料（标准）
-	 * 
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams);
-
-	/**
-	 * 物料资料（非标准）
-	 * 
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams);
-
-	/**
-	 * 器件信息
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	public SPage<Component> searchProductComponentCheckIds(String keyword, PageParams pageParams);
-
 	/**
 	 * 企业列表
 	 * 
@@ -389,7 +354,7 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	public List<Map<String, Object>> getSimilarCustomers(String keyword);
+	List<Map<String, Object>> getSimilarCustomers(String keyword);
 
 	List<Map<String, Object>> getSimilarVendors(String keyword);
 
@@ -401,7 +366,7 @@ public interface SearchService {
 	 * @return
 	 * @throws Exception
 	 */
-	public SPage<UserSpaceView> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams) throws Exception;
+	SPage<UserSpaceView> searchUserSpaceDetailCheckIds(String keyword, PageParams pageParams) throws Exception;
 
 	/**
 	 * 企业圈联想词
@@ -410,7 +375,7 @@ public interface SearchService {
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Map<String, Object>> getSimilarEnterprise(String keyword) throws Exception;
+	List<Map<String, Object>> getSimilarEnterprise(String keyword) throws Exception;
 
 	/**
 	 * 平台询价单
@@ -419,7 +384,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<PurcInquiry> searchPurcInquiryCheckIds(String keyword, PageParams pageParams);
+	SPage<PurcInquiry> searchPurcInquiryCheckIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 平台询价单详情
@@ -428,7 +393,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<PurcInquiryItemInfo> searchPurcInquiryItemCheckIds(String keyword, PageParams pageParams);
+	SPage<PurcInquiryItemInfo> searchPurcInquiryItemCheckIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 通过关键词查询邀请记录
@@ -436,7 +401,7 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	public SPage<InvitationRecord> getInvitationByKeyword(String keyword, PageParams pageParams);
+	SPage<InvitationRecord> getInvitationByKeyword(String keyword, PageParams pageParams);
 
 	/**
 	 * 查看当前用户供应商企业信息
@@ -462,7 +427,7 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	public Kind getKindByKeyword(String keyword) throws Exception;
+	Kind getKindByKeyword(String keyword) throws Exception;
 
 	/**
 	 * 点击关键词返回客户信息
@@ -470,7 +435,7 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	public Vendor getCustByKeyword(String keyword);
+	Vendor getCustByKeyword(String keyword);
 
 	Page<B2BVendor> searchVendorForErp(String keyword, PageParams pageParams);
 
@@ -483,7 +448,7 @@ public interface SearchService {
 	 * @param pageParams
 	 * @return
 	 */
-	public SPage<SaleQuotationDone> searchSaleQuotationDoneIds(String keyword, PageParams pageParams);
+	SPage<SaleQuotationDone> searchSaleQuotationDoneIds(String keyword, PageParams pageParams);
 
 	/**
 	 * 查找投标提问单
@@ -501,15 +466,6 @@ public interface SearchService {
 	 */
 	SPage<VendorPerformanceAssess> searchVendorPerformanceAssesss(String keyword, PageParams pageParams);
 
-    /**
-     * 个人物料库
-     *
-     * @param keyword
-     * @param pageParams
-     * @return
-     */
-    SPage<ProductUsers> searchProductUsersCheckIds(String keyword, PageParams pageParams);
-
 	/**
 	 *  app查找客户采购询价单
 	 * @param keyword 关键词

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

@@ -8,7 +8,6 @@ import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.model.SaleTenderItemErp;
 import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.service.BrandService;
 import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.b2b.service.KindService;
@@ -183,9 +182,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private VendorPerformanceAssessDao vpaDao;
 
-	@Autowired
-    private ProductUsersDao productUsersDao;
-
 	@Autowired
 	private SaleTenderQuestionDao saleTenderQuestionDao;
 
@@ -766,48 +762,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
-	@Override
-	public SPage<Product> searchProductsCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.V$PRODUCTS, pageParams);
-		List<Product> content = new ArrayList<>();
-		// 超过1000就切割
-		if (idsPage.getContent().size() > SplitArray.QUERY_MAX_NUMBER) {
-			List<List<Long>> idLists = SplitArray.splitAry(idsPage.getContent(), SplitArray.QUERY_MAX_NUMBER);
-			for (List<Long> idList : idLists) {
-				List<Product> products = ProductUtils.findByIds(idList);
-				content.addAll(products);
-			}
-		} else {
-			content = ProductUtils.findByIds(idsPage.getContent());
-		}
-		sortByProperty(content, Product.class, "id", idsPage.getContent());
-		return toSPage(idsPage, content);
-	}
-
-	@Override
-	public SPage<Product> searchProductsStandardCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS_STANDARD, pageParams);
-		List<Product> content = ProductUtils.findByIds(idsPage.getContent());
-		sortByProperty(content, Product.class, "id", idsPage.getContent());
-		return toSPage(idsPage, content);
-	}
-
-	@Override
-	public SPage<Product> searchProductsNonStandardCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCTS_NONSTANDARD, pageParams);
-		List<Product> content = ProductUtils.findByIds(idsPage.getContent());
-		sortByProperty(content, Product.class, "id", idsPage.getContent());
-		return toSPage(idsPage, content);
-	}
-
-	@Override
-	public SPage<Component> searchProductComponentCheckIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCT$COMPONENT, pageParams);
-		List<Component> content = componentService.findAll(idsPage.getContent());
-		sortByProperty(content, Component.class, "id", idsPage.getContent());
-		return toSPage(idsPage, content);
-	}
-
 	@Override
 	public SPage<Enterprise> searchEnterpriseCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SEC$ENTERPRISES, pageParams);
@@ -1388,14 +1342,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
-    @Override
-    public SPage<ProductUsers> searchProductUsersCheckIds(String keyword, PageParams pageParams) {
-        SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCT$USERS, pageParams);
-        List<ProductUsers> content = productUsersDao.findAll(idsPage.getContent());
-        sortByProperty(content, ProductUsers.class, "id", idsPage.getContent());
-        return toSPage(idsPage, content);
-    }
-
 	/**
 	 * app查找客户采购询价单
 	 *

src/main/java/com/uas/platform/b2b/service/ComponentService.java

@@ -1,21 +1,11 @@
 package com.uas.platform.b2b.service;
 
 import com.uas.platform.b2b.model.Component;
-import com.uas.platform.core.model.PageParams;
-import com.uas.search.b2b.model.SPage;
 
 import java.util.List;
 
 public interface ComponentService {
 
-	/**
-	 * 通过kindId查询器件列表
-	 * 
-	 * @param kindid
-	 * @return
-	 */
-	SPage<Component> getCmpListByKindId(Long kindid, PageParams params, String keyword);
-
     Component findByUuid(String uuid) throws Exception;
 
 	List<Component> findAll(List<Long> content);

src/main/java/com/uas/platform/b2b/service/ProductUsersService.java

@@ -1,10 +1,7 @@
 package com.uas.platform.b2b.service;
 
 import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductUsers;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.search.b2b.model.SPage;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.ui.ModelMap;
 
@@ -17,26 +14,20 @@ import java.util.List;
  */
 public interface ProductUsersService {
 
-    /**
-     * 通过分页信息展示所有个人的物料（不搜索）
-     *
-     * @param pageInfo
-     * @return
-     */
-    SPage<ProductUsers> findProductInfoByPageInfo(PageInfo pageInfo);
-
     /**
      * 新增个人物料信息
      *
      * @param prodInfo
      * @return
+     * @throws Exception
      */
     ModelMap addNewProduct(Product prodInfo) throws Exception;
 
     /**
      * 通过id解除物料绑定关系
      *
-     * @param id
+     * @param id 个人物料对应id
+     * @throws Exception
      */
     void deleteById(Long id) throws Exception;
 
@@ -45,6 +36,7 @@ public interface ProductUsersService {
      *
      * @param workbook
      * @return
+     * @throws IllegalOperatorException
      */
     ModelMap releaseByWorkbook(Workbook workbook) throws IllegalOperatorException;
 
@@ -52,6 +44,7 @@ public interface ProductUsersService {
      * 批量转入我的产品库
      *
      * @param ids
+     * @throws Exception
      */
     ModelMap coverToUserProd(String ids) throws Exception;
 
@@ -59,12 +52,14 @@ public interface ProductUsersService {
      * 单个转入我的物料
      *
      * @param id
+     * @throws Exception
      */
     void coverToUserProd(Long id) throws Exception;
 
     /**
      * 批量删除我的产品
      * @param idList
+     * @throws Exception
      */
     void deleteByBatch(List<Long> idList) throws Exception;
 
@@ -74,6 +69,7 @@ public interface ProductUsersService {
      * @param id
      * @param enuu
      * @param useruu
+     * @param method
      */
     void coverToMyProduct(Long id, Long enuu, Long useruu, String method);
 }

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

@@ -723,7 +723,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<Product> sproducts = searchService.searchProductsCheckIds(keyword, pageParams);
+		SPage<Product> sproducts = ProductUtils.searchProducts(keyword, pageParams);
 		List<Product> products = sproducts.getContent();
 		List<ProdInfo> prodInfos = new ArrayList<ProdInfo>();
 		if (!CollectionUtils.isEmpty(products)) {

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

@@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Component;
 import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.b2b.support.SysConf;
-import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.HttpUtil;
-import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,11 +18,6 @@ public class ComponentServiceImpl implements ComponentService {
 	@Autowired
 	private SysConf conf;
 
-	@Override
-	public SPage<Component> getCmpListByKindId(Long kindid, PageParams params, String keyword) {
-		return null;
-	}
-
 	@Override
 	public Component findByUuid(String uuid) throws Exception {
         HttpUtil.Response res = HttpUtil.sendGetRequest(conf.getB2c() + "/api/product/component/Info/" + uuid, null);

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

@@ -19,8 +19,6 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.search.b2b.model.SPage;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -28,22 +26,18 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
+ * 个人物料
+ *
  * Created by hejq on 2017-11-08.
  */
 @Service
@@ -68,30 +62,6 @@ public class ProductUsersServiceImpl implements ProductUsersService {
      */
     private final static Integer MAX_ROWNUM = 5000;
 
-    @Override
-    public SPage<ProductUsers> findProductInfoByPageInfo(PageInfo pageInfo) {
-        Page<ProductUsers> products = findAllProudctByPageInfo(pageInfo);
-        SPage<ProductUsers> prods = new SPage<ProductUsers>();
-        prods.setContent(products.getContent());
-        prods.setPage(products.getNumber());
-        prods.setSize(products.getSize());
-        prods.setTotalElement(products.getTotalElements());
-        prods.setTotalPage(products.getTotalPages());
-        return prods;
-    }
-
-    private Page<ProductUsers> findAllProudctByPageInfo(final PageInfo pageInfo) {
-        return productUsersDao.findAll(new Specification<ProductUsers>() {
-            @Override
-            public Predicate toPredicate(Root<ProductUsers> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                pageInfo.filter("enuu", SystemSession.getUser().getEnterprise().getUu());
-                pageInfo.filter("useruu", SystemSession.getUser().getUserUU());
-                query.where(pageInfo.getPredicates(root, query, builder));
-                return null;
-            }
-        }, pageInfo);
-    }
-
     @Override
     public ModelMap addNewProduct(Product prodInfo) throws Exception {
         ModelMap map = new ModelMap();
@@ -128,7 +98,6 @@ public class ProductUsersServiceImpl implements ProductUsersService {
                     if (products.size() != 0) {
                         prodInfo.setCode(code);
                     }
-
                 }
                 List<Role> roles = roleService.findByEnUUAndUserUU(enuu, useruu);
                 if (!CollectionUtils.isEmpty(roles)) {

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -539,8 +539,8 @@
                 <a class="offer" ng-click="">已报价</a>
             </td>
             <td ng-if="inquiryItem.quoted != 1">
-                <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.overdue != 1 && currentEn.uu != inquiryItem.inquiry.enUU">主动报价</a>
-                <a style="color: #999" ng-if="currentEn.uu == inquiryItem.inquiry.enUU" ng-click="transtoInquiry(inquiryItem)">主动报价</a>
+                <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="inquiryItem.remainingTime > 0 && inquiryItem.overdue != 1 && currentEn.uu != inquiryItem.inquiry.enUU">报价</a>
+                <a style="color: #999" ng-if="currentEn.uu == inquiryItem.inquiry.enUU" ng-click="transtoInquiry(inquiryItem)">报价</a>
                 <a class="offer" ng-if="inquiryItem.remainingTime <= 0 || inquiryItem.overdue == 1 || !isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已结束</a>
             </td>
         </tr>

src/test/java/com/uas/platform/b2b/purc/PurchaseNotify.java

@@ -140,4 +140,5 @@ public class PurchaseNotify extends BaseJunitTest {
         Page<Product> productPage = ProductUtils.findByPageInfo(pageInfo, null);
         System.out.println(productPage);
     }
+
 }