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

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

@@ -59,7 +59,7 @@ public class InquiryController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Inquiry> inquiries = FlexJsonUtils.fromJsonArray(jsonStr, Inquiry.class);
 		purchaseInquiryService.save(inquiryService.convertInquiry(inquiries));
-		logger.log("上传询价单", inquiries.size());
+		logger.log("询价单", "上传询价单", inquiries.size());
 	}
 
 	/**
@@ -71,7 +71,7 @@ public class InquiryController {
 	@ResponseBody
 	public List<InquiryDetail> getReply() {
 		List<InquiryDetail> details = inquiryService.convertPurchaseInquiryReply(purchaseInquiryService.findNotUploadReply());
-		logger.log("下载询价单报价结果", details.size());
+		logger.log("询价单", "下载询价单报价结果", details.size());
 		return details;
 	}
 
@@ -113,7 +113,7 @@ public class InquiryController {
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "inquiry", "客户采购询价单附件", fileList);
 		purchaseInquiryService.saveAttach(attachs);
-		logger.log("询价单附件上传", attachs.size());
+		logger.log("询价单", "询价单附件上传", attachs.size());
 	}
 
 }

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

@@ -47,7 +47,7 @@ public class InquiryDownController {
 	@ResponseBody
 	public List<Inquiry> getInquiries() {
 		List<Inquiry> inquiries = inquiryService.convertSaleQuotation(saleQuotationService.findNotUploadQuotation());
-		logger.log("下载来自供应商的主动报价", inquiries.size());
+		logger.log("主动报价单", "下载来自供应商的主动报价", inquiries.size());
 		return inquiries;
 	}
 

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

@@ -34,7 +34,7 @@ public class ProductController {
 
 	@Autowired
 	private ProductService productService;
-	
+
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
@@ -50,7 +50,7 @@ public class ProductController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Prod> prods = FlexJsonUtils.fromJsonArray(jsonStr, Prod.class);
 		productService.save(prodService.convertProduct(prods));
-		logger.log("上传物料资料", prods.size());
+		logger.log("物料资料", "上传物料资料", prods.size());
 	}
 
 }

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

@@ -35,7 +35,7 @@ public class PurchaseChangeController {
 
 	@Autowired
 	private PurchaseOrderChangeService purchaseOrderChangeService;
-	
+
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
@@ -51,7 +51,7 @@ public class PurchaseChangeController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseChange> changes = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseChange.class);
 		purchaseOrderChangeService.save(purchaseChangeService.convertPurchaseChange(changes));
-		logger.log("上传采购变更单", changes.size());
+		logger.log("采购变更单", "上传采购变更单", changes.size());
 	}
 
 	/**
@@ -62,8 +62,9 @@ public class PurchaseChangeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<PurchaseChangeReply> getReply() {
-		List<PurchaseChangeReply> replies = purchaseChangeService.convertPurchaseOrderChangeReply(purchaseOrderChangeService.findNotUploadReply());
-		logger.log("下载采购变更单回复信息", replies.size());
+		List<PurchaseChangeReply> replies = purchaseChangeService.convertPurchaseOrderChangeReply(purchaseOrderChangeService
+				.findNotUploadReply());
+		logger.log("采购变更单", "下载采购变更单回复信息", replies.size());
 		return replies;
 	}
 

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

@@ -52,7 +52,7 @@ public class PurchaseController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Purchase> purchases = FlexJsonUtils.fromJsonArray(jsonStr, Purchase.class);
 		purchaseOrderService.save(purchaseService.convertPurchase(purchases));
-		logger.log("上传采购单", purchases.size());
+		logger.log("采购单", "上传采购单", purchases.size());
 	}
 
 	/**
@@ -63,9 +63,8 @@ public class PurchaseController {
 	@RequestMapping(value = "/reply", method = RequestMethod.GET)
 	@ResponseBody
 	public List<PurchaseReply> getReply() {
-		List<PurchaseReply> replies = purchaseService.convertPurchaseOrderReply(purchaseOrderService
-				.findNotUploadReply());
-		logger.log("下载采购单回复记录", replies.size());
+		List<PurchaseReply> replies = purchaseService.convertPurchaseOrderReply(purchaseOrderService.findNotUploadReply());
+		logger.log("采购单", "下载采购单回复记录", replies.size());
 		return replies;
 	}
 
@@ -82,7 +81,7 @@ public class PurchaseController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseReply.class);
 		purchaseOrderService.reply(purchaseService.convertPurchaseReply(replies));
-		logger.log("上传采购单主动回复", replies.size());
+		logger.log("采购单", "上传采购单主动回复", replies.size());
 	}
 
 	/**
@@ -109,7 +108,7 @@ public class PurchaseController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseDetailEnd> ends = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseDetailEnd.class);
 		purchaseOrderService.saveItems(purchaseService.convertPurchaseEnd(ends));
-		logger.log("上传结案、反结案采购单", ends.size());
+		logger.log("采购单", "上传结案、反结案采购单", ends.size());
 	}
 
 }

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

@@ -51,7 +51,7 @@ public class PurchaseNotifyController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseNotify> notifies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
 		purchaseNoticeService.save(purchaseNotifyService.convertPurchaseNotify(notifies));
-		logger.log("上传送货提醒", notifies.size());
+		logger.log("送货提醒", "上传送货提醒", notifies.size());
 	}
 
 	/**
@@ -63,7 +63,7 @@ public class PurchaseNotifyController {
 	@ResponseBody
 	public List<AcceptNotify> getAcceptNotify() {
 		List<AcceptNotify> notifies = purchaseNotifyService.convertSaleSend(purchaseNoticeService.findNotUploadSend());
-		logger.log("下载来自供应商的发货单", notifies.size());
+		logger.log("供应商发货单", "下载来自供应商的发货单", notifies.size());
 		return notifies;
 	}
 
@@ -92,7 +92,7 @@ public class PurchaseNotifyController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<AcceptNotify> accepts = FlexJsonUtils.fromJsonArray(jsonStr, AcceptNotify.class);
 		purchaseNoticeService.send(purchaseNotifyService.convertAcceptNotify(accepts));
-		logger.log("上传主动收料通知单", accepts.size());
+		logger.log("主动收料通知单", "上传主动收料通知单", accepts.size());
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class PurchaseNotifyController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseNotify> ends = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
 		purchaseNoticeService.end(ends);
-		logger.log("上传结案送货提醒", ends.size());
+		logger.log("送货提醒", "上传结案送货提醒", ends.size());
 	}
 
 }

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

@@ -51,7 +51,7 @@ public class QuotationController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Quotation> quotations = FlexJsonUtils.fromJsonArray(jsonStr, Quotation.class);
 		saleQuotationService.save(quotationService.convertQuotation(quotations));
-		logger.log("上传主动报价", quotations.size());
+		logger.log("主动报价单", "上传主动报价", quotations.size());
 	}
 
 	/**
@@ -63,7 +63,7 @@ public class QuotationController {
 	@ResponseBody
 	public List<QuotationDecide> getQuotationDecide() {
 		List<QuotationDecide> decides = quotationService.convertQuotationDecide(saleQuotationService.findNotUploadQuotationDecide());
-		logger.log("下载客户对报价单的采纳结果", decides.size());
+		logger.log("主动报价单", "下载客户对主动报价的采纳结果", decides.size());
 		return decides;
 	}
 

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

@@ -47,7 +47,7 @@ public class QuotationDownController {
 	@ResponseBody
 	public List<QuotationDown> getQuotations() {
 		List<QuotationDown> downs = quotationDownService.convertPurchaseInquiry(purchaseInquiryService.findNotUploadInquiry());
-		logger.log("下载客户采购询价单", downs.size());
+		logger.log("客户询价单", "下载客户询价单", downs.size());
 		return downs;
 	}
 
@@ -76,7 +76,7 @@ public class QuotationDownController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<QuotationDown> downs = FlexJsonUtils.fromJsonArray(jsonStr, QuotationDown.class);
 		purchaseInquiryService.reply(downs);
-		logger.log("上传客户询价单的报价信息", downs.size());
+		logger.log("客户询价单", "上传客户询价单的报价信息", downs.size());
 	}
 
 	/**
@@ -88,7 +88,7 @@ public class QuotationDownController {
 	@ResponseBody
 	public List<QuotationDown> getReply() {
 		List<QuotationDown> downs = quotationDownService.convertInquiryReply(purchaseInquiryService.findNotUploadInquiryReply());
-		logger.log("下载在平台报价的客户询价单报价信息", downs.size());
+		logger.log("客户询价单", "下载在平台报价的客户询价单报价信息", downs.size());
 		return downs;
 	}
 
@@ -113,7 +113,7 @@ public class QuotationDownController {
 	@ResponseBody
 	public List<QuotationDownDecide> getReplyDecide() {
 		List<QuotationDownDecide> decides = quotationDownService.convertInquiryReplyDecide(purchaseInquiryService.findNotUploadInquiryReplyDecide());
-		logger.log("下载客户对客户询价单报价信息的采纳结果", decides.size());
+		logger.log("客户询价单", "下载客户对客户询价单报价信息的采纳结果", decides.size());
 		return decides;
 	}
 

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

@@ -46,7 +46,7 @@ public class SaleDownChangeController {
 	@ResponseBody
 	public List<SaleDownChange> getOrderChanges() {
 		List<SaleDownChange> changes = saleDownChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findNotUploadOrderChange());
-		logger.log("下载客户采购变更单", changes.size());
+		logger.log("客户采购变更单", "下载客户采购变更单", changes.size());
 		return changes;
 	}
 
@@ -75,7 +75,7 @@ public class SaleDownChangeController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<SaleDownChangeReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleDownChangeReply.class);
 		purchaseOrderChangeService.reply(replies);
-		logger.log("上传客户采购变更单的回复信息", replies.size());
+		logger.log("客户采购变更单", "上传客户采购变更单的回复信息", replies.size());
 	}
 
 	/**
@@ -87,7 +87,7 @@ public class SaleDownChangeController {
 	@ResponseBody
 	public List<SaleDownChangeReply> getChangeReply() {
 		List<SaleDownChangeReply> replies = saleDownChangeService.convertOrderChangeReply(purchaseOrderChangeService.findNotSendReply());
-		logger.log("下載在平台回复的客户采购变更单回复信息", replies.size());
+		logger.log("客户采购变更单", "下載在平台回复的客户采购变更单回复信息", replies.size());
 		return replies;
 	}
 

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

@@ -47,7 +47,7 @@ public class SaleDownController {
 	@ResponseBody
 	public List<SaleDown> getOrders() {
 		List<SaleDown> downs = saleDownService.convertPurchaseOrder(purchaseOrderService.findNotUploadOrder());
-		logger.log("下载客户采购订单", downs.size());
+		logger.log("客户采购单", "下载客户采购单", downs.size());
 		return downs;
 	}
 
@@ -76,7 +76,7 @@ public class SaleDownController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<SaleReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleReply.class);
 		purchaseOrderService.reply(saleDownService.convertSaleReply(replies));
-		logger.log("上传客户采购单回复信息", replies.size());
+		logger.log("客户采购单", "上传客户采购单回复信息", replies.size());
 	}
 
 	/**
@@ -88,7 +88,7 @@ public class SaleDownController {
 	@ResponseBody
 	public List<SaleReply> getReply() {
 		List<SaleReply> replies = saleDownService.convertOrderReply(purchaseOrderService.findNotSendReply());
-		logger.log("下载直接在平台回复的客户采购单回复信息", replies.size());
+		logger.log("客户采购单", "下载直接在平台回复的客户采购单回复信息", replies.size());
 		return replies;
 	}
 
@@ -113,7 +113,7 @@ public class SaleDownController {
 	@ResponseBody
 	public List<SaleDownDetailEnd> getSaleEnd() {
 		List<SaleDownDetailEnd> ends = saleDownService.convertOrderItemEnd(purchaseOrderService.findNotSendEnd());
-		logger.log("下载结案、反结案的客户采购单", ends.size());
+		logger.log("客户采购单", "下载结案、反结案的客户采购单", ends.size());
 		return ends;
 	}
 

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

@@ -48,7 +48,7 @@ public class SaleNotifyDownController {
 	@ResponseBody
 	public List<SaleNotifyDown> getNotices() {
 		List<SaleNotifyDown> downs = saleNotifyDownService.convertPurchaseNotice(purchaseNoticeService.findNotUploadNotice());
-		logger.log("下载客户送货提醒", downs.size());
+		logger.log("客户送货提醒", "下载客户送货提醒", downs.size());
 		return downs;
 	}
 
@@ -77,7 +77,7 @@ public class SaleNotifyDownController {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<SaleOut> outs = FlexJsonUtils.fromJsonArray(jsonStr, SaleOut.class);
 		purchaseNoticeService.send(saleNotifyDownService.convertSaleOut(outs));
-		logger.log("上传发货单", outs.size());
+		logger.log("发货单", "上传发货单", outs.size());
 	}
 
 	/**
@@ -89,7 +89,7 @@ public class SaleNotifyDownController {
 	@ResponseBody
 	public List<SaleOut> getSaleOut() {
 		List<SaleOut> outs = saleNotifyDownService.convertSaleSend(purchaseNoticeService.findNotSendSend());
-		logger.log("下载直接在平台发货的发货单", outs.size());
+		logger.log("发货单", "下载直接在平台发货的发货单", outs.size());
 		return outs;
 	}
 
@@ -114,7 +114,7 @@ public class SaleNotifyDownController {
 	@ResponseBody
 	public List<SaleNotifyDownEnd> getSaleNotifyEnd() {
 		List<SaleNotifyDownEnd> ends = saleNotifyDownService.convertPurchaseNoticeEnd(purchaseNoticeService.findNotSendEnd());
-		logger.log("下载结案客户送货提醒", ends.size());
+		logger.log("客户送货提醒", "下载结案客户送货提醒", ends.size());
 		return ends;
 	}
 

src/main/java/com/uas/platform/b2b/erp/model/ErpLog.java

@@ -57,6 +57,9 @@ public class ErpLog extends BufferedLogable implements Serializable {
 	@Column(name = "log_ip")
 	private String ip;
 
+	@Column(name = "log_title")
+	private String title;
+
 	@Column(name = "log_message")
 	private String message;
 
@@ -107,6 +110,14 @@ public class ErpLog extends BufferedLogable implements Serializable {
 		this.ip = ip;
 	}
 
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
 	public String getMessage() {
 		return message;
 	}
@@ -127,8 +138,9 @@ public class ErpLog extends BufferedLogable implements Serializable {
 
 	}
 
-	public ErpLog(String message, int total) {
+	public ErpLog(String title, String message, int total) {
 		this.enUU = SystemSession.getUser().getEnterprise().getUu();
+		this.title = title;
 		this.message = message;
 		this.time = new Date().getTime();
 		this.total = total;
@@ -138,13 +150,14 @@ public class ErpLog extends BufferedLogable implements Serializable {
 
 	public void bufferedLog(String bufferedMessage) {
 		String[] strArray = bufferedMessage.split(separator);
-		if (strArray.length == 6) {
+		if (strArray.length >= 7) {
 			this.time = Long.parseLong(strArray[0]);
 			this.ip = strArray[1];
 			this.enUU = Long.parseLong(strArray[2]);
 			this.userUU = Long.parseLong(strArray[3]);
-			this.message = strArray[4];
-			this.total = Integer.parseInt(strArray[5]);
+			this.title = strArray[4];
+			this.message = strArray[5];
+			this.total = Integer.parseInt(strArray[6]);
 		}
 	}
 
@@ -155,6 +168,7 @@ public class ErpLog extends BufferedLogable implements Serializable {
 		sb.append(this.ip).append(separator);
 		sb.append(this.enUU).append(separator);
 		sb.append(this.userUU).append(separator);
+		sb.append(this.title).append(separator);
 		sb.append(this.message).append(separator);
 		sb.append(this.total);
 		return sb.toString();

src/main/java/com/uas/platform/b2b/erp/support/ErpBufferedLogger.java

@@ -20,13 +20,15 @@ public class ErpBufferedLogger extends BufferedLogger<ErpLog> {
 	/**
 	 * 记录erp交互日志
 	 * 
+	 * @param title
+	 *            消息标题
 	 * @param message
 	 *            消息
 	 * @param total
 	 *            数据量
 	 */
-	public void log(String message, int total) {
-		log(new ErpLog(message, total));
+	public void log(String title, String message, int total) {
+		log(new ErpLog(title, message, total));
 	}
-	
+
 }