aijinhui
2023-12-25 fe7ee05732e56ab830f1a1f1228a69899e609999
融云
已修改4个文件
135 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -103,4 +103,18 @@
    {
        return rongCloudService.groupSync(syncParam);
    }
    @GetMapping("/groupInfo")
    @ApiOperation("群组管理-查询群组详情")
    public AjaxResult groupInfo(String groupId)
    {
        return rongCloudService.groupInfo(groupId);
    }
    @GetMapping("/groupUserAll")
    @ApiOperation("群组管理-查询群组详情")
    public AjaxResult groupUserAll(String groupId)
    {
        return rongCloudService.groupUserAll(groupId);
    }
}
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -58,7 +58,7 @@
            RongCloudParam param = new RongCloudParam();
            param.setUserId(userId);
            param.setName(name);
            Map<String,Object>  map = rongCloudClient.getToken(getRongCloudHead(), param);
            Map<String, Object> map = rongCloudClient.getToken(getRongCloudHead(), param);
            token = (String) map.get("token");
            log.debug("用户" + userId + "获取到融云token:" + token);
        } catch (Exception ex) {
@@ -68,12 +68,12 @@
    }
    @Override
    public Map<String,Object>  checkOnline(List<String> userIds) {
    public Map<String, Object> checkOnline(List<String> userIds) {
        Map<String, Object> onlineMap = new HashMap<>();
        for (String userId : userIds) {
            RongCloudParam param = new RongCloudParam();
            param.setUserId(userId);
            Map<String,Object>  isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
            Map<String, Object> isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
            onlineMap.put(userId, isOnline.get("status"));
        }
        return onlineMap;
@@ -83,16 +83,16 @@
    public Boolean checkOnline(String userId) {
        RongCloudParam param = new RongCloudParam();
        param.setUserId(userId);
        Map<String,Object>  isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
        Map<String, Object> isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
        return isOnline.get("status").equals("1");
    }
    @Override
    public AjaxResult groupCreate(RongCloudGroupParam group) {
        group.setGroupId(String.valueOf(UUID.randomUUID()));
        Map<String, Object> groupMap =  rongCloudClient.groupCreate(getRongCloudHead(),group);
        Map<String, Object> groupMap = rongCloudClient.groupCreate(getRongCloudHead(), group);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
        if (code.equals(200)) {
            ArdRongGroup ardRongGroup = new ArdRongGroup();
            ardRongGroup.setGroupId(group.getGroupId());
            ardRongGroup.setGroupName(group.getGroupName());
@@ -108,33 +108,33 @@
                ardRongGroupUserMapper.insert(ardRongGroupUser);
            }
        }
        groupMap.put("userId",group.getUserId());
        groupMap.put("groupId",group.getGroupId());
        groupMap.put("group",group.getGroupName());
        groupMap.put("userId", group.getUserId());
        groupMap.put("groupId", group.getGroupId());
        groupMap.put("group", group.getGroupName());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupDismiss(RongCloudGroupDisParam groupDis) {
        Map<String, Object> groupMap =  rongCloudClient.groupDismiss(getRongCloudHead(),groupDis);
        Map<String, Object> groupMap = rongCloudClient.groupDismiss(getRongCloudHead(), groupDis);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
        if (code.equals(200)) {
            ardRongGroupMapper.deleteById(groupDis.getGroupId());
            QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("group_id",groupDis.getGroupId());
            queryWrapper.eq("group_id", groupDis.getGroupId());
            ardRongGroupUserMapper.delete(queryWrapper);
        }
        groupMap.put("groupId",groupDis.getGroupId());
        groupMap.put("userId",groupDis.getUserId());
        groupMap.put("groupId", groupDis.getGroupId());
        groupMap.put("userId", groupDis.getUserId());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupJoin(RongCloudGroupParam groupParam) {
        Map<String, Object> groupMap =  rongCloudClient.groupJoin(getRongCloudHead(),groupParam);
        Map<String, Object> groupMap = rongCloudClient.groupJoin(getRongCloudHead(), groupParam);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
            if(groupParam.getGroupName()!=null){
        if (code.equals(200)) {
            if (groupParam.getGroupName() != null) {
                ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupParam.getGroupId());
                ardRongGroup.setGroupName(groupParam.getGroupName());
                ardRongGroupMapper.updateById(ardRongGroup);
@@ -148,38 +148,38 @@
                ardRongGroupUserMapper.insert(ardRongGroupUser);
            }
        }
        groupMap.put("groupId",groupParam.getGroupId());
        if(groupParam.getGroupName()!=null){
            groupMap.put("groupName",groupParam.getGroupId());
        }else {
        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("groupName", ardRongGroup.getGroupName());
        }
        groupMap.put("userId",groupParam.getUserId());
        groupMap.put("userId", groupParam.getUserId());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupQuit(RongCloudGroupParam groupParam) {
        Map<String, Object> groupMap =  rongCloudClient.groupQuit(getRongCloudHead(),groupParam);
        Map<String, Object> groupMap = rongCloudClient.groupQuit(getRongCloudHead(), groupParam);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
        if (code.equals(200)) {
            ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupParam.getGroupId());
            ardRongGroup.setGroupName(groupParam.getGroupName());
            ardRongGroupMapper.updateById(ardRongGroup);
        }
        groupMap.put("groupId",groupParam.getGroupId());
        groupMap.put("groupName",groupParam.getGroupName());
        groupMap.put("groupId", groupParam.getGroupId());
        groupMap.put("groupName", groupParam.getGroupName());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupUserQuery(RongCloudGroupParam groupId) {
        Map<String, Object> groupMap = rongCloudClient.groupUserQuery(getRongCloudHead(),groupId);
        Map<String, Object> groupMap = rongCloudClient.groupUserQuery(getRongCloudHead(), groupId);
        Integer code = (Integer) groupMap.get("code");
        List<SysUser> sysUsers = new ArrayList<>();
        if(code.equals(200)){
            List<Map<String,String>> list = (List<Map<String, String>>) groupMap.get("users");
        if (code.equals(200)) {
            List<Map<String, String>> list = (List<Map<String, String>>) groupMap.get("users");
            for (int i = 0; i < list.size(); i++) {
                String id = list.get(i).get("id");
                SysUser sysUser = sysUserMapper.selectUserById(id);
@@ -191,25 +191,25 @@
    @Override
    public AjaxResult groupRefresh(RongCloudGroupParam groupParam) {
        Map<String, Object> groupMap =  rongCloudClient.groupRefresh(getRongCloudHead(),groupParam);
        Map<String, Object> groupMap = rongCloudClient.groupRefresh(getRongCloudHead(), groupParam);
        Integer code = (Integer) groupMap.get("code");
        if(code.equals(200)){
        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());
                queryWrapper.eq("user_id", groupParam.getGroupId())
                        .eq("group_id", groupParam.getUserId());
                ardRongGroupUserMapper.delete(queryWrapper);
            }
        }
        groupMap.put("groupId",groupParam.getGroupId());
        groupMap.put("userId",groupParam.getUserId());
        groupMap.put("groupId", groupParam.getGroupId());
        groupMap.put("userId", groupParam.getUserId());
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult userGroupQuery(RongCloudGroupUserParam userParam) {
        return AjaxResult.success(rongCloudClient.userGroupQuery(getRongCloudHead(),userParam));
        return AjaxResult.success(rongCloudClient.userGroupQuery(getRongCloudHead(), userParam));
    }
    @Override
@@ -218,23 +218,57 @@
        endParam.setUserId(syncParam.getUserId());
        List<RongCloudGroupSyncTwoParam> twoParams = syncParam.getList();
        for (int i = 0; i < twoParams.size(); i++) {
            RongCloudGroupSyncTwoParam syncTwoParam= twoParams.get(i);
            RongCloudGroupSyncTwoParam syncTwoParam = twoParams.get(i);
            String groupId = syncTwoParam.getGroupId();
            String groupName = syncTwoParam.getGroupName();
            try {
                Class clazz = endParam.getClass();
                // 动态添加属性
                Field ageField = clazz.getDeclaredField("group["+groupId+"]");
                Field ageField = clazz.getDeclaredField("group[" + groupId + "]");
                ageField.setAccessible(true); // 设置私有属性可访问
                ageField.set(endParam, groupName);
            }catch (Exception e){
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        Map<String, Object> groupMap =  rongCloudClient.groupSync(getRongCloudHead(),endParam);
        Map<String, Object> groupMap = rongCloudClient.groupSync(getRongCloudHead(), endParam);
        return AjaxResult.success(groupMap);
    }
    @Override
    public AjaxResult groupInfo(String groupId) {
        Map<String,Object> map = new HashMap<>();
        ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupId);
        map.put("group",ardRongGroup);
        QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("group_id",groupId);
        List<ArdRongGroupUser> list = ardRongGroupUserMapper.selectList(queryWrapper);
        List<SysUser> sysUsers = new ArrayList<>();
        for (int i = 0; i < list.size(); i++) {
            String userId = list.get(i).getUserId();
            SysUser sysUser = sysUserMapper.selectUserById(userId);
            sysUsers.add(sysUser);
        }
        map.put("user",sysUsers);
        return AjaxResult.success(map);
    }
    @Override
    public AjaxResult groupUserAll(String groupId) {
        ArdRongGroup ardRongGroup = ardRongGroupMapper.selectById(groupId);
        QueryWrapper<ArdRongGroupUser> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("group_id",groupId);
        List<ArdRongGroupUser> list = ardRongGroupUserMapper.selectList(queryWrapper);
        List<String> userList = new ArrayList<>();
        for (int i = 0; i < list.size(); i++) {
            userList.add(list.get(i).getUserId());
        }
        QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
        queryWrapper1.notIn("user_id",userList);
        List<SysUser> sysUsers = sysUserMapper.selectList(queryWrapper1);
        return AjaxResult.success(sysUsers);
    }
    /**
     * 获取融云签名信息
     */
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
@@ -30,4 +30,7 @@
    AjaxResult groupRefresh(RongCloudGroupParam groupParam);
    AjaxResult userGroupQuery(RongCloudGroupUserParam userParam);
    AjaxResult groupSync(RongCloudGroupSyncParam syncParam);
    AjaxResult groupInfo(String groupId);
    AjaxResult groupUserAll(String groupId);
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -63,7 +63,7 @@
     * 获取用户列表
     */
    @ApiOperation("获取用户列表")
    @PreAuthorize("@ss.hasPermi('system:user:list')")
//    @PreAuthorize("@ss.hasPermi('system:user:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysUser user) {
        startPage();