去掉采购单中产生消息调用存储过程

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

src/main/java/com/uas/platform/b2b/dao/PagingReleaseDetailDao.java

@@ -55,24 +55,6 @@ public interface PagingReleaseDetailDao extends JpaRepository<PagingReleaseDetai
     @Query("select p.sourceId from PagingRelease p, PagingReleaseDetail d where p.id = d.pagingRelease.id and d.vendUserUU = :vendUseruu and d.vendUU = :venduu and d.readStatus = 0 and p.table = :table and p.category = :category")
     List<Long> getUnreadIds(@Param("vendUseruu") Long vendUseruu, @Param("venduu") Long venduu, @Param("table") String table, @Param("category") String category);
 
-    /**
-     *  修改消息阅读状态时调用，用来更新消息数量统计表(有setReadStatus（）时调用)
-     * @param vendUU  接收企业uu
-     * @param vendUserUU   接收人uu
-     * @param table  单据表名
-     * @param category  单据分类
-     */
-    @Procedure(procedureName = "PURC_PRC_BY_PRD")
-    void updateReleaseCountBySetReadStatus(Long vendUU, Long vendUserUU, String table, String category);
-
-    /**
-     *  单据状态改变时调用，更新消息数量统计表（单据的setStatus（）时调用）
-     * @param table   单据表名
-     * @param category   单据分类
-     */
-    @Procedure(procedureName = "PURC_PRC_BY_PR")
-    void updateReleaseCountBySetOrderStatus(String table, String category);
-
     /**
      * 查找当前用户未读消息
      * @param userUU

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileReleaseServiceImpl.java

@@ -209,7 +209,6 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
                 success = true;
                 // 每条消息更新之后都需要调用存储过程去更新消息数量表的对应记录，所以这里单条保存
                 detail = pagingReleaseDetailDao.save(detail);
-                pagingReleaseDetailDao.updateReleaseCountBySetReadStatus(detail.getVendUU(), detail.getVendUserUU(), detail.getPagingRelease().getTable(), detail.getPagingRelease().getCategory());
             }
         }
         map.put("success", success);

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

@@ -1,62 +1,15 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.transaction.Transactional;
-
-import com.uas.platform.b2b.core.util.ThreadTask;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.account.entity.RequsetStatus;
 import com.uas.account.util.AccountUtils;
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.CartDetailDao;
-import com.uas.platform.b2b.dao.ComponentDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.PagingReleaseDao;
-import com.uas.platform.b2b.dao.PagingReleaseDetailDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.ProductMatchResultDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Cart;
-import com.uas.platform.b2b.model.CartDetail;
-import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.EnterpriseInfo;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductMatchResult;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.UserBaseInfo;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.b2b.temporary.model.NewPurcOrder;
-import com.uas.platform.b2b.temporary.model.OrderItems;
-import com.uas.platform.b2b.temporary.model.PartStatus;
-import com.uas.platform.b2b.temporary.model.ProdInfo;
-import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
+import com.uas.platform.b2b.temporary.model.*;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -66,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.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.transaction.Transactional;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 @Transactional
@@ -597,21 +562,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		logger.log("平台新增采购订单", "新增采购单", SystemSession.getUser().getUserName() + "新增了采购单");
 		final List<PurchaseOrderAllItem> orderAllItems = purchaseOrderAllItemDao.save(orderItems);
 		pagingReleaseDao.updateOrderStatus(purcOrder.getStatus(), purcOrder.getId());
-
-		//防止生成消息导致延迟
-		ThreadTask.getInstance().execute(new Runnable() {
-			@Override
-			public void run() {
-				// 生成消息
-				ContextUtils.publishEvent(new PurchaseOrderSaveReleaseEvent(PurchaseOrderAllItem.distinct(orderAllItems)));
-				try {
-					Thread.sleep(3000);
-				} catch (InterruptedException e) {
-				}
-				// 对接收人来说是销售订单
-				pagingReleaseDetailDao.updateReleaseCountBySetOrderStatus("purc$orders", "sale");
-			}
-		});
 		return orderAllItems;
 	}
 

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

@@ -125,8 +125,6 @@ public class CartServiceImpl implements CartService {
 		List<PurchaseOrderAllItem> orderItem = purchaseOrderAllItemDao.save(orderItems);
 		ContextUtils.publishEvent(new PurchaseOrderSaveReleaseEvent(PurchaseOrderAllItem.distinct(orderItem)));
 		pagingReleaseDao.updateOrderStatus(purcOrder.getStatus(), purcOrder.getId());
-		// 对接收人来说是销售订单 ，新增不传旧单据状态
-		pagingReleaseDetailDao.updateReleaseCountBySetOrderStatus("purc$orders", "sale");
 		cart.setStatus(Status.ENABLED.value());
 		cartDao.save(cart);
 		logger.log("平台新增采购单", "新增了一张采购单（" + orderItem.get(0).getOrder().getId() + "）",

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

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.dao.PagingReleaseDetailDao;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.service.PagingReleaseDetailService;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,11 +28,6 @@ public class PagingReleaseDetailServiceImpl implements PagingReleaseDetailServic
                 releaseDetail.setReadStatus(Constant.YES);
                 releaseDetail.setReadDate(new Date());
                 pagingReleaseDetailDao.save(releaseDetail);
-                PagingReleaseDetail detail = pagingReleaseDetailDao.findOne(releaseDetail.getId());
-                if (detail.getPagingRelease().getTable() != null && detail.getPagingRelease().getCategory() != null) {
-                    // 调用存储过程更新消息数量表,每条参数不一样所以需要单条保存
-                    pagingReleaseDetailDao.updateReleaseCountBySetReadStatus(SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), detail.getPagingRelease().getTable(), detail.getPagingRelease().getCategory());
-                }
             }
         }
     }
@@ -49,10 +43,6 @@ public class PagingReleaseDetailServiceImpl implements PagingReleaseDetailServic
             detail.setReadStatus(Constant.YES);
             detail.setReadDate(new Date());
             pagingReleaseDetailDao.save(detail);
-            if (detail.getPagingRelease().getTable() != null && detail.getPagingRelease().getCategory() != null) {
-                // 调用存储过程更新消息数量表,每条参数不一样所以需要单条保存
-                pagingReleaseDetailDao.updateReleaseCountBySetReadStatus(SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), detail.getPagingRelease().getTable(), detail.getPagingRelease().getCategory());
-            }
         }
     }
 }

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

@@ -120,8 +120,6 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 			purchaseOrderDao.save(order);
 //			if (order.getStatus() == Status.REPLIED.value()) {
 				pagingReleaseDao.updateOrderStatus(order.getStatus(), order.getId());
-				// 对接收人来说是销售订单 ，新增不传旧单据状态
-				pagingReleaseDetailDao.updateReleaseCountBySetOrderStatus("purc$orders", "sale");
 //			}
 		}
 	}

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

@@ -151,8 +151,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             pagingReleaseDao.updateOrderStatus(orderAll.getStatus(), orderAll.getId());
 		}
 		ContextUtils.publishEvent(new PurchaseOrderSaveReleaseEvent(orderAlls));
-		// 对接收人来说是销售订单 ，新增不传旧单据状态
-		pagingReleaseDetailDao.updateReleaseCountBySetOrderStatus("purc$orders", "sale");
 	}
 
 	@Override
@@ -316,10 +314,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			order.setEnd(Constant.NO);// 反结案之后
 		order = purchaseOrderDao.save(order);
 		pagingReleaseDao.updateOrderStatus(order.getStatus(), order.getId());
-//		if (order.getStatus() == Status.NOT_REPLY.value()) {
-//			// 对接收人来说是销售订单 ，新增不传旧单据状态
-		pagingReleaseDetailDao.updateReleaseCountBySetOrderStatus("purc$orders", "sale");
-//		}
 		return order;
 	}
 
@@ -1080,7 +1074,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	@Transactional
 	public void setReadByOrder(Long[] sourceId) {
 		pagingReleaseDetailDao.setReadByVendUserUUAndVendUUAndSourceId(SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu(),sourceId );
-        pagingReleaseDetailDao.updateReleaseCountBySetReadStatus(SystemSession.getUser().getEnterprise().getUu(),SystemSession.getUser().getUserUU(), "purc$orders", "sale");
 	}
 
 	@Override