修复修改群会话头像没有生效的问题

591e111e · 罗长华 · 4e9d4a84 · 591e111e · 591e111e · 591e111e
Commit 591e111e authored May 13, 2022 by 罗长华
5 changed files
--- a/core/src/main/java/com/wecloud/im/action/ConversationAction.java
+++ b/core/src/main/java/com/wecloud/im/action/ConversationAction.java
 package com.wecloud.im.action;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
 import com.alibaba.fastjson.JSON;
 import com.wecloud.dispatch.annotation.ActionMapping;
 import com.wecloud.im.param.ChatRoomMemberPageParam;
@@ -12,7 +26,7 @@ import com.wecloud.im.param.ListConversationParam;
 import com.wecloud.im.param.MutedGroupMemberParam;
 import com.wecloud.im.param.MutedGroupParam;
 import com.wecloud.im.param.SetAdminsParam;
-import com.wecloud.im.param.SetGroupPortraitParam;
+import com.wecloud.im.param.SetHeadPortraitParam;
 import com.wecloud.im.param.TransferOwnerParam;
 import com.wecloud.im.param.add.ImClientLeaveConversation;
 import com.wecloud.im.param.add.ImClientToConversation;
@@ -25,18 +39,6 @@ import com.wecloud.im.vo.ChatRoomMemberVo;
 import com.wecloud.im.vo.ConversationVo;
 import com.wecloud.im.vo.ImConversationCreateVo;
 import com.wecloud.im.ws.model.WsResponse;
-import io.geekidea.springbootplus.framework.common.api.ApiCode;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.annotation.Validated;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 /**
 *
@@ -252,9 +254,9 @@ public class ConversationAction {
     */
    @ActionMapping("/setGroupPortrait")
    @ApiOperation(value = "群头像设置", notes = "权限:群主和管理员有权限操作")
