|
|
@@ -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;
|
|
|
@@ -41,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
|
|
|
@@ -101,7 +110,7 @@ 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, String keywordSearchColumns) {
|
|
|
@@ -115,6 +124,28 @@ public class ProductGetController {
|
|
|
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);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 根据分页信息查找个人物料
|
|
|
*
|