增加接口: 添加或修改会话成员备注

5b338375 · hweeeeeei · 7f189870 · 5b338375 · 5b338375 · 5b338375
Commit 5b338375 authored Dec 02, 2021 by hweeeeeei
8 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.ImConvMemeClientRemarkNameParam;
 import com.wecloud.im.param.ImConversationMembersListParam;
 import com.wecloud.im.param.add.ImConversationMemAttrUpdate;
 import com.wecloud.im.service.ImConversationMembersService;
@@ -35,9 +36,19 @@ public class ImConversationMembersController extends BaseController {
    private ImConversationMembersService imConversationMembersService;
    /**
+     * 添加或修改会话成员备注
+     */
+    @PostMapping("/updateClientRemarkName")
+    @ApiOperation(value = "添加或修改会话成员备注", notes = "权限:目前只有client成员自己有权限操作")
+    public ApiResult<Boolean> saveOrUpdateClientRemarkName(@RequestBody ImConvMemeClientRemarkNameParam imConvMemeClientRemarkNameParam) throws Exception {
+        return imConversationMembersService.saveOrUpdateClientRemarkName(imConvMemeClientRemarkNameParam);
+    }
+    /**
     * 添加或修改会话成员拓展字段
     */
-    @PostMapping("/saveOrUpdateAttr")
+    @PostMapping("/updateAttr")
    @ApiOperation(value = "添加或修改会话成员拓展字段", notes = "权限:目前只有client成员自己有权限操作")
    public ApiResult<Boolean> saveOrUpdateAttr(@RequestBody ImConversationMemAttrUpdate imConversationMemAttrUpdate) throws Exception {
        return imConversationMembersService.saveOrUpdateAttr(imConversationMemAttrUpdate);

--- a/common/src/main/java/com/wecloud/im/param/ImConvMemeClientRemarkNameParam.java
+++ b/common/src/main/java/com/wecloud/im/param/ImConvMemeClientRemarkNameParam.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 = "ImConvMemeClientRemarkNameParam")
+public class ImConvMemeClientRemarkNameParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "会话中的client备注,展示给会话中其他client查看的", required = true)
+    private String clientRemarkName;
+    @ApiModelProperty("会话表id")
+    private Long conversationId;
+}
--- a/common/src/main/java/com/wecloud/im/param/add/ImConversationMemAttrUpdate.java
+++ b/common/src/main/java/com/wecloud/im/param/add/ImConversationMemAttrUpdate.java
@@ -28,4 +28,5 @@ public class ImConversationMemAttrUpdate extends BaseEntity {
    @ApiModelProperty("会话表id")
    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,6 +4,7 @@ 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.ImConvMemeClientRemarkNameParam;
 import com.wecloud.im.param.ImConversationMembersListParam;
 import com.wecloud.im.param.ImConversationMembersPageParam;
 import com.wecloud.im.param.ImConversationMembersQueryVo;
@@ -34,6 +35,9 @@ public interface ImConversationMembersService extends BaseService<ImConversation
        ApiResult<List<ApiImConversationMembersQueryVo>> getRestApiImConversationMembersList(ApiImConversationMembersPageParam apiImConversationMembersPageParam, ImApplication imApplication);
+        ApiResult<Boolean> saveOrUpdateClientRemarkName(ImConvMemeClientRemarkNameParam imConvMemeClientRemarkNameParam);
        /**
         * 会话成员表分页列表
         *

--- a/common/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
+++ b/common/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
@@ -47,6 +47,7 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public boolean updateHeadPortrait(ImClientHeadPortraitAdd imClientHeadPortraitAdd) throws Exception {
        ImClient curentClient = getCurentClient();
@@ -66,6 +67,7 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public boolean updateNickname(ImClientNicknameAdd imClientNicknameAdd) throws Exception {
        ImClient curentClient = getCurentClient();

--- 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.ImConvMemeClientRemarkNameParam;
 import com.wecloud.im.param.ImConversationMembersListParam;
 import com.wecloud.im.param.ImConversationMembersPageParam;
 import com.wecloud.im.param.ImConversationMembersQueryVo;
@@ -82,6 +83,55 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ApiResult<Boolean> saveOrUpdateClientRemarkName(ImConvMemeClientRemarkNameParam imConvMemeClientRemarkNameParam) {
+        // shiro线程中获取当前token
+        JwtToken curentJwtToken = JwtUtil.getCurentJwtToken();
+        //  根据appKey查询application
+        ImApplication imApplication = imApplicationService.getOneByAppKey(curentJwtToken.getAppKey());
+        ImClient imClientSender = imClientService.getCurentClient();
+        // 查询该成员
+        ImConversationMembers imConversationMember = imConversationMembersService.getOne(
+                new QueryWrapper<ImConversationMembers>().lambda()
+                        .eq(ImConversationMembers::getFkAppid, imApplication.getId())
+                        .eq(ImConversationMembers::getFkConversationId, imConvMemeClientRemarkNameParam.getConversationId())
+                        .eq(ImConversationMembers::getId, imClientSender.getId())
+        );
+        if (imConversationMember == null) {
+            return ApiResult.fail();
+        }
+//        // 查询该会话所有成员
+//        List<ImConversationMembers> membersList = imConversationMembersService.list(
+//                new QueryWrapper<ImConversationMembers>().lambda()
+//                        .eq(ImConversationMembers::getFkAppid, imApplication.getId())
+//                        .eq(ImConversationMembers::getFkConversationId, imConversationAttrUpdate.getConversationId())
+//                        .notIn(ImConversationMembers::getId, imClientSender.getId())
+//        );
+        imConversationMember.setClientRemarkName(imConvMemeClientRemarkNameParam.getClientRemarkName());
+        boolean b = imConversationMembersService.updateById(imConversationMember);
+        if (b) {
+            //TODO ws下发群成员属性变动事件
+            return ApiResult.ok();
+        } else {
+            return ApiResult.fail();
+        }
+    }
+    @Override
    public List<ImConversationMemberListVo> getImConversationMembersList(ImConversationMembersListParam imConversationMembersListParam) throws Exception {
        return imConversationMembersMapper.getImConversationMembersList(imConversationMembersListParam.getConversationId());
@@ -89,6 +139,7 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> saveOrUpdateAttr(ImConversationMemAttrUpdate imConversationMemAttrUpdate) {
        // shiro线程中获取当前token

--- a/common/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+++ b/common/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
@@ -223,6 +223,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> addClientToConversation(ImClientToConversation imClientToConversation) {
        // shiro线程中获取当前token
@@ -344,6 +345,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> delClientToConversation(ImClientToConversation imClientToConversation) throws Exception {
        // shiro线程中获取当前token
@@ -459,6 +461,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> leaveConversation(ImClientLeaveConversation imClientToConversation) throws Exception {
        // shiro线程中获取当前token
@@ -571,6 +574,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> saveOrUpdateName(ImConversationNameUpdate imConversationNameUpdate) throws Exception {
        // shiro线程中获取当前token
@@ -608,6 +612,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> saveOrUpdateAttr(ImConversationAttrUpdate imConversationAttrUpdate) throws Exception {
        // shiro线程中获取当前token

--- a/common/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+++ b/common/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
@@ -80,6 +80,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
    private WriteDataService writeDataService;
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ApiResult<Boolean> restApiImMessageSend(ImMsgSendToOnlineClient imMsgSendToOnlineClient, ImApplication imApplication) {
@@ -140,6 +141,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
    }
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public ImMessage saveImMessage(ImApplication imApplication, ImClient imClientSender, Long toConversationId, long messageId, String content) {
        ImMessage imMessage = new ImMessage();