aijinhui
2023-12-25 fe7ee05732e56ab830f1a1f1228a69899e609999
融云
已修改4个文件
53 ■■■■■ 文件已修改
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 34 ●●●●● 补丁 | 查看 | 原始文档 | 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
@@ -233,6 +233,40 @@
        }
        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();