fix bug

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/SendWeixinRequestTools.java

@@ -159,19 +159,22 @@ public class SendWeixinRequestTools {
 
     @ParamLog("推送消息")
     private static void sendMessage(SendMessageDTO sendMessageDTO, String robotId, String weixinGroupId) {
+        String nickNameStr = getNickNameStr(weixinGroupId);
         if (ReplyTypeEnum.TEXT.value.equals(sendMessageDTO.getReplyType())) {
             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-            sendTextMessageVO.setContent(sendMessageDTO.getContent());
+            sendTextMessageVO.setContent(nickNameStr+" "+sendMessageDTO.getContent());
             sendTextMessageVO.setAltId(robotId);
             sendTextMessageVO.setGroupId(weixinGroupId);
             WxGroupSDK.sendTextMessage(sendTextMessageVO);
         } else if (ReplyTypeEnum.IMAGE.value.equals(sendMessageDTO.getReplyType())) {
+            sendAtMessage(nickNameStr,robotId,weixinGroupId);
             SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
             sendPicMessageVO.setGroupId(weixinGroupId);
             sendPicMessageVO.setAltId(robotId);
             sendPicMessageVO.setPicUrl(sendMessageDTO.getPicUrl());
             WxGroupSDK.sendPicMessage(sendPicMessageVO);
         } else if (ReplyTypeEnum.APP.value.equals(sendMessageDTO.getReplyType()) || ReplyTypeEnum.LINK.value.equals(sendMessageDTO.getReplyType())) {
+            sendAtMessage(nickNameStr,robotId,weixinGroupId);
             SendArticleMessageVO sendArticleMessageVO = new SendArticleMessageVO();
             sendArticleMessageVO.setAltId(robotId);
             sendArticleMessageVO.setDescription(sendMessageDTO.getDescription());
@@ -183,6 +186,16 @@ public class SendWeixinRequestTools {
         }
     }
 
+    private static void sendAtMessage(String nickNameStr,String robotId,String weixinGroupId){
+
+        SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
+        sendTextMessageVO.setContent(nickNameStr);
+        sendTextMessageVO.setAltId(robotId);
+        sendTextMessageVO.setGroupId(weixinGroupId);
+        WxGroupSDK.sendTextMessage(sendTextMessageVO);
+
+    }
+
     private static String addLinkParam(String url, Long groupQrcodeId, Long classifyId, Long bookGroupId) {
         if (StringUtil.isEmpty(url)) {
             return url;
@@ -282,7 +295,23 @@ public class SendWeixinRequestTools {
     }
 
     public static void sendDefaultMessage(String groupName, String robotId, String weixinGroupId) {
-        String content = "";
+        String content = getNickNameStr(weixinGroupId);
+
+        if (StringUtil.isEmpty(groupName)) {
+            content += ",欢迎加入本群，凭以下关键词领取任务或资源：";
+        } else {
+            content += ",欢迎加入" + groupName + "！凭以下关键词领取任务或资源：";
+        }
+        SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
+        sendTextMessageVO.setContent(content);
+        sendTextMessageVO.setAltId(robotId);
+        sendTextMessageVO.setGroupId(weixinGroupId);
+        WxGroupSDK.sendTextMessage(sendTextMessageVO);
+    }
+
+    private static String getNickNameStr(String weixinGroupId){
+
+        String nameStr = "";
         Map<String,Integer> nickNames = JedisClusterUtils.getJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, Map.class);
         int i=0;
         List<String>names = new ArrayList<>();
@@ -302,19 +331,9 @@ public class SendWeixinRequestTools {
         }
         for (String nickName : names) {
             nickNames.remove(nickName);
-            content = content + "@" + nickName + " ";
+            nameStr = nameStr + "@" + nickName + "  ";
         }
         JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId,nickNames);
-
-        if (StringUtil.isEmpty(groupName)) {
-            content += ",欢迎加入本群，凭以下关键词领取任务或资源：";
-        } else {
-            content += ",欢迎加入" + groupName + "！凭以下关键词领取任务或资源：";
-        }
-        SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-        sendTextMessageVO.setContent(content);
-        sendTextMessageVO.setAltId(robotId);
-        sendTextMessageVO.setGroupId(weixinGroupId);
-        WxGroupSDK.sendTextMessage(sendTextMessageVO);
+        return nameStr;
     }
 }