From 14abc1a82e4c53b8f70688907407d5a88a8ed934 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Sat, 21 Aug 2021 16:15:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A3=9E=E4=B9=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA@=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtUserMapper.xml         |  2 +-
 .../metersphere/notice/domain/UserDetail.java |  5 +++--
 .../notice/sender/AbstractNoticeSender.java   |  4 ++++
 .../notice/sender/impl/LarkNoticeSender.java  | 20 +++++++++++++++++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
index 11df7fcd91..f509e4861d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
@@ -57,7 +57,7 @@
     </select>
     <select id="queryTypeByIds" parameterType="java.lang.String" resultType="io.metersphere.notice.domain.UserDetail">
         SELECT
-        email,phone
+        email,phone,name
         from user
         WHERE id IN
         <foreach collection="list" item="id" index="index"
diff --git a/backend/src/main/java/io/metersphere/notice/domain/UserDetail.java b/backend/src/main/java/io/metersphere/notice/domain/UserDetail.java
index ed7d25d718..d4a1d9933b 100644
--- a/backend/src/main/java/io/metersphere/notice/domain/UserDetail.java
+++ b/backend/src/main/java/io/metersphere/notice/domain/UserDetail.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class UserDetail {
-    private  String  email;
-    private  String  phone;
+    private String name;
+    private String email;
+    private String phone;
 }
diff --git a/backend/src/main/java/io/metersphere/notice/sender/AbstractNoticeSender.java b/backend/src/main/java/io/metersphere/notice/sender/AbstractNoticeSender.java
index 9f7f5980c0..77b26fb5c8 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/AbstractNoticeSender.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/AbstractNoticeSender.java
@@ -112,6 +112,10 @@ public abstract class AbstractNoticeSender implements NoticeSender {
         return phoneList.stream().distinct().collect(Collectors.toList());
     }
 
+    protected List<UserDetail> getUserDetails(NoticeModel noticeModel, List<String> userIds) {
+        return userService.queryTypeByIds(userIds);
+    }
+
     private List<Receiver> getRealUserIds(List<String> userIds, NoticeModel noticeModel, String event) {
         List<Receiver> toUsers = new ArrayList<>();
         Map<String, Object> paramMap = noticeModel.getParamMap();
diff --git a/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java b/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java
index f63b394a70..0755c4e914 100644
--- a/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java
+++ b/backend/src/main/java/io/metersphere/notice/sender/impl/LarkNoticeSender.java
@@ -1,22 +1,38 @@
 package io.metersphere.notice.sender.impl;
 
 import io.metersphere.notice.domain.MessageDetail;
+import io.metersphere.notice.domain.Receiver;
+import io.metersphere.notice.domain.UserDetail;
 import io.metersphere.notice.sender.AbstractNoticeSender;
 import io.metersphere.notice.sender.NoticeModel;
 import io.metersphere.notice.util.LarkClient;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Component
 public class LarkNoticeSender extends AbstractNoticeSender {
 
-    public void sendLark(MessageDetail messageDetail, String context) {
+    public void sendLark(MessageDetail messageDetail, NoticeModel noticeModel, String context) {
         //TextMessage message = new TextMessage(context);
+        List<String> userIds = noticeModel.getReceivers().stream()
+                .map(Receiver::getUserId)
+                .distinct()
+                .collect(Collectors.toList());
+        List<UserDetail> userDetails = super.getUserDetails(noticeModel, userIds);
+        List<String> collect = userDetails.stream()
+                .map(ud -> "<at email=\"" + ud.getEmail() + "\">" + ud.getName() + "</at>")
+                .collect(Collectors.toList());
+
+        context += StringUtils.join(collect, " ");
         LarkClient.send(messageDetail.getWebhook(), context);
     }
 
     @Override
     public void send(MessageDetail messageDetail, NoticeModel noticeModel) {
         String context = super.getContext(messageDetail, noticeModel);
-        sendLark(messageDetail, context);
+        sendLark(messageDetail, noticeModel, context);
     }
 }