-    public WsResponse<Map<String, Boolean>> setGroupPortrait(@Validated SetGroupPortraitParam data) {
+    public WsResponse<Map<String, Boolean>> setGroupPortrait(@Validated SetHeadPortraitParam data) {
        log.info("群头像设置入参 {}", JSON.toJSONString(data));
-        Boolean r = imConversationService.setGroupPortrait(data);
+        Boolean r = imConversationService.setHeadPortrait(data);
        Map<String, Boolean> result = new HashMap<>();
        result.put("result", r);
        return WsResponse.ok(result);

--- a/core/src/main/java/com/wecloud/im/controller/ImConversationController.java
+++ b/core/src/main/java/com/wecloud/im/controller/ImConversationController.java
 package com.wecloud.im.controller;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
+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 java.util.List;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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 com.alibaba.fastjson.JSON;
 import com.wecloud.im.param.ChatRoomMemberPageParam;
 import com.wecloud.im.param.DisbandConversationParam;
@@ -11,7 +28,7 @@ import com.wecloud.im.param.ListConversationParam;
 import com.wecloud.im.param.MutedGroupMemberParam;
 import com.wecloud.im.param.MutedGroupParam;
 import com.wecloud.im.param.SetAdminsParam;
-import com.wecloud.im.param.SetGroupPortraitParam;
+import com.wecloud.im.param.SetHeadPortraitParam;
 import com.wecloud.im.param.TransferOwnerParam;
 import com.wecloud.im.param.add.ImClientLeaveConversation;
 import com.wecloud.im.param.add.ImClientToConversation;
@@ -23,21 +40,6 @@ import com.wecloud.im.service.ImConversationService;
 import com.wecloud.im.vo.ChatRoomMemberVo;
 import com.wecloud.im.vo.ConversationVo;
 import com.wecloud.im.vo.ImConversationCreateVo;
-import io.geekidea.springbootplus.framework.common.api.ApiCode;
-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.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-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;
 /**
 * 会话表 控制器
@@ -227,9 +229,9 @@ public class ImConversationController extends BaseController {
     */
    @PostMapping("/setGroupPortrait")
    @ApiOperation(value = "群头像设置", notes = "权限:群主和管理员有权限操作")
-    public ApiResult<Boolean> setGroupPortrait(@RequestBody @Validated SetGroupPortraitParam param) {
+    public ApiResult<Boolean> setGroupPortrait(@RequestBody @Validated SetHeadPortraitParam param) {
        log.info("群头像设置入参 {}", JSON.toJSONString(param));
-        Boolean result = imConversationService.setGroupPortrait(param);
+        Boolean result = imConversationService.setHeadPortrait(param);
        return ApiResult.ok(result);
    }

--- a/core/src/main/java/com/wecloud/im/param/SetGroupPortraitParam.java
+++ b/core/src/main/java/com/wecloud/im/param/SetGroupPortraitParam.java
@@ -11,12 +11,12 @@ import javax.validation.constraints.NotNull;
 * @Description 设置群头像入参
 */
 @Data
-public class SetGroupPortraitParam {
+public class SetHeadPortraitParam {
    @NotNull
    @ApiModelProperty("会话id")
    private Long conversationId;
    @ApiModelProperty("群头像图片地址")
-    private String groupPortrait;
+    private String headPortrait;
 }
--- a/core/src/main/java/com/wecloud/im/service/ImConversationService.java
+++ b/core/src/main/java/com/wecloud/im/service/ImConversationService.java
 package com.wecloud.im.service;
-import com.wecloud.im.param.SetGroupPortraitParam;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -25,6 +24,7 @@ import com.wecloud.im.param.ListConversationParam;
 import com.wecloud.im.param.MutedGroupMemberParam;
 import com.wecloud.im.param.MutedGroupParam;
 import com.wecloud.im.param.SetAdminsParam;
+import com.wecloud.im.param.SetHeadPortraitParam;
 import com.wecloud.im.param.TransferOwnerParam;
 import com.wecloud.im.param.add.ImClientLeaveConversation;
 import com.wecloud.im.param.add.ImClientToConversation;
@@ -237,7 +237,7 @@ public interface ImConversationService extends BaseService<ImConversation> {
     * @param param
     * @return
     */
-    Boolean setGroupPortrait(SetGroupPortraitParam param);
+    Boolean setHeadPortrait(SetHeadPortraitParam param);
    /**
     * 用户主动进入聊天室

--- a/core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+++ b/core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
@@ -58,7 +58,7 @@ import com.wecloud.im.param.ListConversationParam;
 import com.wecloud.im.param.MutedGroupMemberParam;
 import com.wecloud.im.param.MutedGroupParam;
 import com.wecloud.im.param.SetAdminsParam;
-import com.wecloud.im.param.SetGroupPortraitParam;
+import com.wecloud.im.param.SetHeadPortraitParam;
 import com.wecloud.im.param.TransferOwnerParam;
 import com.wecloud.im.param.add.ImClientLeaveConversation;
 import com.wecloud.im.param.add.ImClientToConversation;
@@ -1283,7 +1283,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
    }
    @Override
-    public Boolean setGroupPortrait(SetGroupPortraitParam param) {
+    public Boolean setHeadPortrait(SetHeadPortraitParam param) {
        // 获取当前client
        ImClient currentClient = contextService.getImClientIfNotNullOrThrow();
        if (!imConversationService.isBelongToRole(currentClient.getClientId(), param.getConversationId(),
@@ -1292,7 +1292,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
            throw new BusinessException("操作人既不是群主也不是群管理员，无权限操作");
        }
        ImConversation imConversation = imConversationService.getById(param.getConversationId());
-        imConversation.setHeadPortrait(param.getGroupPortrait());
+        imConversation.setHeadPortrait(param.getHeadPortrait());
        boolean success = imConversationService.updateById(imConversation);
        if (success) {
            // 删除redis中该会话的缓存