更新搜索方式为HTTP请求方式

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

@@ -85,7 +85,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -120,7 +120,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -154,7 +154,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -475,8 +475,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("searchstatus", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
@@ -498,8 +498,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("status", Status.ENABLED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}

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

@@ -77,7 +77,7 @@ public class CartController {
 		// 当前登录企业作为供应商
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_useruu", SystemSession.getUser().getUserUU());

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

@@ -166,7 +166,7 @@ public class DeputyOrderController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -200,7 +200,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_statuscode", Status.UNAUDIT.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -234,7 +234,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_downloadstatus", "未下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -268,7 +268,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_downloadstatus", "已下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -301,7 +301,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_statuscode", Status.AGREED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -333,7 +333,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_entrystatus", "保存");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -426,7 +426,7 @@ public class DeputyOrderController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", enuu);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}

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

@@ -88,10 +88,9 @@ public class InvitationRecordController {
 	@RequestMapping(value = "/records", method = RequestMethod.GET)
 	private SPage<InvitationRecord> getRecords(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-//		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("in_useruu", SystemSession.getUser().getUserUU());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（个人）");
 		return invitationRecordService.getRecords(pageParams, keyword);
@@ -107,7 +106,7 @@ public class InvitationRecordController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（企业）");
 		return invitationRecordService.getRecords(pageParams, keyword);
@@ -123,12 +122,8 @@ public class InvitationRecordController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("in_active", Constant.YES);
-//		不显示自己的
-//		HashMap<String, Object> map = new HashMap<>();
-//		map.put("in_useruu", SystemSession.getUser().getUserUU());
-//		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（企业）--已激活");
 		return invitationRecordService.getRecords(pageParams, keyword);

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

@@ -89,7 +89,7 @@ public class MakeAcceptController {
         pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeAcceptIds(filter.getKeyword(), pageParams);
 	}

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

@@ -94,7 +94,7 @@ public class MakeOrderChangeController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("mcd_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("mcd_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderChangeIds(filter.getKeyword(), pageParams);
 	}

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

@@ -98,7 +98,7 @@ public class MakeOrderController {
         }
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -144,7 +144,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -190,7 +190,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -234,7 +234,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}

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

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeOrder;
@@ -25,7 +11,6 @@ import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.MultiValue;
@@ -33,6 +18,18 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 查看自己委外加工的订单
@@ -86,7 +83,7 @@ public class MakeOutOrderController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
@@ -137,7 +134,7 @@ public class MakeOutOrderController {
 		// TODO 供应商分配，已去除
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		searchPageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		List<MakeOrder> makeOrders =  searchService.searchMakeOrderIds(keyword, searchPageParams).getContent();
 

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

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeReturn;
@@ -32,6 +18,19 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户委外验退单
@@ -86,7 +85,7 @@ public class MakeReturnController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("mr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("mr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeReturnIds(keyword, pageParams);
 	}

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

@@ -2,10 +2,8 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PagingReleaseDetailService;
 import com.uas.platform.b2b.service.PagingReleaseService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -18,15 +16,11 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.SPage;
+import com.uas.sso.support.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -46,53 +40,8 @@ public class PagingReleaseController {
     @Autowired
     private PagingReleaseDetailService pagingReleaseDetailService;
 
-    @Autowired
-    private SearchService searchService;
-
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-//    /**
-//     *  分页查找消息(未读)
-//     * @param params
-//     * @return
-//     */
-//    @RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
-//    @ResponseBody
-//    public SPage<PagingReleaseDetail> getTodoPagingRelease(PageParams params, String searchFilter) {
-//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-//        String keyword = jsonObject.getString("keyword");
-////        logger.log("查看消息", "查看收到的消息（未读）");
-//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-//        pageParams.getFilters().put("prd_readstatus", Constant.NO);
-//        pageParams.getFilters().put("prd_emuu", SystemSession.getUser().getUserUU());
-//        pageParams.getFilters().put("prd_venduu", SystemSession.getUser().getEnterprise().getUu());
-//        List<Sort> sortList = new ArrayList<>();
-//        sortList.add(new Sort("prd_id", false, Sort.Type.LONG, new Long(1)));
-//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//        return searchService.searchPagingReleaseDetailIds(keyword, pageParams);
-//    }
-//
-//    /**
-//     *  分页查找消息(已读)
-//     * @param params
-//     * @return
-//     */
-//    @RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
-//    @ResponseBody
-//    public SPage<PagingReleaseDetail> getDonePagingRelease(PageParams params, String searchFilter) {
-//        JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-//        String keyword = jsonObject.getString("keyword");
-////        logger.log("查看消息", "查看收到的消息（已读）");
-//        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-//        pageParams.getFilters().put("prd_readstatus", Constant.YES);
-//        pageParams.getFilters().put("prd_emuu", SystemSession.getUser().getUserUU());
-//        pageParams.getFilters().put("prd_venduu", SystemSession.getUser().getEnterprise().getUu());
-//        List<Sort> sortList = new ArrayList<>();
-//        sortList.add(new Sort("prd_id", false, Sort.Type.LONG, new Long(1)));
-//        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//        return searchService.searchPagingReleaseDetailIds(keyword, pageParams);
-//    }
-
     /**
      *  分页查找消息(未读)
      * @param params

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

@@ -64,7 +64,7 @@ public class ProductController {
 			map.put("pr_b2bdisabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchProductsCheckIds(keyword, pageParams);
 		} else {
@@ -91,7 +91,7 @@ public class ProductController {
 			map.put("pr_b2bdisabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchProductsCheckIds(keyword, pageParams);
 		} else {
@@ -114,7 +114,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -148,7 +148,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -180,7 +180,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -440,8 +440,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -462,8 +462,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -484,8 +484,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}

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

@@ -21,11 +21,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.IOException;
@@ -74,7 +70,7 @@ public class ProductUsersController {
         pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pu_useruu", SystemSession.getUser().getUserUU());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+        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);
     }

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PubInquiryService;
 import com.uas.platform.b2b.service.UserService;
@@ -22,7 +21,6 @@ import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
-import javassist.compiler.ast.Keyword;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -208,7 +206,7 @@ public class PubInquiryController {
             pageParams.getFilters().put("id_inid", new MultiValue(list, true));
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -242,7 +240,7 @@ public class PubInquiryController {
         pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
         pageParams.getFilters().put("id_overdue", Constant.NO);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -278,7 +276,7 @@ public class PubInquiryController {
         map.put("id_invalid", Constant.NO);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -314,7 +312,7 @@ public class PubInquiryController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -381,7 +379,7 @@ public class PubInquiryController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -415,7 +413,7 @@ public class PubInquiryController {
         pageParams.getFilters().put("id_agreed", Constant.NO);
         pageParams.getFilters().put("id_status", Status.REPLIED.value());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }

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

@@ -21,7 +21,10 @@ import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -173,7 +176,7 @@ public class PubInquiryForPurcController {
         // 当前登录企业作为客户
         pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -196,7 +199,7 @@ public class PubInquiryForPurcController {
         pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
         pageParams.getFilters().put("id_overdue", Constant.NO);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -221,7 +224,7 @@ public class PubInquiryForPurcController {
         map.put("id_invalid", Constant.NO);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -246,7 +249,7 @@ public class PubInquiryForPurcController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -293,7 +296,7 @@ public class PubInquiryForPurcController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -316,7 +319,7 @@ public class PubInquiryForPurcController {
         pageParams.getFilters().put("id_agreed", Constant.NO);
         pageParams.getFilters().put("id_status", Status.REPLIED.value());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }

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

@@ -211,7 +211,7 @@ public class PurcInquiryController {
 			// 当前登录企业作为供应商
 			pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+			sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 		}
@@ -247,7 +247,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -281,7 +281,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -314,7 +314,7 @@ public class PurcInquiryController {
 			map.put("id_invalid", Constant.YES);
 			pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -352,7 +352,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_agreed", Constant.YES);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -390,7 +390,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_agreed", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -468,7 +468,7 @@ public class PurcInquiryController {
 		pageParams.getFilters().put("in_enterystatus", Status.ENABLED.value());
 		pageParams.getFilters().put("in_isopen", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryCheckIds(keyword, pageParams);
@@ -493,7 +493,7 @@ public class PurcInquiryController {
 		map.put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryItemCheckIds(keyword, pageParams);

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

@@ -25,12 +25,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.IOException;
@@ -198,7 +193,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -233,7 +228,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -266,7 +261,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}

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

@@ -1,21 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -38,6 +22,17 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 买家获取卖家上传的应付对账单
@@ -94,7 +89,7 @@ public class PurchaseARCheckController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("sac_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("sac_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleARCheckIds(keyword, pageParams);
 	}

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

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseAccept;
@@ -33,6 +19,18 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户采购验收单
@@ -88,7 +86,7 @@ public class SaleAcceptController {
 			pageParams.getFilters().put("pa_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseAcceptIds(keyword, pageParams);
 	}

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

@@ -1,20 +1,6 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseApBill;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -31,6 +17,18 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户应付票据
@@ -87,7 +85,7 @@ public class SaleApBillController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pab_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pab_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		SPage<PurchaseApBill> apbills = searchService.searchPurchaseApBillIds(keyword, pageParams);
 		return apbills;

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

@@ -259,7 +259,7 @@ public class SaleApBillOutController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}
@@ -293,7 +293,7 @@ public class SaleApBillOutController {
 		List<Sort> sortList = new ArrayList<>();
 		// 如果日期为空，设置的默认时间2000/1/1 1:1:1
 		sortList.add(new Sort("pabo_recorddate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}
@@ -325,7 +325,7 @@ public class SaleApBillOutController {
 		pageParams.getFilters().put("pabo_checkstatus", "已开票");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}
@@ -360,7 +360,7 @@ public class SaleApBillOutController {
 		pageParams.getFilters().put("pabo_checkstatus", new MultiValue(list, true));
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}

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

@@ -418,7 +418,7 @@ public class SaleApCheckController {
         List<Sort> sortList = new ArrayList<>();
         // 如果日期为空，设置的默认时间2000/1/1 1:1:1
         sortList.add(new Sort("pa_recorddate", false, Type.LONG, new Long(946659661)));
-        sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
+        sortList.add(new Sort("pa_id", false, Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return pageParams;
     }

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

@@ -1,20 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseBadIn;
@@ -34,6 +19,20 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户不良品入库单
@@ -85,7 +84,7 @@ public class SaleBadInController {
 			pageParams.getFilters().put("pb_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pb_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pb_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseBadInIds(keyword, pageParams);
 	}

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

@@ -1,20 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseBadOut;
@@ -34,6 +19,20 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户不良品出库单
@@ -85,7 +84,7 @@ public class SaleBadOutController {
 			pageParams.getFilters().put("po_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("po_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("po_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseBadOutIds(keyword, pageParams);
 	}

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

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -31,6 +17,19 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取的客户采购预测单
@@ -79,7 +78,7 @@ public class SaleCustomerForecastController {
 			pageParams.getFilters().put("pfd_venduu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pfd_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pfd_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseForecastAllIds(keyword, pageParams);
 	}

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

@@ -103,7 +103,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -137,7 +137,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -173,7 +173,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.NO);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -208,7 +208,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -275,7 +275,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -309,7 +309,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_agreed", Constant.NO);
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -342,7 +342,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}

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

@@ -157,7 +157,7 @@ public class SaleInquiryMouldController {
 		pageParams.getFilters().put("im_status", Status.REPLIED.value());
 		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -190,7 +190,7 @@ public class SaleInquiryMouldController {
 		}
 		pageParams.getFilters().put("im_valid", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}

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

@@ -1,20 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseMRB;
@@ -34,6 +19,20 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取的客户MRB单
@@ -88,7 +87,7 @@ public class SaleMRBController {
 			pageParams.getFilters().put("pm_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pm_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pm_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseMRBIds(keyword, pageParams);
 	}

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

@@ -98,7 +98,7 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -138,7 +138,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -177,7 +177,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -216,7 +216,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -254,7 +254,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -430,7 +430,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
@@ -468,7 +468,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
@@ -505,7 +505,7 @@ public class SaleNoticeController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}

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

@@ -87,7 +87,7 @@ public class SaleOrderChangeController {
 			pageParams.getFilters().put("pc_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -121,7 +121,7 @@ public class SaleOrderChangeController {
 		pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("pc_unneedreply", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -155,7 +155,7 @@ public class SaleOrderChangeController {
 		pageParams.getFilters().put("pc_status", Status.REPLIED.value());
 		pageParams.getFilters().put("pc_unneedreply", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -188,7 +188,7 @@ public class SaleOrderChangeController {
 		}
 		pageParams.getFilters().put("pc_unneedreply", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}

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

@@ -194,7 +194,7 @@ public class SaleOrderController {
 		}
 		// TODO 其他过滤条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, 1L));
+		sortList.add(new Sort("pu_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("pu_status", (short) Status.UNAUDIT.value());
@@ -228,7 +228,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
@@ -261,12 +261,13 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
 		ModelMap map = new ModelMap();
-		map.put("pu_end", Constant.YES); // 过滤掉已结案状态的
+		// 过滤掉已结案状态的
+		map.put("pu_end", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		return searchService.searchPurchaseDoneOrderIds(keyword, pageParams);
 	}
@@ -298,7 +299,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.WAITSELLERCOMFIRM.value());
@@ -333,7 +334,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.YES);
@@ -365,7 +366,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.NO);
@@ -397,7 +398,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		List<Object> list = new ArrayList<>();
@@ -1040,7 +1041,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -1063,7 +1064,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY);
@@ -1084,7 +1085,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -1105,7 +1106,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.YES);
@@ -1125,7 +1126,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		List<Object> list = new ArrayList<>();
 		list.add(Constant.YES);
 		list.add((short) 2); // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2

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

@@ -87,7 +87,7 @@ public class SaleQuotationController {
 			pageParams.getFilters().put("qu_custuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -125,7 +125,7 @@ public class SaleQuotationController {
 		// 待审批或已提交状态
 		pageParams.getFilters().put("qu_status", new MultiValue(status, true));
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationDoneIds(keyword, pageParams);
 	}
@@ -159,7 +159,7 @@ public class SaleQuotationController {
 		pageParams.setNotEqualFilters(map);
 		pageParams.getFilters().put("qu_agreed", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -193,7 +193,7 @@ public class SaleQuotationController {
 		pageParams.setNotEqualFilters(map);
 		pageParams.getFilters().put("qu_agreed", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -224,7 +224,7 @@ public class SaleQuotationController {
 		}
 		pageParams.getFilters().put("qu_status", Status.INPUTTING.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -258,7 +258,7 @@ public class SaleQuotationController {
 		pageParams.getFilters().put("qu_overdue", Constant.YES); // 已失效
 //		pageParams.getFilters().put("qu_status", Status.SUBMITTED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}

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

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Enterprise;
@@ -33,6 +19,19 @@ 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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户采购验退单
@@ -90,7 +89,7 @@ public class SaleReturnController {
 			pageParams.getFilters().put("pr_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseReturnIds(keyword, pageParams);
 	}

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

@@ -95,7 +95,7 @@ public class SaleSampleController {
 		    return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
         }
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(filter.getKeyword(), pageParams);
 	}
@@ -130,7 +130,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.UNSEND.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -165,7 +165,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.SEND.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -200,7 +200,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.CANCELLED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -415,7 +415,7 @@ public class SaleSampleController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}
@@ -460,7 +460,7 @@ public class SaleSampleController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}
@@ -502,7 +502,7 @@ public class SaleSampleController {
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}

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

@@ -57,7 +57,7 @@ public class VendorController {
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getEnBussinessCode());
 		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
@@ -72,7 +72,7 @@ public class VendorController {
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("ve_servicerswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
@@ -113,7 +113,7 @@ public class VendorController {
 			}
 			pageParams.getFilters().put("ve_myenuu", new MultiValue(list, true));
 		}
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchCustCheckIds(keyword, pageParams);
 	}

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

@@ -32,21 +32,6 @@ public class VendorPerformanceAssessController {
     public SPage<VendorPerformanceAssess> getVpas(PageParams params, String keyword) {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("vpa_veuu", SystemSession.getUser().getEnterprise().getUu());
-//		pageParams.getFilters().put("ve_custswitch", Constant.YES);
-//		List<Sort> sortList = new ArrayList<>();
-//		SearchFilter filter = userService.distribute();
-//		if (filter != null && filter.getDistribute() == null) {
-//			return null;
-//		}
-//		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			for (Object object : filter.getDistribute()) {
-//				list.add(object);
-//			}
-//			pageParams.getFilters().put("ve_myenuu", new MultiValue(list, true));
-//		}
-//		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
-//		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchVendorPerformanceAssesss(keyword, pageParams);
     }
 

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

@@ -149,7 +149,7 @@ public class UserSpaceDetailController {
 		ModelMap notMap = new ModelMap();
 		pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchVendorForErp(keyword, pageParams);
@@ -173,7 +173,7 @@ public class UserSpaceDetailController {
 		ModelMap notMap = new ModelMap();
 		pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchVendorForErp(keyword, pageParams);
@@ -210,7 +210,7 @@ public class UserSpaceDetailController {
 			list.addAll(filter.getDistribute());
 			map.put("ve_myenuu", new MultiValue(list, true));
 		}
-		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchCustomerForErp(keyword, pageParams);

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -84,7 +84,7 @@ public class AppInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             Page<PurchaseInquiryItem> purchaseInquiryItemPage = searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
             logger.log("客户询价单", "app搜索查看收到的客户询价单列表（全部）");
@@ -139,7 +139,7 @@ public class AppInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -191,7 +191,7 @@ public class AppInquiryController {
             map.put("id_invalid", Constant.NO);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -242,7 +242,7 @@ public class AppInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -342,7 +342,7 @@ public class AppInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -393,7 +393,7 @@ public class AppInquiryController {
             pageParams.getFilters().put("id_agreed", Constant.NO);
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -443,7 +443,7 @@ public class AppInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {

src/main/java/com/uas/platform/b2b/mobile/controller/AppPubInquiryController.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.mobile.controller;
 
-import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.PublicInquiryItem;
 import com.uas.platform.b2b.model.PublicInquiryItemInfo;
@@ -22,6 +21,7 @@ import com.uas.search.b2b.model.MultiValue;
 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.support.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -97,7 +97,7 @@ public class AppPubInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return toPage(searchService.searchPublicInquiryItemInfoIds(keyword, pageParams));
         } else {
@@ -145,7 +145,7 @@ public class AppPubInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return toPage(searchService.searchPublicInquiryItemInfoIds(keyword, pageParams));
         } else {
@@ -198,7 +198,7 @@ public class AppPubInquiryController {
             map.put("id_invalid", Constant.NO);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {
@@ -250,7 +250,7 @@ public class AppPubInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {
@@ -351,7 +351,7 @@ public class AppPubInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {
@@ -402,7 +402,7 @@ public class AppPubInquiryController {
             pageParams.getFilters().put("id_agreed", Constant.NO);
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {

src/main/java/com/uas/platform/b2b/mobile/controller/AppPurcInquiryController.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.mobile.controller;
 
-import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.PurcInquiryItemInfo;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.search.SearchService;
@@ -15,6 +14,7 @@ import com.uas.platform.core.web.bind.RequestState;
 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.support.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -60,7 +60,7 @@ public class AppPurcInquiryController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -81,7 +81,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -101,7 +101,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -121,7 +121,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -141,7 +141,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_agreed", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -161,7 +161,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_agreed", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -185,7 +185,7 @@ public class AppPurcInquiryController {
 		map.put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryItemCheckIdsForApp(keyword, pageParams);

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.mobile.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.uas.sso.support.Page;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
@@ -26,6 +25,7 @@ import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
+import com.uas.sso.support.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -217,7 +217,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
@@ -268,7 +268,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -323,7 +323,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_status", Status.WAITSELLERCOMFIRM.value());
@@ -377,7 +377,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_end", Constant.YES);
@@ -425,7 +425,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_end", Constant.NO);
@@ -474,7 +474,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			List<Object> list = new ArrayList<>();
@@ -558,7 +558,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（全部）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			Map<String, Object> map = new HashMap<String, Object>();
@@ -592,7 +592,7 @@ public class SaleController {
 			logger.log("采购单", "app查看发出的采购订单列表（包括采购明细）（待回复）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_status", Status.NOT_REPLY);
@@ -625,7 +625,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（已回复）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -657,7 +657,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（已结案）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_end", Constant.YES);
@@ -687,7 +687,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（待交货）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
 			List<Object> list = new ArrayList<>();
 			list.add(Constant.YES);
 			list.add((short) 2); // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2

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

@@ -0,0 +1,36 @@
+package com.uas.platform.b2b.search;
+
+import com.uas.search.b2b.exception.SearchException;
+import com.uas.search.b2b.model.PageParams;
+import com.uas.search.b2b.model.SPage;
+
+/**
+ * 采用restTempLate方式重写搜索功能
+ *
+ * @author hejq
+ * @date 2018-07-05 16:04
+ */
+public interface RestTempSearchService {
+
+    /**
+     * 通过表名，关键词，分页参数查询id信息
+     *
+     * @param tableName 表名
+     * @param keyword 关键词
+     * @param pageParams 分页参数
+     * @throws SearchException
+     * @return
+     */
+    SPage<Long> searchIds(String keyword, com.uas.search.b2b.service.SearchService.Table_name tableName, PageParams pageParams) throws SearchException;
+
+    /**
+     * 联想词搜索
+     *
+     * @param keyword 关键词
+     * @param tableName 表名
+     * @param size 大小
+     * @param fields 字段
+     * @return
+     */
+    SPage<String> similar(String keyword, com.uas.search.b2b.service.SearchService.Table_name tableName, Integer size, String... fields);
+}

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

@@ -0,0 +1,136 @@
+package com.uas.platform.b2b.search;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.exception.SearchException;
+import com.uas.search.b2b.model.PageParams;
+import com.uas.search.b2b.model.SPage;
+import com.uas.search.b2b.service.SearchService;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+/**
+ * 采用restTempLate方式重写搜索功能
+ *
+ * @author hejq
+ * @date 2018-07-05 16:05
+ */
+@Service
+public class RestTempSearchServiceImpl implements RestTempSearchService {
+
+    private final RestTemplate restTemplate;
+
+    /**
+     * 邮件服务主机地址
+     */
+    @Value("#{sys.searchUrl ?: 'http://10.10.100.179:8081'}")
+    private String SEARCH_URL;
+
+    @Autowired
+    public RestTempSearchServiceImpl(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+    /**
+     * 通过表名，关键词，分页参数查询id信息
+     *
+     * @param tableName  表名
+     * @param keyword    关键词
+     * @param pageParams 分页参数
+     * @throws SearchException
+     * @return
+     */
+    @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);
+        if (StringUtils.isEmpty(str)) {
+            return new SPage<>();
+        } else {
+            try {
+                SPage<Long> sPage = FlexJsonUtils.fromJson(str, SPage.class);
+                return sPage;
+            } catch (Exception e) {
+                e.printStackTrace();
+                return new SPage<>();
+            }
+        }
+    }
+
+    /**
+     * 联想词搜索
+     *
+     * @param keyword   关键词
+     * @param tableName 表名
+     * @param size      大小
+     * @param fields     字段
+     * @return
+     */
+    @Override
+    public SPage<String> similar(String keyword, SearchService.Table_name tableName, Integer size, String... fields) {
+        Map<String, Object> map = initSimilarMap(tableName.toString(), keyword, size, fields);
+        String str = restTemplate.getForObject(SEARCH_URL + SearchUrl.SIMILAR_WORDS_URL, String.class, map);
+        if (StringUtils.isEmpty(str)) {
+            return new SPage<>();
+        } else {
+            try {
+                SPage<String> sPage = FlexJsonUtils.fromJson(str, SPage.class);
+                return sPage;
+            } catch (Exception e) {
+                e.printStackTrace();
+                return new SPage<>();
+            }
+        }
+    }
+
+    /**
+     * 初始化联想词字段
+     *
+     * @param tableName 表名
+     * @param keyword 关键词
+     * @param size 大小
+     * @param fields 搜索字段
+     * @return
+     */
+    private Map<String,Object> initSimilarMap(String tableName, String keyword, Integer size, String[] fields) {
+        Map<String, Object> map = new HashedMap();
+        map.put("tableName", tableName);
+        map.put("keyword", keyword);
+        map.put("size", size);
+        map.put("fields", fields);
+        return map;
+    }
+
+    /**
+     * 定义搜索属性
+     *
+     * @param tableName 表名
+     * @param keyword 关键字
+     * @param pageParams 分页属性
+     * @return
+     */
+    public Map<String , Object> initSearchMap(String tableName, String keyword, PageParams pageParams) {
+        Map<String, Object> map = new HashedMap();
+        map.put("tableName", tableName);
+        map.put("page", pageParams.getPage());
+        map.put("size", pageParams.getSize());
+        map.put("keyword", keyword);
+        map.put("multiValueField", "");
+        map.put("sort", FlexJsonUtils.toJsonDeep(pageParams.getFilters().get("sort")));
+        boolean notEqual = true;
+        String nullString = "null";
+        if (null == pageParams.getNotEqualFilters() || pageParams.getNotEqualFilters().containsKey(nullString)) {
+            notEqual = false;
+        }
+        map.put("notEqualFilters", notEqual ? FlexJsonUtils.toJsonDeep(pageParams.getNotEqualFilters()) : "");
+        map.put("multiValueNotField", "");
+        map.put("filters", JSON.toJSONString(pageParams.getFilters()));
+        return map;
+    }
+}

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

@@ -51,7 +51,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchService {
 
 	@Autowired
-	private com.uas.search.b2b.service.SearchService searchService;
+	private RestTempSearchService searchService;
 
 	@Autowired
 	private PurchaseOrderAllDao purchaseOrderAllDao;
@@ -938,7 +938,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return vendorPage;
 	}
 
-
 	/**
 	 * 供应商(客户)
 	 */
@@ -983,7 +982,8 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		List<Component> comps = componentService.findByCode(code);
 		Component cmp = new Component();
 		if(!CollectionUtils.isEmpty(comps)){
-			cmp = comps.get(0);// 因为只能带一个，选找到的第一个
+			// 因为只能带一个，选找到的第一个
+			cmp = comps.get(0);
 		}
 		return cmp;
 	}

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

@@ -0,0 +1,19 @@
+package com.uas.platform.b2b.search;
+
+/**
+ * 搜索链接
+ *
+ * @author hejq
+ * @date 2018-07-05 16:15
+ */
+public class SearchUrl {
+
+    /**
+     * 获取id链接
+     */
+    public static final String ID_LIST_URL = "/search?keyword={keyword}&tableName={tableName}&page={page}&size={size}" +
+            "&filters={filters}&multiValueField={multiValueField}&sort={sort}" +
+            "&notEqualFilters={notEqualFilters}&multiValueNotField={multiValueNotField}";
+
+    public static final String SIMILAR_WORDS_URL= "/search/similar?keyword={keyword}&tableName={tableName}&fields={fields}";
+}

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

@@ -720,7 +720,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		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);
 		List<Product> products = sproducts.getContent();

