From 1a89da20c94e106d469e42b90afd5c6bef86f7f9 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Thu, 22 Oct 2020 16:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=BE=AE=E4=BF=A1=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=204?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/WxmpMessageController.java | 3 +++
 .../com/epmet/service/impl/WxmpMessageServiceImpl.java   | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMessageController.java
index 05887e3e54..23e854f9de 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMessageController.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMessageController.java
@@ -66,6 +66,9 @@ public class WxmpMessageController {
 	}
 	@PostMapping("sendwxsubscribemessage")
 	public Result sendWxSubscribeMessage(@RequestBody List<WxSubscribeMessageFormDTO> msgList){
+		for (WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO : msgList) {
+			ValidatorUtils.validateEntity(wxSubscribeMessageFormDTO);
+		}
 		wxmpMessageService.sendWxSubscribeMessage(msgList);
 		return new Result();
 	}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index 328cdd9aeb..377fad7f0a 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -117,8 +117,6 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 		int succecssCount = 0;
 		for (WxSubscribeMessageFormDTO msg : msgList) {
 			try {
-				ValidatorUtils.validateEntity(msg);
-
 				String userId = msg.getUserId();
 				String clientType = msg.getClientType();
 				String customerId = msg.getCustomerId();
@@ -238,9 +236,9 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 			} catch (Exception e) {
 				String errMsg = e.getMessage();
 				//ValidateException错误信息为getMsg
-				if (StringUtils.isBlank(errMsg) && e instanceof ValidateException) {
-					errMsg = ((ValidateException) e).getMsg();
-				}
+//				if (StringUtils.isBlank(errMsg) && e instanceof ValidateException) {
+//					errMsg = ((ValidateException) e).getMsg();
+//				}
 				if (e instanceof WxSubscribeException){
 					//存表
 					WxmpMsgSendRecordEntity wxmpMsgSendRecordEntity = initRecord(msg, ((WxSubscribeException) e).getOpenId(), WxmpMessageConstant.ERROR);
@@ -257,6 +255,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 		}
 		logger.info("{}条消息中的{}条发送成功", msgList.size(), succecssCount);
 	}
+	//初始化记录对象
 	private WxmpMsgSendRecordEntity initRecord(WxSubscribeMessageFormDTO msg, String openId, String status){
 		WxmpMsgSendRecordEntity wxmpMsgSendRecordEntity = new WxmpMsgSendRecordEntity();
 		wxmpMsgSendRecordEntity.setCustomerId(msg.getCustomerId());