增加接口: 会话中成员表列表

7f189870 · hweeeeeei · 39e1c0d2 · 7f189870 · 7f189870 · 7f189870
Commit 7f189870 authored Dec 02, 2021 by hweeeeeei
9 changed files
--- a/common/src/main/java/com/wecloud/im/controller/ImConversationMembersController.java
+++ b/common/src/main/java/com/wecloud/im/controller/ImConversationMembersController.java
 package com.wecloud.im.controller;
+import com.wecloud.im.param.ImConversationMembersListParam;
 import com.wecloud.im.param.add.ImConversationMemAttrUpdate;
 import com.wecloud.im.service.ImConversationMembersService;
+import com.wecloud.im.vo.ImConversationMemberListVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 /**
 * 会话成员表 控制器
 *
@@ -38,6 +44,18 @@ public class ImConversationMembersController extends BaseController {
    }
+    /**
+     * 会话中成员表列表
+     */
+    @GetMapping("/getList")
+//    @OperationLog(name = "会话中成员表列表", type = OperationLogType.PAGE)
+    @ApiOperation(value = "会话中成员表列表")
+    public ApiResult<List<ImConversationMemberListVo>> getImConversationMembersList(@Validated @RequestBody ImConversationMembersListParam imConversationMembersListParam) throws Exception {
+//        Paging<ImConversationMembersQueryVo> paging = imConversationMembersService.getImConversationMembersPageList(imConversationMembersPageParam);
+//        return ApiResult.ok(paging);
+        return ApiResult.ok(imConversationMembersService.getImConversationMembersList(imConversationMembersListParam));
+    }
 //    /**
 //     * 添加会话成员表
 //     */

--- a/common/src/main/java/com/wecloud/im/entity/ImConversationMembers.java
+++ b/common/src/main/java/com/wecloud/im/entity/ImConversationMembers.java
@@ -54,4 +54,7 @@ public class ImConversationMembers extends BaseEntity {
    @NotNull(message = "单向删除(隐藏)会话, 0不显示, 1显示不能为空")
    @ApiModelProperty("单向删除(隐藏)会话, 0不显示, 1显示")
    private Long displayStatus;
+    @ApiModelProperty("会话中client的备注名")
+    private String clientRemarkName;
 }
--- a/common/src/main/java/com/wecloud/im/mapper/ImConversationMembersMapper.java
+++ b/common/src/main/java/com/wecloud/im/mapper/ImConversationMembersMapper.java
@@ -7,6 +7,7 @@ import com.wecloud.im.entity.ImConversationMembers;
 import com.wecloud.im.param.ApiImConversationMembersQueryVo;
 import com.wecloud.im.param.ImConversationMembersPageParam;
 import com.wecloud.im.param.ImConversationMembersQueryVo;
+import com.wecloud.im.vo.ImConversationMemberListVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -33,6 +34,9 @@ public interface ImConversationMembersMapper extends BaseMapper<ImConversationMe
    List<ApiImConversationMembersQueryVo> getRestApiImConversationMembersList(@Param("conversationId") Long conversationId);
+    List<ImConversationMemberListVo> getImConversationMembersList(@Param("conversationId") Long conversationId);
    /**
     * 获取分页对象
     *

--- a/common/src/main/java/com/wecloud/im/param/ImConversationMembersListParam.java
+++ b/common/src/main/java/com/wecloud/im/param/ImConversationMembersListParam.java
+package com.wecloud.im.param;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+/**
+ * <pre>
+ * 会话成员表 分页参数对象
+ * </pre>
+ *
+ * @author wei
+ * @date 2021-05-07
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ImConversationMembersListParam")
+public class ImConversationMembersListParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "会话表id", required = true)
+    private Long conversationId;
+}
--- a/common/src/main/java/com/wecloud/im/service/ImConversationMembersService.java
+++ b/common/src/main/java/com/wecloud/im/service/ImConversationMembersService.java
@@ -4,9 +4,11 @@ import com.wecloud.im.entity.ImApplication;
 import com.wecloud.im.entity.ImConversationMembers;
 import com.wecloud.im.param.ApiImConversationMembersPageParam;
 import com.wecloud.im.param.ApiImConversationMembersQueryVo;
+import com.wecloud.im.param.ImConversationMembersListParam;
 import com.wecloud.im.param.ImConversationMembersPageParam;
 import com.wecloud.im.param.ImConversationMembersQueryVo;
 import com.wecloud.im.param.add.ImConversationMemAttrUpdate;
+import com.wecloud.im.vo.ImConversationMemberListVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -22,9 +24,26 @@ import java.util.List;
 public interface ImConversationMembersService extends BaseService<ImConversationMembers> {
+        /**
+         * 服务端api-会话成员表分页列表
+         *
+         * @param apiImConversationMembersPageParam
+         * @param imApplication
+         * @return
+         */
        ApiResult<List<ApiImConversationMembersQueryVo>> getRestApiImConversationMembersList(ApiImConversationMembersPageParam apiImConversationMembersPageParam, ImApplication imApplication);
