Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wecloud_im_server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hewei
wecloud_im_server
Commits
4e9d4a84
Commit
4e9d4a84
authored
May 13, 2022
by
罗长华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取会话列表,会话信息返回头像字段
parent
6b8461f1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
62 additions
and
18 deletions
+62
-18
core/src/main/java/com/wecloud/im/entity/ImConversation.java
+1
-1
core/src/main/java/com/wecloud/im/param/GetClientRelationParam.java
+22
-0
core/src/main/java/com/wecloud/im/sdk/enums/RelationEnum.java
+4
-0
core/src/main/java/com/wecloud/im/service/ImClientService.java
+10
-0
core/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
+6
-0
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+1
-1
core/src/main/java/com/wecloud/im/vo/ConversationVo.java
+2
-3
core/src/main/resources/mapper/ImConversationMapper.xml
+1
-0
docs/db/feature-cluster增量.sql
+15
-13
No files found.
core/src/main/java/com/wecloud/im/entity/ImConversation.java
View file @
4e9d4a84
...
...
@@ -64,7 +64,7 @@ public class ImConversation extends BaseEntity {
private
String
name
;
@ApiModelProperty
(
"群头像"
)
private
String
group
Portrait
;
private
String
head
Portrait
;
@ApiModelProperty
(
"可选 自定义属性,供开发者扩展使用。"
)
private
String
attributes
;
...
...
core/src/main/java/com/wecloud/im/param/GetClientRelationParam.java
0 → 100644
View file @
4e9d4a84
package
com
.
wecloud
.
im
.
param
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
*
* @Author luozh
* @Date 2022年05月12日 18:55
* @Version 1.0
*/
@Data
public
class
GetClientRelationParam
{
@ApiModelProperty
(
"客户端id"
)
private
String
clientId
;
@ApiModelProperty
(
"friend客户端id"
)
private
String
friendClientId
;
}
core/src/main/java/com/wecloud/im/sdk/enums/RelationEnum.java
View file @
4e9d4a84
...
...
@@ -2,6 +2,8 @@ package com.wecloud.im.sdk.enums;
import
io.geekidea.springbootplus.framework.common.enums.BaseEnum
;
import
com.fasterxml.jackson.annotation.JsonValue
;
/**
* @Author wenzhida
* @Date 2022/2/15 13:57
...
...
@@ -29,7 +31,9 @@ public enum RelationEnum implements BaseEnum {
this
.
desc
=
desc
;
}
@JsonValue
private
final
Integer
code
;
private
final
String
desc
;
...
...
core/src/main/java/com/wecloud/im/service/ImClientService.java
View file @
4e9d4a84
...
...
@@ -8,6 +8,7 @@ import java.util.List;
import
com.wecloud.im.entity.ImClient
;
import
com.wecloud.im.param.ClientInfoParam
;
import
com.wecloud.im.param.GetClientInfoParam
;
import
com.wecloud.im.param.GetClientRelationParam
;
import
com.wecloud.im.param.ImClientPageParam
;
import
com.wecloud.im.param.ImClientQueryVo
;
import
com.wecloud.im.param.ImClientSimpleDto
;
...
...
@@ -170,4 +171,13 @@ public interface ImClientService extends BaseService<ImClient> {
* @Return
*/
Long
registerClient
(
RegisterClientParam
param
);
/**
* 获取客户端关系
* @Author luozh
* @Date 2022年05月12日 07:04:04
* @param param
* @Return
*/
Integer
getClientRelation
(
GetClientRelationParam
param
);
}
core/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
View file @
4e9d4a84
...
...
@@ -38,6 +38,7 @@ import com.wecloud.im.friend.service.ImFriendService;
import
com.wecloud.im.mapper.ImClientMapper
;
import
com.wecloud.im.param.ClientInfoParam
;
import
com.wecloud.im.param.GetClientInfoParam
;
import
com.wecloud.im.param.GetClientRelationParam
;
import
com.wecloud.im.param.ImClientPageParam
;
import
com.wecloud.im.param.ImClientQueryVo
;
import
com.wecloud.im.param.ImClientSimpleDto
;
...
...
@@ -346,4 +347,9 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
}
return
imClient
.
getId
();
}
@Override
public
Integer
getClientRelation
(
GetClientRelationParam
param
)
{
return
null
;
}
}
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
View file @
4e9d4a84
...
...
@@ -1292,7 +1292,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
throw
new
BusinessException
(
"操作人既不是群主也不是群管理员,无权限操作"
);
}
ImConversation
imConversation
=
imConversationService
.
getById
(
param
.
getConversationId
());
imConversation
.
set
Group
Portrait
(
param
.
getGroupPortrait
());
imConversation
.
set
Head
Portrait
(
param
.
getGroupPortrait
());
boolean
success
=
imConversationService
.
updateById
(
imConversation
);
if
(
success
)
{
// 删除redis中该会话的缓存
...
...
core/src/main/java/com/wecloud/im/vo/ConversationVo.java
View file @
4e9d4a84
...
...
@@ -79,13 +79,12 @@ public class ConversationVo implements Serializable {
@ApiModelProperty
(
"禁止互加好友"
)
private
Boolean
forbidAddFriend
;
@ApiModelProperty
(
"禁止发红包"
)
private
Boolean
forbidSendRedPackets
;
@ApiModelProperty
(
"禁止发图片"
)
private
Boolean
forbidSendPic
;
@ApiModelProperty
(
"禁止发链接"
)
private
Boolean
forbidSendLink
;
@ApiModelProperty
(
"群头像"
)
private
String
headPortrait
;
}
core/src/main/resources/mapper/ImConversationMapper.xml
View file @
4e9d4a84
...
...
@@ -35,6 +35,7 @@
imConversation.is_forbid_add_friend as forbid_add_friend,
imConversation.is_forbid_send_pic as forbid_send_pic,
imConversation.is_forbid_send_link as forbid_send_link,
imConversation.head_portrait,
im_client.client_id AS creator,
(SELECT COUNT(im_inbox.id)
FROM im_inbox
...
...
docs/db/feature-cluster增量.sql
View file @
4e9d4a84
-- 在f
eature-cluster 2021年12月22日之后,需要执行的的sql增量脚本
-- 在f
eature-cluster 2021年12月22日之后,需要执行的的sql增量脚本
...
...
@@ -136,26 +136,28 @@ CREATE TABLE `im_multi_rtc_room`
DROP
TABLE
IF
EXISTS
`im_multi_rtc_room_member`
;
CREATE
TABLE
`im_multi_rtc_room_member`
(
`id`
bigint
NOT
NULL
COMMENT
'主键id'
,
`fk_rtc_room_id`
bigint
NOT
NULL
COMMENT
'im房间id'
,
`room_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'房间id(live kit提供)'
,
`fk_client_id`
bigint
NOT
NULL
COMMENT
'client主键id'
,
`client_id`
varchar
(
200
)
DEFAULT
NULL
COMMENT
'客户方提供的唯一id'
,
`state`
tinyint
NOT
NULL
DEFAULT
'1'
COMMENT
'房间成员状态,1:呼叫中,2:已接听,3:已拒绝,4:未接听,5:已断开'
,
`call_time`
timestamp
NULL
DEFAULT
NULL
COMMENT
'呼叫时间'
,
`heartbeat_time`
timestamp
NULL
DEFAULT
NULL
COMMENT
'心跳时间'
,
`create_time`
timestamp
NULL
DEFAULT
NULL
COMMENT
'创建时间'
,
`update_time`
timestamp
NULL
DEFAULT
NULL
ON
UPDATE
CURRENT_TIMESTAMP
COMMENT
'修改时间'
,
`id`
bigint
NOT
NULL
COMMENT
'主键id'
,
`fk_rtc_room_id`
bigint
NOT
NULL
COMMENT
'im房间id'
,
`room_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'房间id(live kit提供)'
,
`fk_client_id`
bigint
NOT
NULL
COMMENT
'client主键id'
,
`client_id`
varchar
(
200
)
DEFAULT
NULL
COMMENT
'客户方提供的唯一id'
,
`state`
tinyint
NOT
NULL
DEFAULT
'1'
COMMENT
'房间成员状态,1:呼叫中,2:已接听,3:已拒绝,4:未接听,5:已断开'
,
`call_time`
timestamp
NULL
DEFAULT
NULL
COMMENT
'呼叫时间'
,
`heartbeat_time`
timestamp
NULL
DEFAULT
NULL
COMMENT
'心跳时间'
,
`create_time`
timestamp
NULL
DEFAULT
NULL
COMMENT
'创建时间'
,
`update_time`
timestamp
NULL
DEFAULT
NULL
ON
UPDATE
CURRENT_TIMESTAMP
COMMENT
'修改时间'
,
PRIMARY
KEY
(
`id`
)
USING
BTREE
,
KEY
`idx_fk_rtc_room_id`
(
`fk_rtc_room_id`
)
USING
BTREE
,
KEY
`idx_room_id`
(
`room_id`
)
USING
BTREE
,
KEY
`idx_call_time_state`
(
`call_time`
,
`state`
)
USING
BTREE
,
KEY
`idx_heartbeat_time_state`
(
`heartbeat_time`
,
`state`
)
USING
BTREE
,
KEY
`idx_client_id`
(
`client_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COMMENT
=
'多人音视频房间成员表'
;
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COMMENT
=
'多人音视频房间成员表'
;
ALTER
TABLE
im_conversation
ADD
COLUMN
group_portrait
varchar
(
1000
)
DEFAULT
NULL
COMMENT
'群头像'
;
ALTER
TABLE
im_conversation
ADD
COLUMN
head_portrait
varchar
(
1000
)
DEFAULT
NULL
COMMENT
'群头像'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment