aijinhui
2023-12-23 6482335baf447da4faf65fd26e6155cef1c0b05f
融云
已重命名3个文件
已修改4个文件
111 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupDisParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -2,8 +2,8 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.rongcloud.domain.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.domain.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.service.RongCloudService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -59,4 +59,25 @@
    {
        return rongCloudService.groupDismiss(groupDis);
    }
    @PostMapping("/groupJoin")
    @ApiOperation("群组管理-加入群组")
    public AjaxResult groupJoin(@RequestBody RongCloudGroupParam groupParam)
    {
        return rongCloudService.groupJoin(groupParam);
    }
    @PostMapping("/groupQuit")
    @ApiOperation("群组管理-退出群组")
    public AjaxResult groupQuit(@RequestBody RongCloudGroupParam groupParam)
    {
        return rongCloudService.groupQuit(groupParam);
    }
    @PostMapping("/groupUserQuery")
    @ApiOperation("群组管理-查询群组成员")
    public AjaxResult groupUserQuery(@RequestBody RongCloudGroupParam groupId)
    {
        return rongCloudService.groupUserQuery(groupId);
    }
}
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupDisParam.java
ÎļþÃû´Ó ard-work/src/main/java/com/ruoyi/rongcloud/domain/RongCloudGroupDisParam.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.rongcloud.domain;
package com.ruoyi.rongcloud.param;
import lombok.Data;
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudGroupParam.java
ÎļþÃû´Ó ard-work/src/main/java/com/ruoyi/rongcloud/domain/RongCloudGroupParam.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.rongcloud.domain;
package com.ruoyi.rongcloud.param;
import lombok.Data;
ard-work/src/main/java/com/ruoyi/rongcloud/param/RongCloudParam.java
ÎļþÃû´Ó ard-work/src/main/java/com/ruoyi/rongcloud/domain/RongCloudParam.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.rongcloud.domain;
package com.ruoyi.rongcloud.param;
import lombok.Data;
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -7,6 +7,9 @@
import com.ruoyi.rongcloud.mapper.ArdRongGroupMapper;
import com.ruoyi.rongcloud.mapper.ArdRongGroupUserMapper;
import com.ruoyi.rongcloud.domain.*;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudParam;
import com.ruoyi.rongcloud.service.RongCloudService;
import com.ruoyi.utils.forest.RongCloudClient;
import lombok.extern.slf4j.Slf4j;
@@ -123,6 +126,59 @@
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupJoin(RongCloudGroupParam groupParam) {
        Map<String, Object> groupMap =  rongCloudClient.groupJoin(getRongCloudHead(),groupParam);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
            if(groupParam.getGroupName()!=null){
                ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupParam.getGroupId());
                ardRongGroup.setGroupName(groupParam.getGroupName());
                ardRongGroupMapper.updateById(ardRongGroup);
            }
            List<String> userList = groupParam.getUserId();
            for (int i = 0; i < userList.size(); i++) {
                ArdRongGroupUser ardRongGroupUser = new ArdRongGroupUser();
                ardRongGroupUser.setId(String.valueOf(UUID.randomUUID()));
                ardRongGroupUser.setGroupId(groupParam.getGroupId());
                ardRongGroupUser.setUserId(userList.get(i));
                ardRongGroupUserMapper.insert(ardRongGroupUser);
            }
        }
        groupMap.put("groupId",groupParam.getGroupId());
        if(groupParam.getGroupName()!=null){
            groupMap.put("groupName",groupParam.getGroupId());
        }else {
            ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupParam.getGroupId());
            groupMap.put("groupName",ardRongGroup.getGroupName());
        }
        groupMap.put("userId",groupParam.getUserId());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupQuit(RongCloudGroupParam groupParam) {
        Map<String, Object> groupMap =  rongCloudClient.groupQuit(getRongCloudHead(),groupParam);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
            List<String> userList = groupParam.getUserId();
            for (int i = 0; i < userList.size(); i++) {
                QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("user_id",groupParam.getGroupId())
                        .eq("group_id",groupParam.getUserId());
                ardRongGroupUserMapper.delete(queryWrapper);
            }
        }
        groupMap.put("groupId",groupParam.getGroupId());
        groupMap.put("userId",groupParam.getUserId());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupUserQuery(RongCloudGroupParam groupId) {
        return AjaxResult.success(rongCloudClient.groupUserQuery(getRongCloudHead(),groupId));
    }
    /**
     * èŽ·å–èžäº‘ç­¾åä¿¡æ¯
     */
@@ -130,7 +186,7 @@
        String appKey = redisCache.getCacheObject("sys_config:RongCloudAppKey");
        String appSecret = redisCache.getCacheObject("sys_config:RongCloudAppSecret");
        String nonce = RandomStringUtils.randomNumeric(18);
        String timestamp = String.valueOf(new Date().getTime());
        String timestamp = String.valueOf(System.currentTimeMillis());
        String signature = DigestUtils.sha1Hex(appSecret + nonce + timestamp);//App Secret + Nonce + T
        Map<String, Object> headerMap = new HashMap<>();
        headerMap.put("App-Key", appKey);
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
@@ -1,8 +1,8 @@
package com.ruoyi.rongcloud.service;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.rongcloud.domain.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.domain.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import java.util.List;
import java.util.Map;
@@ -22,4 +22,7 @@
    AjaxResult groupCreate(RongCloudGroupParam group);
    AjaxResult groupDismiss(RongCloudGroupDisParam groupDis);
    AjaxResult groupJoin(RongCloudGroupParam groupParam);
    AjaxResult groupQuit(RongCloudGroupParam groupParam);
    AjaxResult groupUserQuery(RongCloudGroupParam groupId);
}
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java
@@ -1,9 +1,9 @@
package com.ruoyi.utils.forest;
import com.dtflys.forest.annotation.*;
import com.ruoyi.rongcloud.domain.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.domain.RongCloudGroupParam;
import com.ruoyi.rongcloud.domain.RongCloudParam;
import com.ruoyi.rongcloud.param.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.param.RongCloudGroupParam;
import com.ruoyi.rongcloud.param.RongCloudParam;
import com.ruoyi.rongcloud.service.MyAddressSource;
import java.util.Map;
@@ -25,4 +25,13 @@
    @Post(url = "/group/dismiss.json")
    Map<String,Object> groupDismiss(@Header Map<String, Object> headerMap, @Body RongCloudGroupDisParam groupDis);
    @Post(url = "/group/join.json")
    Map<String,Object> groupJoin(@Header Map<String, Object> headerMap, @Body RongCloudGroupParam groupParam);
    @Post(url = "/group/quit.json")
    Map<String,Object> groupQuit(@Header Map<String, Object> headerMap, @Body RongCloudGroupParam groupParam);
    @Post(url = "/group/user/query.json")
    Map<String,Object> groupUserQuery(@Header Map<String, Object> headerMap, @Body RongCloudGroupParam groupParam);
}