Merge branch 'dev_wx_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg

 Conflicts:

	epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/WxSubscribeMessageFormDTO.java

@@ -48,4 +48,10 @@ public class WxSubscribeMessageFormDTO implements Serializable {
     @NotBlank(message = "消息内容不能为空")
     private String messageContent;
 
+    /**
+     * 消息时间
+     */
+    @NotNull(message = "消息时间不能为空")
+    private Date messageTime;
+
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -19,32 +19,28 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.WxMsgTemplateSubscribeStatus;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.WxmpMessageConstant;
 import com.epmet.dao.WxmpResiUserSubscribeDao;
 import com.epmet.dao.WxmpTemplateMsgSubscribeStatusDao;
-import com.epmet.dao.WxmpUserSubscribeRecordDao;
 import com.epmet.dao.WxmpWorkUserSubscribeDao;
 import com.epmet.dto.form.GetTemplateListFormDTO;
 import com.epmet.dto.form.StaffBasicInfoFormDTO;
 import com.epmet.dto.form.UserBasicInfoFormDTO;
 import com.epmet.dto.form.WxSubscribeMessageFormDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
-import com.epmet.dto.result.StaffBasicInfo;
+import com.epmet.entity.WxmpMsgSendRecordEntity;
-import com.epmet.dto.result.UserBasicInfo;
+import com.epmet.entity.WxmpTemplateMsgSubscribeStatusEntity;
-import com.epmet.dto.result.WxMsgAuthInfoResultDTO;
-import com.epmet.entity.*;
 import com.epmet.exception.WxSubscribeException;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.WxmpMessageRedis;
-import com.epmet.redis.WxmpMsgSendRecordRedis;
 import com.epmet.service.WxmpMessageService;
 import com.epmet.service.WxmpMsgSendRecordService;
 import org.apache.commons.lang3.StringUtils;
@@ -54,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -209,7 +206,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", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date())));
+                data.put(WxmpMessageConstant.MESSAGE_TIME, new JSONObject().put("value", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(msg.getMessageTime())));
                 jsonObject.put(WxmpMessageConstant.DATA, data);
                 EnvEnum envEnum = EnvEnum.getCurrentEnv();
                 //选填项
@@ -302,7 +299,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         wxmpMsgSendRecordEntity.setBehaviorType(msg.getBehaviorType());
         wxmpMsgSendRecordEntity.setTitle("您有一条" + msg.getBehaviorType());
         wxmpMsgSendRecordEntity.setMessageContent(msg.getMessageContent());
-		wxmpMsgSendRecordEntity.setMessageTime(new Date());
+        wxmpMsgSendRecordEntity.setMessageTime(msg.getMessageTime());
         wxmpMsgSendRecordEntity.setResult(status);
         return wxmpMsgSendRecordEntity;
     }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -460,6 +460,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_GROUP_BEHAVIOR);
 		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -653,6 +653,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
 		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -66,10 +66,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -449,6 +446,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
 		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
+		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);
 		epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);