群@功能

core/src/main/java/com/wecloud/im/controller/ImConversationController.java

@@ -179,7 +179,7 @@ public class ImConversationController extends BaseController {
      */
      */
     @PostMapping("/getList")
     @PostMapping("/getList")
     @ApiOperation(value = "查询加入的会话列表", notes = "查询用户加入的非隐藏状态的会话列表 与每个会话的未读条数 成员")
     @ApiOperation(value = "查询加入的会话列表", notes = "查询用户加入的非隐藏状态的会话列表 与每个会话的未读条数 成员")
-    public ApiResult<List<ConversationVo>> getMyImConversationListAndMsgCount() throws Exception {
+    public ApiResult<List<ConversationVo>> getMyImConversationListAndMsgCount() {
         List<ConversationVo> conversationList = imConversationService.getMyImConversationListAndMsgCount();
         List<ConversationVo> conversationList = imConversationService.getMyImConversationListAndMsgCount();
         return ApiResult.ok(conversationList);
         return ApiResult.ok(conversationList);
     }
     }

core/src/main/java/com/wecloud/im/param/ChatContentVo.java

@@ -40,6 +40,11 @@ public class ChatContentVo extends BaseRequest {
      */
      */
     String text;
     String text;
 
 
+    /**
+     * 被@人clientId， 多人用英文逗号分隔
+     */
+    String at;
+
     public PushVO getPush() {
     public PushVO getPush() {
         return JsonUtils.beanCopyDeep(this.get("push"), PushVO.class);
         return JsonUtils.beanCopyDeep(this.get("push"), PushVO.class);
     }
     }
@@ -73,6 +78,14 @@ public class ChatContentVo extends BaseRequest {
         this.text = text;
         this.text = text;
     }
     }
 
 
+    public String getAt() {
+        return at;
+    }
+
+    public void setAt(String at) {
+        this.at = at;
+    }
+
     @Override
     @Override
     public String getReqId() {
     public String getReqId() {
         return reqId;
         return reqId;

core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java

@@ -1108,7 +1108,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
                 // 查询会话的最后一条消息
                 // 查询会话的最后一条消息
                 OfflineMsgDto lastMsg = imMessageService.getLastMsgByConversationId(myconversationlistvo.getId());
                 OfflineMsgDto lastMsg = imMessageService.getLastMsgByConversationId(myconversationlistvo.getId());
                 myconversationlistvo.setLastMsg(lastMsg);
                 myconversationlistvo.setLastMsg(lastMsg);
-
                 myImConversationListAndMsgCountNew.add(myconversationlistvo);
                 myImConversationListAndMsgCountNew.add(myconversationlistvo);
 
 
             }
             }

core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java

@@ -195,6 +195,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
         imMessage.setSystemFlag(false);
         imMessage.setSystemFlag(false);
         imMessage.setSendStatus(2);
         imMessage.setSendStatus(2);
         imMessage.setMsgType(data.getType());
         imMessage.setMsgType(data.getType());
+        imMessage.setAt(data.getAt());
         imMessage.setFkConversationId(data.getToConversation());
         imMessage.setFkConversationId(data.getToConversation());
         this.save(imMessage);
         this.save(imMessage);
         return imMessage;
         return imMessage;

core/src/main/java/com/wecloud/im/vo/ConversationVo.java

@@ -61,6 +61,9 @@ public class ConversationVo implements Serializable {
     @ApiModelProperty("会话最后一条消息")
     @ApiModelProperty("会话最后一条消息")
     private OfflineMsgDto lastMsg;
     private OfflineMsgDto lastMsg;
 
 
+    @ApiModelProperty("是否被@ true-是 false-否")
+    private Boolean isBeAt;
+
     /**
     /**
      * 禁言开关
      * 禁言开关
      * @see com.wecloud.im.enums.MutedEnum
      * @see com.wecloud.im.enums.MutedEnum
@@ -68,4 +71,7 @@ public class ConversationVo implements Serializable {
     @ApiModelProperty("禁言开关 1-未禁言 2-禁言")
     @ApiModelProperty("禁言开关 1-未禁言 2-禁言")
     private Integer muted;
     private Integer muted;
 
 
+    @ApiModelProperty("禁言开关 1-未禁言 2-禁言")
+    private Integer beAtCount;
+
 }
 }

core/src/main/resources/mapper/ImConversationMapper.xml

@@ -36,6 +36,12 @@
                 WHERE im_inbox.fk_conversation_id = imConversation.id
                 WHERE im_inbox.fk_conversation_id = imConversation.id
                   AND im_inbox.receiver = #{currentClientId}
                   AND im_inbox.receiver = #{currentClientId}
                   AND im_inbox.read_msg_status = 0) AS msg_not_read_count,
                   AND im_inbox.read_msg_status = 0) AS msg_not_read_count,
+               (SELECT COUNT(*)
+                FROM im_inbox INNER JOIN im_message ON im_inbox.fk_msg_id = im_message.id
+                WHERE im_inbox.fk_conversation_id = imConversation.id
+                  AND im_inbox.receiver = #{currentClientId}
+                  AND im_inbox.read_msg_status = 0
+                  AND FIND_IN_SET(#{currentClientId},im_message.`at`) > 0) AS beAtCount,
                (
                (
                    SELECT GROUP_CONCAT(im_client.client_id)
                    SELECT GROUP_CONCAT(im_client.client_id)
                    FROM im_conversation_members AS im_conversation_members
                    FROM im_conversation_members AS im_conversation_members