处理首页重复请求+优化todo接口处理效率

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

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

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.uas.platform.b2b.core.util.ThreadUtils;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.AddPartnerService;
 import com.uas.platform.b2b.service.CartService;
 import com.uas.platform.b2b.service.MakeAcceptService;
@@ -122,70 +124,330 @@ public class SnapshotController {
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
 	public ModelMap getTodo() {
-		ModelMap modelMap = new ModelMap();
+		final ModelMap modelMap = new ModelMap();
+		final User user = SystemSession.getUser();
+		// 并行处理
 		// 采购
-		modelMap.put("inquiry", purchaseInquiryService.getOnhandCount());
-		modelMap.put("inquiryAll", purchaseInquiryService.getAllCount());
-		modelMap.put("order", purchaseOrderService.getOnhandCount());
-		modelMap.put("orderAll", purchaseOrderService.getAllCount());
-		modelMap.put("orderChange", purchaseOrderChangeService.getOnhandCount());
-		modelMap.put("orderChangeAll", purchaseOrderChangeService.getAllCount());
-		modelMap.put("notice", purchaseNoticeService.getOnhandCount());
-		modelMap.put("noticeAll", purchaseNoticeService.getAllCount());
-		modelMap.put("acceptAll", purchaseAcceptService.getAllCount());
-		modelMap.put("returnsAll", purchaseReturnService.getAllCount());
-		modelMap.put("sample",
-				purchaseProofingService.getNotProofingCountByEnUU(SystemSession.getUser().getEnterprise().getUu()));
-		modelMap.put("sampleAll",
-				purchaseProofingService.getProofingCountByEnUU(SystemSession.getUser().getEnterprise().getUu())
-						+ purchaseProofingService
-								.getNotProofingCountByEnUU(SystemSession.getUser().getEnterprise().getUu()));
-		modelMap.put("approval",
-				purchaseProofingService.getApprovalCountByEnUU(SystemSession.getUser().getEnterprise().getUu()));
-		modelMap.put("saleSend", purchaseNoticeService.getSaleSendCount());
-		modelMap.put("saleSendVerify", purchaseNoticeService.getSaleSendVerify());
-		// 委外
-		modelMap.put("makeOrder", makeOrderService.getOnhandCount());
-		modelMap.put("makeOrderAll", makeOrderService.getAllCount());
-		modelMap.put("makeOrderChangeAll", makeOrderChangeService.getAllCount());
-		modelMap.put("makeAcceptAll", makeAcceptService.getAllCount());
-		modelMap.put("makeReturnAll", makeReturnService.getAllCount());
-		modelMap.put("makeoutOrderAll", makeOrderService.getAllOutCount());
-		// 品质
-		modelMap.put("saleBadIn", purchaseBadInService.getAllCount());
-		modelMap.put("saleBadOut", purchaseBadOutService.getAllCount());
-		modelMap.put("MRB", purchaseMRBService.getAllCount());
-		// 对账
-		modelMap.put("apBillAll", purchaseApBillService.getAllCount());
-		modelMap.put("arCheckAll", saleARCheckService.getAllCount());
-		modelMap.put("arCheckToConfirm", saleARCheckService.getCountByenUUAndStatus());
-		modelMap.put("apCheckTodo", purchaseApCheckService.getCountByenUUAndStatus());
-		// 采购
-		modelMap.put("purc",
-				purchaseOrderService.getPurcByenUUAdnStatus(SystemSession.getUser().getEnterprise().getUu()));
-		modelMap.put("purcTodo", purchaseOrderService.getPurcOnhandCount());
-
-		// 新的建立合作关系的申请
-		modelMap.put("myMessageTodo", addPartnerService.getMyMessageTodoCount());
-
-		// 购物车待处理货物
-		modelMap.put("cartTodo", cartService.getCartTodoCount());
-
-		// 模具询价
-		modelMap.put("inquiryModldTodo",
-				purchaseInquiryMouldService.getNotOfferCountByEnUU(SystemSession.getUser().getEnterprise().getUu()));
+		ThreadUtils.task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("inquiry", purchaseInquiryService.getOnhandCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("inquiryAll", purchaseInquiryService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("order", purchaseOrderService.getOnhandCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("orderAll", purchaseOrderService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("orderChange", purchaseOrderChangeService.getOnhandCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("orderChangeAll", purchaseOrderChangeService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("notice", purchaseNoticeService.getOnhandCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("noticeAll", purchaseNoticeService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("acceptAll", purchaseAcceptService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("returnsAll", purchaseReturnService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("returnsAll", purchaseReturnService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("sample", purchaseProofingService.getNotProofingCountByEnUU(user.getEnterprise().getUu()));
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("sampleAll", purchaseProofingService.getProofingCountByEnUU(user.getEnterprise().getUu())
+						+ purchaseProofingService.getNotProofingCountByEnUU(user.getEnterprise().getUu()));
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("approval", purchaseProofingService.getApprovalCountByEnUU(user.getEnterprise().getUu()));
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("saleSend", purchaseNoticeService.getSaleSendCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("saleSendVerify", purchaseNoticeService.getSaleSendVerify());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 委外
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("makeOrder", makeOrderService.getOnhandCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("makeOrderAll", makeOrderService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("makeOrderChangeAll", makeOrderChangeService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("makeAcceptAll", makeAcceptService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("makeReturnAll", makeReturnService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("makeoutOrderAll", makeOrderService.getAllOutCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 品质
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("saleBadIn", purchaseBadInService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("saleBadOut", purchaseBadOutService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("MRB", purchaseMRBService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 对账
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("apBillAll", purchaseApBillService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("arCheckAll", saleARCheckService.getAllCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("arCheckToConfirm", saleARCheckService.getCountByenUUAndStatus());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("apCheckTodo", purchaseApCheckService.getCountByenUUAndStatus());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 采购
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("purc", purchaseOrderService.getPurcByenUUAdnStatus(user.getEnterprise().getUu()));
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("purcTodo", purchaseOrderService.getPurcOnhandCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 新的建立合作关系的申请
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("myMessageTodo", addPartnerService.getMyMessageTodoCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 购物车待处理货物
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("cartTodo", cartService.getCartTodoCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 模具询价
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("inquiryModldTodo", purchaseInquiryMouldService.getNotOfferCountByEnUU(user.getEnterprise().getUu()));
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 主动报价
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("inquiryTodo", saleQuotationService.getInquiryTodo());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {// 招标单
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("tenderTodo", tenderService.getTenderTodoCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("saleTenderTodo", tenderService.getSaleTenderTodoCount());
+				SystemSession.clear();
+			}
+		}).task(new Runnable() {
+
+			@Override
+			public void run() {
+				SystemSession.setUser(user);
+				modelMap.put("saleTenderWaiting", tenderService.getSaleTenderWaitingCount());
+				SystemSession.clear();
+			}
+		}).run();
 
-		// 主动报价
-		modelMap.put("inquiryTodo", saleQuotationService.getInquiryTodo());
-
-		// 招标单
-		modelMap.put("tenderTodo", tenderService.getTenderTodoCount());
-		modelMap.put("saleTenderTodo", tenderService.getSaleTenderTodoCount());
-		modelMap.put("saleTenderWaiting", tenderService.getSaleTenderWaitingCount());
-
-		// 消息
-		modelMap.put("messageToRead", pagingReleaseService.getToReadCount());
 		return modelMap;
 	}
 
+	/**
+	 * 统计待阅读消息
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/message", method = RequestMethod.GET, headers = "Accept=application/json")
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public ModelMap getMessages() {
+		return new ModelMap("toRead", pagingReleaseService.getToReadCount());
+	}
+
 }

src/main/java/com/uas/platform/b2b/core/util/ThreadUtils.java

@@ -20,6 +20,9 @@ import com.uas.platform.core.concurrent.IRunnableAdapter;
 import com.uas.platform.core.concurrent.Listener;
 import com.uas.platform.core.concurrent.Listeners;
 
+/**
+ * 多线程处理工具
+ */
 public class ThreadUtils {
 
 	public static <T> Runner<T> tasks(IRunnable<T> runnable, List<T> paramList) {

src/main/webapp/WEB-INF/views/normal/index.html

@@ -53,9 +53,9 @@
 						<input type="search" ng-model="keyword" placeholder=" 输入企业或器件" ng-search="search(keyword)"><a class="btn input-group-addon" ng-click="search(keyword)">搜索</a>
 					</div>
 				</ul>
-				<div id="home-headerBtns" ng-controller="TodoCtrl">
+				<div id="home-headerBtns" ng-controller="HeaderCtrl">
 					<a href="javascript:void(0);" class="moblie-btn"><i class="fa fa-tablet fa-lg"></i></a>
-					<a ng-click="showMessage()" title="查看消息" ng-class="{'notice-dot': todo.messageToRead > 0}"><i class="fa fa-comments-o fa-lg"></i><em></em></a>
+					<a ng-click="showMessage()" title="查看消息" ng-class="{'notice-dot': message.toRead > 0}"><i class="fa fa-comments-o fa-lg"></i><em></em></a>
 					<a ui-sref="approvalflow.flow"><i class="fa fa-cog fa-lg"></i></a>
 					<a ng-click="logout()" title="退出登录"><i class="fa fa-power-off fa-lg"></i></a>
 				</div>

src/main/webapp/resources/js/common/services.js

@@ -116,17 +116,6 @@ define(['angular', 'toaster'], function(angular) {
             root: function() {
                 return rootPath;
             },
-            /*login: function(user) {
-                var payload = SerializerUtil.param(user);
-                var config = {
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-                    }
-                };
-                var login = $http.post(rootPath + "/j_spring_security_check", payload, config);
-                login.success(cacheSession);
-                return login;
-            },*/
             logout: function() {
             	var config = {
 					cache: false,
@@ -159,7 +148,7 @@ define(['angular', 'toaster'], function(angular) {
                 return SessionService.get('authenticated');
             },
             getAuthentication: function() {
-                var request = $http.get(rootPath + '/authentication');
+                var request = $http.get(rootPath + '/authentication', {cache: true});
                 request.success(function(data) {
                     if (data) cacheSession();
                     else uncacheSession();
@@ -175,7 +164,7 @@ define(['angular', 'toaster'], function(angular) {
         var rootPath = BaseService.getRootPath();
         return {
             getTodo: function(success) {
-                var request = $http.get(rootPath + '/snapshot/todo');
+                var request = $http.get(rootPath + '/snapshot/todo', {cache: true});
                 request.success(function(data) {
                     success.call(null, data);
                 });
@@ -186,17 +175,17 @@ define(['angular', 'toaster'], function(angular) {
                     success.call(null, data.content);
                 });
             },
-            // getTender: function(count, success) {
-            //     var request = $http.get(rootPath + '/tender/latestTender?page=1&count=' + count);
-            //     request.success(function(data) {
-            //         success.call(null, data);
-            //     });
-            // },
             getOpenTender: function(success) {
                 var request = $http.get(rootPath + '/tender/latestOpenTender');
                 request.success(function(data) {
                     success.call(null, data);
                 });
+            },
+            getMessage: function(success) {
+                var request = $http.get(rootPath + '/snapshot/message');
+                request.success(function(data) {
+                    success.call(null, data);
+                });
             }
         };
     }]).factory('SerializerUtil', function() {

src/main/webapp/resources/js/index/app.js

@@ -833,7 +833,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     selectedMessages.push(message);
                 }
             });
-            console.log(selectedMessages);
             PagingRelease.setRead({}, selectedMessages , function(message) {
                 $scope.tableParams.page(1);
                 $scope.tableParams.reload();
@@ -1117,6 +1116,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		    window.location.hash = '#/purc/tender';
         }
 	}]);
+	// header
+	app.controller('HeaderCtrl', ['$scope', 'SnapshotService', function($scope, SnapshotService){
+		SnapshotService.getMessage(function(data){
+			$scope.message = data;
+		});
+	}]);
 	
 	app.controller('TruckCtrl', ['$scope', '$rootScope', '$modal', 'SaleTruck', function($scope, $rootScope, $modal, SaleTruck){
 		SaleTruck.query({}, function(data){
@@ -1436,7 +1441,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         SnapshotService.getOpenTender(function(data){
             $scope.openTenders = data;
             var newDate = new Date();
-            console.log(data);
             newDate = newDate.getTime() - 3*24*60*60*1000;
             angular.forEach($scope.openTenders, function(tender) {
                 if (tender.date - newDate > 0) {
@@ -1564,7 +1568,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
   		
   		// 查看详情
 		$scope.viewDetail = function(id) {
-			console.log(id);
 			window.location.hash = "#/sale/customer/" + id;
 		}
 
@@ -2555,7 +2558,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 得到消息
 		PurcInquiry.getMessage({}, function(data){
-			console.log(data);
 			$scope.message = data;
 		}, function(response) {
 			
@@ -3752,7 +3754,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			if(!mould.history) {
 				PurcInquiryMould.getHistory({id: mould.id}, function(data){
 					mould.history = data;
-					console.log(mould.history);
 				});
 			}
 		};
@@ -3769,11 +3770,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					json: $scope.mould
 				}
 			}).success(function(res){
-				console.log("success");
-				console.log(res);
 			}).error(function(res){
-				console.log("failure");
-				console.log(res);
 			});
 		}
 		
@@ -3891,7 +3888,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			if(!mould.history) {
 				PurcInquiryMould.getHistory({id: mould.id}, function(data){
 					mould.history = data;
-					console.log(mould.history);
 				});
 			}
 		};
@@ -5362,7 +5358,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		};
 		//打印  样品采购单
 		$scope.print = function(sample) {
-			console.log(sample);
 			PurcSample.printCount({id: sample.id},{});//增加打印此次
 			ReportService.print(sample.proofing.enUU, 'PURCPROOFING',"where purc$proofingitems.ppi_id =" + sample.id);
 		};
@@ -5555,7 +5550,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						console.log(page);
 						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
@@ -7054,7 +7048,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$scope.distributes = data;
 		},function(response) {
 			toaster.pop('error', '系统错误', response.data);
-		})
+		});
 		AuthenticationService.getAuthentication().success(function(data) {
 			$scope.loading = false;
 			$scope.user = data;
@@ -8771,7 +8765,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	app.controller('CustServeCtrl', ['$scope', 'Vendor', function($scope, Vendor){
 		Vendor.getServe(function(datas){
 			$scope.vendors = datas;
-			console.log($scope.Vender);
 			// 自动跳转
 			if(datas && datas.length == 1)
 				$scope.redirect(datas[0]);
@@ -9066,7 +9059,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					$scope.prodInfo.cmpUuId = data.uuid;
 					$scope.prodInfo.cmpCode = data.code;
 					$scope.prodInfo.brand = data.brand.nameEn;
-					console.log($scope.prodInfo.brand);
 				}, function(){
 					
 				});
@@ -9280,7 +9272,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				pageParams.keyword = $scope.keyword;
 				pageParams.kindId = KindId;
 				ComponentActive.getComponentsByKindid(BaseService.parseParams(pageParams), function(page) {
-					console.log(page);
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);
@@ -9503,7 +9494,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 联想词 start
 		// 获取供应商
         $scope.getSimilarVendors = function(value) {
-        	console.log(value);
             if (value) {
                 return Vendor.getSimilarVendors({keyword : value}).$promise.then(function(data) {
                     return data.map(function(item) {
@@ -9782,7 +9772,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
   		
   		$scope.ensure = false;
   		$scope.check = function(vendor) { // 需要进行判断的选择
-  			console.log(vendor);
   			$scope.vendorInfo = vendor;
   			$scope.ensure = true;
   		};
@@ -10279,7 +10268,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				};
 				getService()[getMessagetStatus($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
-					console.log(page);
 					if(page) {
 						params.total(page.totalElement);
 						$defer.resolve(page.content);
@@ -10323,7 +10311,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 获取所有的合作伙伴
 		GetProductInfo.getAllPartners({}, function(data) {
-			console.log(data);
 			$scope.partners = data;
 		}, function(res) {
 			toaster.pop('error', '获取列表失败', res.data);
@@ -10460,7 +10447,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 提交
 		$scope.addtoOrder = function(id) {
-			console.log(id);
 			cartOperation.addToOrder({id: id}, {}, function(data) {
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
@@ -10586,7 +10572,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 提交
 		$scope.addtoOrder = function(id) {
-			console.log(id);
 			cartOperation.addToOrder({id: id}, {}, function(data) {
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
@@ -11651,7 +11636,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             modalInstance.opened.then(function(){// 模态窗口打开之后执行的函数
             });
             modalInstance.result.then(function(brand){
-                console.log(brand);
                 prod.brand = brand.nameCn;
             }, function(reason){
 
@@ -11742,7 +11726,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     for(var i = 0; i < $scope.tenderProd.length; i++) {
                         if($scope.tenderProd[i].prodTitle == null) { // 如果没有填写就删除这行数据
                             $scope.tenderProd.splice(i, 1);
-                            console.log($scope.tenderProd);
                         }
                     }
                 });
@@ -11769,7 +11752,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     }
                 });
                 $rootScope.tenderVendor = $scope.tenderProd.enterpriseBaseInfo;
-                console.log($scope.tenderProd.enterpriseBaseInfo);
                 $scope.loading  = false;
 
                 $scope.attaches = $scope.tender.tenderAttaches;
@@ -11955,7 +11937,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
                 $scope.tender.tenderAttaches = $scope.attaches;
                 $scope.tender.shipAddress = $scope.tender.shipadd.address + $scope.tender.shipadd.addressdet + ' ' + $scope.tender.shipadd.receiver + ' ' + $scope.tender.shipadd.usertel;
-                console.log($scope.tender.shipAddress);
                 var vendorUUs = [];
                 angular.forEach($scope.tenderProd.enterpriseBaseInfo, function(enterpriseBaseInfo){
                     vendorUUs.push(enterpriseBaseInfo.uu);
@@ -12039,7 +12020,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 angular.forEach($scope.tenderProd.enterpriseBaseInfo, function(enterpriseBaseInfo){ // 供应商uu号参数
                     vendorUUs.push(enterpriseBaseInfo.uu);
                 });
-                console.log($scope);
                 if (isPublish) { // 发布
                     toaster.pop('info', '提示', '正在发布，请稍候');
                     PurcTender.publishSaved({tender: $scope.tender, vendorUUs: vendorUUs}, {},  function(data){
@@ -12254,7 +12234,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 file: file,
                 method: 'POST'
             }).success(function(data) {
-                console.log(data);
                 $scope.result = data;
                 $scope.success = $scope.result.success;
                 $scope.total = $scope.result.total;
@@ -12303,7 +12282,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             PurcTender.getOne({id: $stateParams.id}, function(data){
                 data.$editing = false;
                 $scope.tender = data;
-                console.log(typeof data.purchaseTenderProds[0].saleTenderItems[0].cycle);
                 $scope.tableParams = new ngTableParams({}, { dataset: data});
                 // $scope.tableParams.sorting($scope.sort.field, $scope.sort.desc);
                 $scope.loading  = false;
@@ -12453,7 +12431,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     if(page) {
                         params.total(page.totalElement);
                         $defer.resolve(page.content);
-                        console.log(page.content);
                         // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
                         angular.forEach(page.content, function(purcTender) {
                             purcTender.vendorHasBid = false;
@@ -12678,7 +12655,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         //     $scope.loading  = false;
         //     toaster.pop('error', '数据加载失败', response.data);
         // });
-        console.log($stateParams);
         PurcTender.getOne({id: $stateParams.id}, function(data){
             $scope.bid = data;
             var vendUU = Number($stateParams.vendUU);
@@ -13121,7 +13097,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
   		
   		// 查看详情
 		$scope.viewDetail = function(id) {
-			console.log(id);
 			window.location.hash = "#/sale/customer/" + id;
 		}