From 3fa60cda31a392457e04905300711819b52fdce7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 27 May 2020 17:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=82=B9=E5=87=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=B0=8F=E7=BB=84=EF=BC=8C=E7=94=B3=E8=AF=B7=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=EF=BC=8C=E7=BB=99=E7=BB=84=E9=95=BF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/constant/UserMessageConstant.java |  5 ++-
 .../impl/ResiGroupMemberServiceImpl.java      | 42 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
index aae42ec1b6..71bef9e2d4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
@@ -10,7 +10,10 @@ public interface UserMessageConstant {
      * 消息标题
      */
     String GROUP_TITLE = "您有一条小组消息";
-
+    /**
+     * 居民申请入群，组长收到的消息通知内容如下：
+     */
+    String APPLY_JOIN_GROUP="居民%s申请加入小组【%s】，请审核";
     /**
      * 组长同意入群申请，用户会收到：您有一条小组消息。  您加入的【组名】已通过审核，请查看。
      */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index 6504aec8b9..b0a3192d2c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.modules.member.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -38,6 +39,7 @@ import com.epmet.feign.MessageFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupService;
@@ -114,6 +116,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 
 	@Autowired
 	private ResiGroupRedis resiGroupRedis;
+	@Autowired
+	private ResiGroupDao resiGroupDao;
 
 	@Override
 	public PageData<ResiGroupMemberDTO> page(Map<String, Object> params) {
@@ -232,8 +236,46 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperation.setCreatedBy(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperation.setOperateUserId(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperationService.save(groupMemeberOperation);
+		//给组长发送消息，有人申请入群
+		this.sendMessageToGroupLeader(resiGroupDTO,applyJoinGroupFormDTO.getUserId());
+
 	}
 
+	//给组长发送消息，有人申请入群
+	private void sendMessageToGroupLeader(ResiGroupDTO resiGroupDTO, String currentUserId) {
+		try {
+			ResiGroupMemberDTO groupLeader = resiGroupDao.selectGroupLeader(resiGroupDTO.getId());
+			if (null == groupLeader) {
+				logger.error(String.format("居民申请入群，给组长发送消息通知异常，查询组长信息为空groupId%s", resiGroupDTO.getId()));
+				return;
+			}
+			UserMessageFormDTO userMessage = new UserMessageFormDTO();
+			userMessage.setApp(AppClientConstant.APP_RESI);
+			userMessage.setCustomerId(resiGroupDTO.getCustomerId());
+			userMessage.setGridId(resiGroupDTO.getGridId());
+			//查询当前申请用户的基本信息（显示名称山东路168号-尹女士）
+			String currentUserName = "";
+			UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
+			userResiInfoFormDTO.setCustomerId(resiGroupDTO.getCustomerId());
+			userResiInfoFormDTO.setUserId(currentUserId);
+			Result<UserResiInfoResultDTO> resultUserInfo = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+			if (!resultUserInfo.success() || null == resultUserInfo.getData()) {
+				logger.error(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO)));
+			} else {
+				currentUserName = resultUserInfo.getData().getShowName();
+			}
+			String messageContent = String.format(UserMessageConstant.APPLY_JOIN_GROUP, currentUserName, resiGroupDTO.getGroupName());
+			userMessage.setMessageContent(messageContent);
+			userMessage.setReadFlag(ReadFlagConstant.UN_READ);
+			userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
+			//通知群主
+			userMessage.setUserId(groupLeader.getCustomerUserId());
+			messageFeignClient.saveUserMessage(userMessage);
+		} catch (Exception e) {
+			logger.error("居民申请入群，给组长发送消息通知异常");
+			e.printStackTrace();
+		}
+	}
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result