Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/ps/product/controller/ProductGetController.java

@@ -7,6 +7,7 @@ import com.uas.ps.entity.ProductUsers;
 import com.uas.ps.product.entity.InviteProdInfo;
 import com.uas.ps.product.entity.ProductPrivateView;
 import com.uas.ps.product.search.model.PageParams;
+import com.uas.ps.product.search.service.RestTempSearchService;
 import com.uas.ps.product.service.ProductService;
 import com.uas.ps.product.search.model.SPage;
 import com.uas.ps.product.search.service.SearchService;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +42,14 @@ public class ProductGetController {
     @Autowired
     private ProductUsersService productUsersService;
 
+    @Autowired
+    private RestTempSearchService restTempSearchService;
+
+    /**
+     * 物料信息表
+     */
+    final String PRODUCT_TABLE_NAME = "v$product$private";
+
     /**
      * 根据enUU和code查找企业物料
      * @param enUU  企业UU
@@ -100,16 +110,42 @@ public class ProductGetController {
      * @param filters 过滤条件（包含）
      * @param notEqualFilters 过滤条件（不包含）
      * @param keyword 关键字
-     * @return
+     * @return SPage<Product>
      */
     @RequestMapping(value = "/searchProducts", method = RequestMethod.GET)
-    public SPage<Product> searchProducts(int page, int size, String filters, String notEqualFilters, String keyword) {
+    public SPage<Product> searchProducts(int page, int size, String filters, String notEqualFilters, String keyword, String keywordSearchColumns) {
         Map<String, Object> equalMap = JSON.parseObject(filters);
         Map<String, Object> notEqualMap = JSON.parseObject(notEqualFilters);
-        PageParams pageParams = new PageParams(page, size, equalMap, notEqualMap);
+        List<String> searchColumns = new ArrayList<>();
+        if (null != keywordSearchColumns) {
+            searchColumns = JSON.parseArray(keywordSearchColumns, String.class);
+        }
+        PageParams pageParams = new PageParams(page, size, equalMap, notEqualMap, searchColumns);
         return searchService.searchProducts(keyword, pageParams);
     }
 
+    /**
+     * 物料搜索接口
+     *
+     * @param page 页码
+     * @param size 大小
+     * @param filters 过滤条件（包含）
+     * @param notEqualFilters 过滤条件（不包含）
+     * @param keyword 关键字
+     * @return SPage<Integer>
+     */
+    @RequestMapping(value = "/searchProductIds", method = RequestMethod.GET)
+    public SPage<Integer> searchProductIds(int page, int size, String filters, String notEqualFilters, String keyword, String keywordSearchColumns) {
+        Map<String, Object> equalMap = JSON.parseObject(filters);
+        Map<String, Object> notEqualMap = JSON.parseObject(notEqualFilters);
+        List<String> searchColumns = new ArrayList<>();
+        if (null != keywordSearchColumns) {
+            searchColumns = JSON.parseArray(keywordSearchColumns, String.class);
+        }
+        PageParams pageParams = new PageParams(page, size, equalMap, notEqualMap, searchColumns);
+        return restTempSearchService.searchIds(keyword, PRODUCT_TABLE_NAME, pageParams);
+    }
+
     /**
      * 根据分页信息查找个人物料
      *
@@ -123,7 +159,7 @@ public class ProductGetController {
     public SPage<ProductUsers> findProductUsersByPageInfo(int page, int size, String filters, String notEqualFilters, Sort sort, String keyword) {
         Map<String, Object> equalMap = JSON.parseObject(filters);
         Map<String, Object> notEqualMap = JSON.parseObject(notEqualFilters);
-        PageParams pageParams = new PageParams(page, size, equalMap, notEqualMap);
+        PageParams pageParams = new PageParams(page, size, equalMap, notEqualMap, null);
         if (StringUtils.isEmpty(keyword)) {
             PageInfo pageInfo = new PageInfo(page, size);
             for (Map.Entry<String, Object> map : equalMap.entrySet()) {

src/main/java/com/uas/ps/product/search/model/PageParams.java

@@ -58,11 +58,12 @@ public class PageParams implements Serializable {
      * @param filters 过滤条件（包含）
      * @param notEqualFilters 过滤条件（不包含）
      */
-	public PageParams(int page, int size, Map<String, Object> filters, Map<String, Object> notEqualFilters) {
+	public PageParams(int page, int size, Map<String, Object> filters, Map<String, Object> notEqualFilters, List<String> keywordSearchColumns) {
 		this.page = page;
 		this.size = size;
 		this.filters = filters;
 		this.notEqualFilters = notEqualFilters;
+		this.keywordSearchColumns = keywordSearchColumns;
 	}
 
 	public int getPage() {

src/main/java/com/uas/ps/product/search/model/SearchUrl.java

@@ -11,7 +11,8 @@ public class SearchUrl {
     /**
      * 获取id链接
      */
-    public static final String ID_LIST = "/search/productIds/b2b?keyword={keyword}&tableName={tableName}&page={page}&size={size}" +
+    public static final String ID_LIST = "/search/productIds/b2b?keywordSearchColumns={keywordSearchColumns}&keyword={keyword}" +
+            "&tableName={tableName}&page={page}&size={size}" +
             "&filters={filters}&multiValueField={multiValueField}&sort={sort}" +
             "&notEqualFilters={notEqualFilters}&multiValueNotField={multiValueNotField}";
 

src/main/java/com/uas/ps/product/search/service/RestTempSearchServiceImpl.java

@@ -9,6 +9,7 @@ import com.uas.ps.product.search.model.*;
 import com.uas.ps.properties.UrlProperties;
 import net.sf.ehcache.search.SearchException;
 import org.apache.commons.collections.map.HashedMap;
+import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -115,6 +116,11 @@ public class RestTempSearchServiceImpl implements RestTempSearchService {
         map.put("multiValueField", CollectionUtils.isEmpty(valueFields) ? "" : FlexJsonUtils.toJsonDeep(valueFields));
         map.put("multiValueNotField", CollectionUtils.isEmpty(valueNotFields) ? "" : FlexJsonUtils.toJsonDeep(valueNotFields));
         map.put("filters", JSON.toJSONString(pageParams.getFilters()));
+        if (!CollectionUtils.isEmpty(pageParams.getKeywordSearchColumns())) {
+            map.put("keywordSearchColumns", org.apache.tomcat.util.buf.StringUtils.join(pageParams.getKeywordSearchColumns()));
+        } else  {
+            map.put("keywordSearchColumns", null);
+        }
         return map;
     }
 }