+        /**
+         * 会话成员表分页列表
+         *
+         * @param imConversationMembersListParam
+         * @return
+         * @throws Exception
+         */
+        List<ImConversationMemberListVo> getImConversationMembersList(ImConversationMembersListParam imConversationMembersListParam) throws Exception;
        ApiResult<Boolean> saveOrUpdateAttr(ImConversationMemAttrUpdate imConversationMemAttrUpdate);
        /**

--- a/common/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
+++ b/common/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
@@ -13,6 +13,7 @@ import com.wecloud.im.mapper.ImConversationMapper;
 import com.wecloud.im.mapper.ImConversationMembersMapper;
 import com.wecloud.im.param.ApiImConversationMembersPageParam;
 import com.wecloud.im.param.ApiImConversationMembersQueryVo;
+import com.wecloud.im.param.ImConversationMembersListParam;
 import com.wecloud.im.param.ImConversationMembersPageParam;
 import com.wecloud.im.param.ImConversationMembersQueryVo;
 import com.wecloud.im.param.add.ImConversationMemAttrUpdate;
@@ -21,6 +22,7 @@ import com.wecloud.im.service.ImClientService;
 import com.wecloud.im.service.ImConversationMembersService;
 import com.wecloud.im.service.ImConversationService;
 import com.wecloud.im.service.ImMessageService;
+import com.wecloud.im.vo.ImConversationMemberListVo;
 import com.wecloud.im.ws.service.WriteDataService;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
@@ -80,6 +82,13 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
    }
    @Override
+    public List<ImConversationMemberListVo> getImConversationMembersList(ImConversationMembersListParam imConversationMembersListParam) throws Exception {
+        return imConversationMembersMapper.getImConversationMembersList(imConversationMembersListParam.getConversationId());
+    }
+    @Override
    public ApiResult<Boolean> saveOrUpdateAttr(ImConversationMemAttrUpdate imConversationMemAttrUpdate) {
        // shiro线程中获取当前token

--- a/common/src/main/java/com/wecloud/im/vo/ImConversationMemberListVo.java
+++ b/common/src/main/java/com/wecloud/im/vo/ImConversationMemberListVo.java
+package com.wecloud.im.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ImConversationMemberListVo")
+public class ImConversationMemberListVo implements Serializable {
+    @ApiModelProperty("会话中client的备注名")
+    private String clientRemarkName;
+    @ApiModelProperty("头像")
+    private String headPortrait;
+    @ApiModelProperty("主昵称")
+    private String nickname;
+    @ApiModelProperty("client自己的自定义扩展属性")
+    private String clientAttributes;
+    @ApiModelProperty("会话成员列表的自定义扩展属性")
+    private String memberAttributes;
+}
--- a/common/src/main/resources/mapper/ImConversationMembersMapper.xml
+++ b/common/src/main/resources/mapper/ImConversationMembersMapper.xml
@@ -29,5 +29,18 @@
        WHERE fk_conversation_id = #{conversationId}
    </select>
+    <select id="getImConversationMembersList" resultType="com.wecloud.im.vo.ImConversationMemberListVo">
+        SELECT im_client.client_id                        as clientId,
+               im_conversation_members.client_remark_name as clientRemarkName,
+               im_client.head_portrait                    as headPortrait,
+               im_client.nickname,
+               im_conversation_members.attributes         AS memberAttributes,
+               im_client.attributes                       AS clientAttributes
+        FROM im_conversation_members AS im_conversation_members
+                 INNER JOIN im_client AS im_client ON im_client.id = im_conversation_members.fk_client_id
+        WHERE im_conversation_members.fk_conversation_id = #{conversationId}
+    </select>
 </mapper>
--- a/开发记录.md
+++ b/开发记录.md
@@ -311,13 +311,12 @@ imwebtest.wecloud.cn
 1. 增加客户端api: 查询会话成员列表, 字段: client id ,client头像, client的拓展字段,
 在该会话的会话成员拓展字段,在该会话的昵称
-3. 增加客户端api: 添加或修改 client的头像字段
-4. 增加客户端api: 添加或修改在会话的昵称
 5. 增加客户端api: 添加或修改client的主昵称
-7. (完成)增加客户端api: 添加或修改client会话成员拓展字段
 6. 获取token接口 要返回在im系统中的头像和昵称