From 23ac9fcea79c39b018e29c5d4a27cb7805906c7f Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Fri, 23 Oct 2020 10:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=A2=E9=98=85=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=88=A0=E9=99=A4messageTime=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/WxSubscribeMessageFormDTO.java     | 6 ------
 .../com/epmet/service/impl/WxmpMessageServiceImpl.java    | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java
index 9a55b17386..f712c2106f 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java
@@ -48,12 +48,6 @@ public class WxSubscribeMessageFormDTO implements Serializable {
     @NotBlank(message = "消息内容不能为空")
     private String messageContent;
 
-    /**
-     * 消息时间
-     */
-    @NotBlank(message = "消息时间不能为空")
-    private String messageTime;
-
     /**
      * 所需下发的订阅模板id
      */
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 b31a14ac61..4a69f3e68a 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
@@ -181,7 +181,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 				jsonObject.put(WxmpMessageConstant.TEMPLATE_ID, templateId);
 				data.put(WxmpMessageConstant.TITLE, new JSONObject().put("value", ("您有一条" + msg.getBehaviorType()).substring(0,WxmpMessageConstant.TITLE_LIMIT)));
 				data.put(WxmpMessageConstant.MESSAGE_CONTENT, new JSONObject().put("value", msg.getMessageContent().substring(0,WxmpMessageConstant.MESSAGE_CONTENT_LIMIT)));
-				data.put(WxmpMessageConstant.MESSAGE_TIME, new JSONObject().put("value", msg.getMessageTime()));
+				data.put(WxmpMessageConstant.MESSAGE_TIME, new JSONObject().put("value", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date())));
 				jsonObject.put(WxmpMessageConstant.DATA, data);
 				EnvEnum envEnum = EnvEnum.getCurrentEnv();
 				//选填项
@@ -273,11 +273,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 		wxmpMsgSendRecordEntity.setBehaviorType(msg.getBehaviorType());
 		wxmpMsgSendRecordEntity.setTitle("您有一条" + msg.getBehaviorType());
 		wxmpMsgSendRecordEntity.setMessageContent(msg.getMessageContent());
-		try {
-			wxmpMsgSendRecordEntity.setMessageTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(msg.getMessageTime()));
-		} catch (ParseException e) {
-			wxmpMsgSendRecordEntity.setMessageTime(new Date());
-		}
+		wxmpMsgSendRecordEntity.setMessageTime(new Date());
 		wxmpMsgSendRecordEntity.setResult(status);
 		return wxmpMsgSendRecordEntity;
 	}