处理代码中出现的警告

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10143 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -26,6 +26,7 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
  * @date 2015年12月25日 下午8:14:58
  *
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping(value = "/changeadmin")
 public class ChangeAdminController {

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

@@ -23,6 +23,7 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestParams;
 
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/customers")
 public class CustomerController {

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

@@ -57,6 +57,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author hejq
  * @time 创建时间：2017年3月19日
  */
+@SuppressWarnings("deprecation")
 @RestController
 @RequestMapping("/deputyOrder")
 public class DeputyOrderController {

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

@@ -38,6 +38,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author aof
  * @date 2015年8月20日
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/make/accept")
 public class MakeAcceptController {

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

@@ -42,6 +42,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  * @since 2015年8月10日上午10:28:41
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/make/changes")
 public class MakeOrderChangeController {

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

@@ -5,10 +5,8 @@ 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.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,7 +28,6 @@ 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.Constant;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -47,6 +44,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/make/orders")
 public class MakeOrderController {

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

@@ -39,6 +39,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author hejq
  * @time 创建时间：2016年10月17日
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/make/outorders")
 public class MakeOutOrderController {

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

@@ -38,6 +38,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author aof
  * @date 2015年9月1日
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/make/return")
 public class MakeReturnController {

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

@@ -17,10 +17,7 @@ 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.service.UserService;
 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.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -45,14 +42,9 @@ public class PagingReleaseController {
     @Autowired
     private PagingReleaseDetailService pagingReleaseDetailService;
 
-    @Autowired
-    private UserService userService;
-
     @Autowired
     private SearchService searchService;
 
-    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
     /**
      *  分页查找消息(未读)
      * @param params

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

@@ -35,7 +35,6 @@ import com.uas.platform.b2b.model.QueriableMember;
 import com.uas.platform.b2b.model.QueriableUser;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.AccessTokenService;
-import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.MonthProdioService;
 import com.uas.platform.b2b.service.UserService;
@@ -53,6 +52,7 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
  * @author yingp
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/public/queriable")
 public class PublicQueryController {
@@ -66,9 +66,6 @@ public class PublicQueryController {
 	@Autowired
 	private MonthProdioService monthProdIoService;
 
-	@Autowired
-	private AttachService attachService;
-
 	@Autowired
 	private UserDao userDao;
 

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

@@ -1,8 +1,30 @@
 package com.uas.platform.b2b.controller;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+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.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurcInquiry;
+import com.uas.platform.b2b.model.PurcInquiryItemInfo;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurcInquiryService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -14,7 +36,6 @@ import com.uas.platform.b2b.temporary.model.VendorAndContact;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -23,28 +44,6 @@ 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.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-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 org.springframework.web.servlet.ModelAndView;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import static org.apache.axis.attachments.MimeUtils.filter;
 
 /**
  * 平台新增的询价单
@@ -166,7 +165,6 @@ public class PurcInquiryController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<PurchaseInquiryItem> sPage = searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 	}
 
@@ -497,7 +495,6 @@ public class PurcInquiryController {
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", getReceivedPurchaseInquiries(params, searchFilter).getContent());
-		List<PurchaseInquiryItem> list = (List<PurchaseInquiryItem>) modelAndView.getModel().get("data");
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/sale/purchaseInquiry", "采购询价单列表（全部）"));
 		logger.log("采购询价单", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

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

@@ -4,8 +4,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
@@ -19,6 +17,8 @@ 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.SaleARCheck;
 import com.uas.platform.b2b.model.SaleARCheckItem;
 import com.uas.platform.b2b.model.SaleARCheckReply;
@@ -46,6 +46,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @date 2015年10月13日17:01:34
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/purchase/arCheck")
 public class PurchaseARCheckController {

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

@@ -1,10 +1,38 @@
 package com.uas.platform.b2b.controller;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+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.servlet.ModelAndView;
+
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurchaseTender;
+import com.uas.platform.b2b.model.SaleTenderItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
-import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseTenderService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -22,31 +50,13 @@ 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 org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 招标单
  *
  * Created by dongbw on 17/03/07 14:19.
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/tender")
 public class PurchaseTenderController {
@@ -60,9 +70,6 @@ public class PurchaseTenderController {
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private AttachService attachService;
-
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 

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

@@ -32,6 +32,7 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
  * @author suntg
  * @date 2015年3月10日17:37:37
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping(value = "/signup")
 public class RegisterController {

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

@@ -39,6 +39,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/accept")
 public class SaleAcceptController {

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

@@ -37,6 +37,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/apBill")
 public class SaleApBillController {

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

@@ -1,5 +1,19 @@
 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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseBadIn;
@@ -19,19 +33,6 @@ 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;
 
 /**
  * 卖家获取对应的客户不良品入库单
@@ -39,6 +40,7 @@ import java.util.List;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/badIn")
 public class SaleBadInController {

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

@@ -1,5 +1,19 @@
 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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseBadOut;
@@ -19,19 +33,6 @@ 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;
 
 /**
  * 卖家获取对应的客户不良品出库单
@@ -39,6 +40,7 @@ import java.util.List;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/badOut")
 public class SaleBadOutController {

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

@@ -38,6 +38,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/forecast")
 public class SaleCustomerForecastController {

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

@@ -501,7 +501,7 @@ public class SaleInquiryController {
 		}
 		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
+			for (Object object : filters.getDistribute()) {
 				list.add(object);
 			}
 			filter.setDistribute(list);

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

@@ -1,5 +1,22 @@
 package com.uas.platform.b2b.controller;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
+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.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseInquiryMould;
@@ -7,7 +24,6 @@ import com.uas.platform.b2b.model.PurchaseInquiryMouldDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
-import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -25,24 +41,13 @@ 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.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 
 /**
  * 卖家对模具询价单的操作 -- 无关键词直接从数据库获取，已修改
  * 
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/mould")
 public class SaleInquiryMouldController {
@@ -56,10 +61,6 @@ public class SaleInquiryMouldController {
 	@Autowired
 	private SearchService searchService;
 
-	@Autowired
-	private AttachService attachService;
-
-
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -350,6 +351,7 @@ public class SaleInquiryMouldController {
 	@ResponseBody
 	public List<PurchaseInquiryMouldItem> getInquiryMouldItemById(@PathVariable("inquiryMouldId") Long inquiryMouldId) {
 		PurchaseInquiryMould mould = purchaseInquiryMouldService.findById(inquiryMouldId);
+		@SuppressWarnings("unchecked")
 		List<PurchaseInquiryMouldItem> items = (List<PurchaseInquiryMouldItem>) mould.getInquiryMouldItems();
 		logger.log("客户模具询价单", "查看收到的客户模具询价单", null, mould.getCode(), inquiryMouldId);
 		return items;

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

@@ -1,5 +1,19 @@
 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.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseMRB;
@@ -19,19 +33,6 @@ 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;
 
 /**
  * 卖家获取的客户MRB单
@@ -39,6 +40,7 @@ import java.util.List;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/MRB")
 public class SaleMRBController {

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

@@ -50,6 +50,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author yingp
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/notice")
 public class SaleNoticeController {

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

@@ -45,6 +45,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author yingp
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/changes")
 public class SaleOrderChangeController {

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

@@ -48,6 +48,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author yingp
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/quotation")
 public class SaleQuotationController {
@@ -208,20 +209,22 @@ public class SaleQuotationController {
 	public SPage<SaleQuotationAll> getSalQuotationInfoTodo(PageParams params, String searchFilter) {
 		logger.log("主动报价单", "查看主动报价单-未提交");
 		// 当前登录企业作为供应商
-		SearchFilter filter = new SearchFilter();
-		SearchFilter filters = JSONObject.parseObject(searchFilter, SearchFilter.class);
-		filter.setEndDate(filters.getEndDate());
-		filter.setFromDate(filters.getFromDate());
-		// SearchFilter disfilter = userService.distribute();
-		// if (filter != null && filter.getDistribute() == null) {
-		// return null;
-		// } else {
-		// filter.setDistribute(disfilter.getDistribute());
-		// }
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter disfilter = userService.distribute();
+		if (disfilter != null && disfilter.getDistribute() == null) {
+			return null;
+		}
+		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : disfilter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.INPUTTING.value());
-		return saleQuotationService.findAllDetailByPageInfo(pageInfo, filters.getKeyword(), filter);
+		return saleQuotationService.findAllDetailByPageInfo(pageInfo, null, filter);
 	}
 
 	/**
@@ -235,16 +238,18 @@ public class SaleQuotationController {
 	public SPage<SaleQuotationAll> getSalQuotationInfoDone(PageParams params, String searchFilter) {
 		logger.log("主动报价单", "查看主动报价单-已提交");
 		// 当前登录企业作为供应商
-		SearchFilter filter = new SearchFilter();
-		SearchFilter filters = JSONObject.parseObject(searchFilter, SearchFilter.class);
-		filter.setEndDate(filters.getEndDate());
-		filter.setFromDate(filters.getFromDate());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter disfilter = userService.distribute();
-		// if (filter != null && filter.getDistribute() == null) {
-		// return null;
-		// } else {
-		// filter.setDistribute(disfilter.getDistribute());
-		// }
+		if (disfilter != null && disfilter.getDistribute() == null) {
+			return null;
+		}
+		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : disfilter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.SUBMITTED.value());
@@ -262,16 +267,18 @@ public class SaleQuotationController {
 	public SPage<SaleQuotationAll> getSalQuotationInfoInvalid(PageParams params, String searchFilter) {
 		logger.log("主动报价单", "查看主动报价单-已失效");
 		// 当前登录企业作为供应商
-		SearchFilter filter = new SearchFilter();
-		SearchFilter filters = JSONObject.parseObject(searchFilter, SearchFilter.class);
-		filter.setEndDate(filters.getEndDate());
-		filter.setFromDate(filters.getFromDate());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter disfilter = userService.distribute();
-		// if (filter != null && filter.getDistribute() == null) {
-		// return null;
-		// } else {
-		// filter.setDistribute(disfilter.getDistribute());
-		// }
+		if (disfilter != null && disfilter.getDistribute() == null) {
+			return null;
+		}
+		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : disfilter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("overdue", Constant.YES);
@@ -289,16 +296,18 @@ public class SaleQuotationController {
 	public SPage<SaleQuotationAll> getSalQuotationInfo(PageParams params, String searchFilter) {
 		logger.log("主动报价单", "查看主动报价单-全部");
 		// 当前登录企业作为供应商
-		SearchFilter filter = new SearchFilter();
-		SearchFilter filters = JSONObject.parseObject(searchFilter, SearchFilter.class);
-		filter.setEndDate(filters.getEndDate());
-		filter.setFromDate(filters.getFromDate());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		SearchFilter disfilter = userService.distribute();
-		// if (filter != null && filter.getDistribute() == null) {
-		// return null;
-		// } else {
-		// filter.setDistribute(disfilter.getDistribute());
-		// }
+		if (disfilter != null && disfilter.getDistribute() == null) {
+			return null;
+		}
+		if (disfilter != null && !CollectionUtils.isEmpty(disfilter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : disfilter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		return saleQuotationService.findAllDetailByPageInfo(pageInfo, null, filter);

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

@@ -1,5 +1,18 @@
 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.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;
@@ -13,27 +26,12 @@ 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;
 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;
 
 /**
  * 卖家获取对应的客户采购验退单
@@ -41,6 +39,7 @@ import java.util.List;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/return")
 public class SaleReturnController {
@@ -88,7 +87,6 @@ public class SaleReturnController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		SPage<PurchaseReturn> sPage = searchService.searchPurchaseReturnIds(keyword, pageParams);
 		return searchService.searchPurchaseReturnIds(keyword, pageParams);
 	}
 

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

@@ -53,6 +53,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  * 
  */
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/sample")
 public class SaleSampleController {

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

@@ -38,6 +38,7 @@ import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 
+@SuppressWarnings("deprecation")
 @RestController
 public class SecurityController {
 

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,16 +7,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.platform.b2b.model.TipReprintedLog;
-import com.uas.platform.b2b.service.TipReprintedLogService;
 import com.uas.search.b2b.model.SPage;
 
 @Controller
 @RequestMapping(value = "/tipReprintedLog")
 public class TipReprintedLogController {
 
-	@Autowired
-	private TipReprintedLogService tipReprintedLogService;
-
 	/**
 	 * 新增一条转载记录
 	 * 

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

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -31,7 +30,6 @@ import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.SPage;
@@ -45,6 +43,7 @@ import com.uas.search.b2b.util.SearchConstants;
  * @author suntg
  *
  */
+@SuppressWarnings("deprecation")
 @RestController
 @RequestMapping("/vendor")
 public class VendorController {