src/main/java/com/uas/platform/b2b/v2/controller/InviteRecordController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
-import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
@@ -16,7 +15,6 @@ 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.PageParams;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
 import com.uas.ps.core.util.StringUtils;
 import com.uas.search.b2b.model.SPage;
@@ -96,7 +94,7 @@ public class InviteRecordController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("in_useruu", userUU);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
@@ -121,7 +119,7 @@ public class InviteRecordController {
         pageParams.getFilters().put("in_useruu", userUU);
         pageParams.getFilters().put("in_active", Constant.YES);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
@@ -146,7 +144,7 @@ public class InviteRecordController {
         pageParams.getFilters().put("in_useruu", userUU);
         pageParams.getFilters().put("in_active", Constant.NO);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }

src/main/resources/dev/sys.properties

@@ -17,4 +17,7 @@ productServiceUrl=http://218.17.158.219:24000/
 inquiryServiceUrl=http://218.17.158.219:24000/
 
 #message service ip
-messageServiceIp=http://message.ubtob.com/
+messageServiceIp=http://message.ubtob.com/
+
+#search url
+searchUrl=http://10.10.100.191:8081

src/main/resources/prod/sys.properties

@@ -17,4 +17,7 @@ productServiceUrl=https://api-product.usoftmall.com/
 inquiryServiceUrl=https://api-inquiry.usoftmall.com/
 
 #message service ip
-messageServiceIp=http://message.ubtob.com/
+messageServiceIp=http://message.ubtob.com/
+
+#search url
+searchUrl=http://10.10.100.179:8081

src/main/resources/test/sys.properties

@@ -19,4 +19,7 @@ inquiryServiceUrl=http://218.17.158.219:24000
 #inquiryServiceUrl=http://10.1.51.83:8080/
 
 #message service ip
-messageServiceIp=http://message.ubtob.com/
+messageServiceIp=http://message.ubtob.com/
+
+#search url
+searchUrl=http://10.10.100.191:8081