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
1f19ec16
Commit
1f19ec16
authored
May 06, 2022
by
罗长华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msgType还原为Integer类型
parent
b9e8eff3
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
26 additions
and
26 deletions
+26
-26
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
+1
-1
core/src/main/java/com/wecloud/im/chatroom/action/ChatRoomAction.java
+1
-1
core/src/main/java/com/wecloud/im/entity/ImMessage.java
+1
-1
core/src/main/java/com/wecloud/im/entity/ImMessageOnlineSend.java
+1
-1
core/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
+1
-1
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+11
-11
core/src/main/java/com/wecloud/im/service/impl/ImInboxServiceImpl.java
+2
-2
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
+6
-6
core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
+1
-1
core/src/main/java/com/wecloud/im/thousandchat/service/ThousandChatService.java
+1
-1
No files found.
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
View file @
1f19ec16
...
@@ -226,7 +226,7 @@ public class NormalChatAction {
...
@@ -226,7 +226,7 @@ public class NormalChatAction {
imMessageOnlineSend
.
setWithdraw
(
imMessage
.
getWithdraw
());
imMessageOnlineSend
.
setWithdraw
(
imMessage
.
getWithdraw
());
imMessageOnlineSend
.
setEvent
(
imMessage
.
getEvent
());
imMessageOnlineSend
.
setEvent
(
imMessage
.
getEvent
());
imMessageOnlineSend
.
setSystemFlag
(
imMessage
.
getSystemFlag
());
imMessageOnlineSend
.
setSystemFlag
(
imMessage
.
getSystemFlag
());
imMessageOnlineSend
.
setType
(
data
.
getType
()
+
""
);
imMessageOnlineSend
.
setType
(
data
.
getType
());
imMessageOnlineSend
.
setAt
(
imMessage
.
getAt
());
imMessageOnlineSend
.
setAt
(
imMessage
.
getAt
());
return
imMessageOnlineSend
;
return
imMessageOnlineSend
;
}
}
...
...
core/src/main/java/com/wecloud/im/chatroom/action/ChatRoomAction.java
View file @
1f19ec16
...
@@ -136,7 +136,7 @@ public class ChatRoomAction {
...
@@ -136,7 +136,7 @@ public class ChatRoomAction {
imMessageOnlineSend
.
setWithdraw
(
false
);
imMessageOnlineSend
.
setWithdraw
(
false
);
imMessageOnlineSend
.
setEvent
(
false
);
imMessageOnlineSend
.
setEvent
(
false
);
imMessageOnlineSend
.
setSystemFlag
(
false
);
imMessageOnlineSend
.
setSystemFlag
(
false
);
imMessageOnlineSend
.
setType
(
data
.
getType
()
+
""
);
imMessageOnlineSend
.
setType
(
data
.
getType
());
imMessageOnlineSend
.
setAt
(
data
.
getAt
());
imMessageOnlineSend
.
setAt
(
data
.
getAt
());
return
imMessageOnlineSend
;
return
imMessageOnlineSend
;
}
}
...
...
core/src/main/java/com/wecloud/im/entity/ImMessage.java
View file @
1f19ec16
...
@@ -76,7 +76,7 @@ public class ImMessage extends BaseEntity {
...
@@ -76,7 +76,7 @@ public class ImMessage extends BaseEntity {
private
Long
fkConversationId
;
private
Long
fkConversationId
;
@ApiModelProperty
(
"消息类型"
)
@ApiModelProperty
(
"消息类型"
)
private
String
msgType
;
private
Integer
msgType
;
@ApiModelProperty
(
"是否删除 1-未删除 2-已删除"
)
@ApiModelProperty
(
"是否删除 1-未删除 2-已删除"
)
private
Integer
isDelete
;
private
Integer
isDelete
;
...
...
core/src/main/java/com/wecloud/im/entity/ImMessageOnlineSend.java
View file @
1f19ec16
...
@@ -29,7 +29,7 @@ public class ImMessageOnlineSend extends BaseEntity {
...
@@ -29,7 +29,7 @@ public class ImMessageOnlineSend extends BaseEntity {
* @see com.wecloud.im.ws.enums.MsgTypeEnum
* @see com.wecloud.im.ws.enums.MsgTypeEnum
*/
*/
@ApiModelProperty
(
"消息类型"
)
@ApiModelProperty
(
"消息类型"
)
private
String
type
;
private
Integer
type
;
@NotNull
(
message
=
"消息id不能为空"
)
@NotNull
(
message
=
"消息id不能为空"
)
@ApiModelProperty
(
"消息id"
)
@ApiModelProperty
(
"消息id"
)
...
...
core/src/main/java/com/wecloud/im/service/impl/ImConversationMembersServiceImpl.java
View file @
1f19ec16
...
@@ -136,7 +136,7 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
...
@@ -136,7 +136,7 @@ public class ImConversationMembersServiceImpl extends BaseServiceImpl<ImConversa
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setType
(
MsgTypeEnum
.
CONVERSATION_MEMBER_NAME_MODIFY
.
getUriCode
()
+
""
);
imMessageOnlineSend
.
setType
(
MsgTypeEnum
.
CONVERSATION_MEMBER_NAME_MODIFY
.
getUriCode
());
imMessageOnlineSend
.
setSender
(
currentClient
.
getClientId
());
imMessageOnlineSend
.
setSender
(
currentClient
.
getClientId
());
Map
<
String
,
Object
>
content
=
Maps
.
newHashMap
();
Map
<
String
,
Object
>
content
=
Maps
.
newHashMap
();
content
.
put
(
"operator"
,
currentClient
.
getClientId
());
content
.
put
(
"operator"
,
currentClient
.
getClientId
());
...
...
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
View file @
1f19ec16
...
@@ -268,7 +268,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -268,7 +268,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
SnowflakeUtil
.
getId
());
imMessage
.
setId
(
SnowflakeUtil
.
getId
());
imMessage
.
setMsgType
(
MsgTypeEnum
.
CLIENT_JOIN_NEW_CONVERSATION
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
CLIENT_JOIN_NEW_CONVERSATION
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setSender
(
createClient
.
getId
());
imMessage
.
setSender
(
createClient
.
getId
());
...
@@ -364,7 +364,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -364,7 +364,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
messageId
);
imMessage
.
setId
(
messageId
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
INVITE_CLIENT_JOIN_CONVERSATION
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
INVITE_CLIENT_JOIN_CONVERSATION
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setSender
(
imClientSender
.
getId
());
imMessage
.
setSender
(
imClientSender
.
getId
());
...
@@ -455,7 +455,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -455,7 +455,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage
.
setContent
(
JsonUtils
.
encodeJson
(
content
));
imMessage
.
setContent
(
JsonUtils
.
encodeJson
(
content
));
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
messageId
);
imMessage
.
setId
(
messageId
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
REMOVE_CLIENT_CONVERSATION
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
REMOVE_CLIENT_CONVERSATION
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setSender
(
imClientSender
.
getId
());
imMessage
.
setSender
(
imClientSender
.
getId
());
...
@@ -471,7 +471,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -471,7 +471,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
Long
conversationId
=
imClientToConversation
.
getConversationId
();
Long
conversationId
=
imClientToConversation
.
getConversationId
();
Long
appId
=
imApplication
.
getId
();
Long
appId
=
imApplication
.
getId
();
String
sender
=
imClientSender
.
getClientId
();
String
sender
=
imClientSender
.
getClientId
();
String
msgType
=
imMessage
.
getMsgType
();
Integer
msgType
=
imMessage
.
getMsgType
();
sendMsgToMembers
(
conversationId
,
membersList
,
appId
,
sender
,
content
,
imMessage
);
sendMsgToMembers
(
conversationId
,
membersList
,
appId
,
sender
,
content
,
imMessage
);
}
}
...
@@ -512,7 +512,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -512,7 +512,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage
.
setContent
(
JsonUtils
.
encodeJson
(
content
));
imMessage
.
setContent
(
JsonUtils
.
encodeJson
(
content
));
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
SnowflakeUtil
.
getId
());
imMessage
.
setId
(
SnowflakeUtil
.
getId
());
imMessage
.
setMsgType
(
MsgTypeEnum
.
CONVERSATION_DISBAND
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
CONVERSATION_DISBAND
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setSender
(
currentClient
.
getId
());
imMessage
.
setSender
(
currentClient
.
getId
());
...
@@ -579,7 +579,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -579,7 +579,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
messageId
);
imMessage
.
setId
(
messageId
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
LEAVE_CONVERSATION
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
LEAVE_CONVERSATION
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setSender
(
currentClient
.
getId
());
imMessage
.
setSender
(
currentClient
.
getId
());
...
@@ -787,7 +787,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -787,7 +787,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
ImMessage
message
=
new
ImMessage
();
ImMessage
message
=
new
ImMessage
();
message
.
setWithdraw
(
Boolean
.
FALSE
);
message
.
setWithdraw
(
Boolean
.
FALSE
);
message
.
setEvent
(
Boolean
.
TRUE
);
message
.
setEvent
(
Boolean
.
TRUE
);
message
.
setMsgType
(
MsgTypeEnum
.
CONVERSATION_NAME_CHANGE
.
getUriCode
()
+
""
);
message
.
setMsgType
(
MsgTypeEnum
.
CONVERSATION_NAME_CHANGE
.
getUriCode
());
sendMsgToMembers
(
param
.
getConversationId
(),
membersList
,
currentClient
.
getFkAppid
(),
sendMsgToMembers
(
param
.
getConversationId
(),
membersList
,
currentClient
.
getFkAppid
(),
currentClient
.
getClientId
(),
content
,
message
);
currentClient
.
getClientId
(),
content
,
message
);
...
@@ -837,7 +837,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -837,7 +837,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
ImMessage
message
=
new
ImMessage
();
ImMessage
message
=
new
ImMessage
();
message
.
setWithdraw
(
Boolean
.
FALSE
);
message
.
setWithdraw
(
Boolean
.
FALSE
);
message
.
setEvent
(
Boolean
.
TRUE
);
message
.
setEvent
(
Boolean
.
TRUE
);
message
.
setMsgType
(
MsgTypeEnum
.
CONVERSATION_EXPAND_FIELD_CHANGE
.
getUriCode
()
+
""
);
message
.
setMsgType
(
MsgTypeEnum
.
CONVERSATION_EXPAND_FIELD_CHANGE
.
getUriCode
());
sendMsgToMembers
(
conversationId
,
membersList
,
appId
,
sender
,
content
,
message
);
sendMsgToMembers
(
conversationId
,
membersList
,
appId
,
sender
,
content
,
message
);
}
else
{
}
else
{
throw
new
BusinessException
(
"修改错误"
);
throw
new
BusinessException
(
"修改错误"
);
...
@@ -1037,7 +1037,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -1037,7 +1037,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
messageId
);
imMessage
.
setId
(
messageId
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
INVITE_CLIENT_JOIN_CONVERSATION
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
INVITE_CLIENT_JOIN_CONVERSATION
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setFkAppid
(
imApplication
.
getId
());
imMessage
.
setSender
(
imClientSender
.
getId
());
imMessage
.
setSender
(
imClientSender
.
getId
());
...
@@ -1094,7 +1094,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -1094,7 +1094,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
ImMessage
imMessage
=
new
ImMessage
();
ImMessage
imMessage
=
new
ImMessage
();
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
messageId
);
imMessage
.
setId
(
messageId
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
LEAVE_CONVERSATION
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
MsgTypeEnum
.
LEAVE_CONVERSATION
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setSender
(
currentClient
.
getId
());
imMessage
.
setSender
(
currentClient
.
getId
());
...
@@ -1243,7 +1243,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
...
@@ -1243,7 +1243,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imMessage
.
setContent
(
JsonUtils
.
encodeJson
(
content
));
imMessage
.
setContent
(
JsonUtils
.
encodeJson
(
content
));
// 保存消息至消息表
// 保存消息至消息表
imMessage
.
setId
(
SnowflakeUtil
.
getId
());
imMessage
.
setId
(
SnowflakeUtil
.
getId
());
imMessage
.
setMsgType
(
msgType
.
toString
()
);
imMessage
.
setMsgType
(
msgType
);
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setSender
(
currentClient
.
getId
());
imMessage
.
setSender
(
currentClient
.
getId
());
...
...
core/src/main/java/com/wecloud/im/service/impl/ImInboxServiceImpl.java
View file @
1f19ec16
...
@@ -206,7 +206,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
...
@@ -206,7 +206,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
// 消息实体
// 消息实体
ImMessage
imMessage
=
new
ImMessage
();
ImMessage
imMessage
=
new
ImMessage
();
imMessage
.
setId
(
msgId
);
imMessage
.
setId
(
msgId
);
imMessage
.
setMsgType
(
msgTypeEnum
.
getUriCode
()
+
""
);
imMessage
.
setMsgType
(
msgTypeEnum
.
getUriCode
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setCreateTime
(
new
Date
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setFkAppid
(
currentClient
.
getFkAppid
());
imMessage
.
setSender
(
currentClient
.
getId
());
imMessage
.
setSender
(
currentClient
.
getId
());
...
@@ -219,7 +219,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
...
@@ -219,7 +219,7 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
BeanUtils
.
copyProperties
(
imMessage
,
imMessageOnlineSend
);
BeanUtils
.
copyProperties
(
imMessage
,
imMessageOnlineSend
);
imMessageOnlineSend
.
setType
(
msgTypeEnum
.
getUriCode
()
+
""
);
imMessageOnlineSend
.
setType
(
msgTypeEnum
.
getUriCode
());
imMessageOnlineSend
.
setMsgId
(
imMessage
.
getId
());
imMessageOnlineSend
.
setMsgId
(
imMessage
.
getId
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setSender
(
currentClient
.
getClientId
());
imMessageOnlineSend
.
setSender
(
currentClient
.
getClientId
());
...
...
core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java
View file @
1f19ec16
...
@@ -191,7 +191,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -191,7 +191,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
imMessage
.
setEvent
(
false
);
imMessage
.
setEvent
(
false
);
imMessage
.
setSystemFlag
(
false
);
imMessage
.
setSystemFlag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setMsgType
(
sysParam
.
getType
()
.
toString
()
);
imMessage
.
setMsgType
(
sysParam
.
getType
());
imMessage
.
setFkConversationId
(
sysParam
.
getToConversation
());
imMessage
.
setFkConversationId
(
sysParam
.
getToConversation
());
this
.
save
(
imMessage
);
this
.
save
(
imMessage
);
return
imMessage
;
return
imMessage
;
...
@@ -215,7 +215,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -215,7 +215,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
imMessage
.
setEvent
(
false
);
imMessage
.
setEvent
(
false
);
imMessage
.
setSystemFlag
(
false
);
imMessage
.
setSystemFlag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setMsgType
(
data
.
getType
()
.
toString
()
);
imMessage
.
setMsgType
(
data
.
getType
());
imMessage
.
setAt
(
data
.
getAt
());
imMessage
.
setAt
(
data
.
getAt
());
imMessage
.
setFkConversationId
(
data
.
getToConversation
());
imMessage
.
setFkConversationId
(
data
.
getToConversation
());
this
.
save
(
imMessage
);
this
.
save
(
imMessage
);
...
@@ -285,7 +285,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -285,7 +285,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
BeanUtils
.
copyProperties
(
messageById
,
imMessageOnlineSend
);
BeanUtils
.
copyProperties
(
messageById
,
imMessageOnlineSend
);
imMessageOnlineSend
.
setType
(
MsgTypeEnum
.
MSG_WITHDRAW
.
getUriCode
()
+
""
);
imMessageOnlineSend
.
setType
(
MsgTypeEnum
.
MSG_WITHDRAW
.
getUriCode
());
imMessageOnlineSend
.
setMsgId
(
messageById
.
getId
());
imMessageOnlineSend
.
setMsgId
(
messageById
.
getId
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setSender
(
imClientSender
.
getClientId
());
imMessageOnlineSend
.
setSender
(
imClientSender
.
getClientId
());
...
@@ -383,7 +383,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -383,7 +383,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
BeanUtils
.
copyProperties
(
message
,
imMessageOnlineSend
);
BeanUtils
.
copyProperties
(
message
,
imMessageOnlineSend
);
imMessageOnlineSend
.
setType
(
MsgTypeEnum
.
MSG_DELETE
.
getUriCode
()
+
""
);
imMessageOnlineSend
.
setType
(
MsgTypeEnum
.
MSG_DELETE
.
getUriCode
());
imMessageOnlineSend
.
setMsgId
(
message
.
getId
());
imMessageOnlineSend
.
setMsgId
(
message
.
getId
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setCreateTime
(
new
Date
());
imMessageOnlineSend
.
setSender
(
imClientSender
.
getClientId
());
imMessageOnlineSend
.
setSender
(
imClientSender
.
getClientId
());
...
@@ -662,7 +662,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -662,7 +662,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
imMessageOnlineSend
.
setWithdraw
(
message
.
getWithdraw
());
imMessageOnlineSend
.
setWithdraw
(
message
.
getWithdraw
());
imMessageOnlineSend
.
setEvent
(
message
.
getEvent
());
imMessageOnlineSend
.
setEvent
(
message
.
getEvent
());
imMessageOnlineSend
.
setSystemFlag
(
message
.
getSystemFlag
());
imMessageOnlineSend
.
setSystemFlag
(
message
.
getSystemFlag
());
imMessageOnlineSend
.
setType
(
message
.
getMsgType
()
+
""
);
imMessageOnlineSend
.
setType
(
message
.
getMsgType
());
imMessageOnlineSend
.
setAt
(
message
.
getAt
());
imMessageOnlineSend
.
setAt
(
message
.
getAt
());
return
imMessageOnlineSend
;
return
imMessageOnlineSend
;
}
}
...
@@ -693,7 +693,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
...
@@ -693,7 +693,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
imMessage
.
setEvent
(
false
);
imMessage
.
setEvent
(
false
);
imMessage
.
setSystemFlag
(
false
);
imMessage
.
setSystemFlag
(
false
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setSendStatus
(
2
);
imMessage
.
setMsgType
(
messageType
);
imMessage
.
setMsgType
(
Integer
.
valueOf
(
messageType
)
);
imMessage
.
setAt
(
""
);
imMessage
.
setAt
(
""
);
imMessage
.
setFkConversationId
(
toConversationId
);
imMessage
.
setFkConversationId
(
toConversationId
);
return
imMessage
;
return
imMessage
;
...
...
core/src/main/java/com/wecloud/im/thousandchat/action/ThousandChatAction.java
View file @
1f19ec16
...
@@ -211,7 +211,7 @@ public class ThousandChatAction {
...
@@ -211,7 +211,7 @@ public class ThousandChatAction {
imMessageOnlineSend
.
setWithdraw
(
imMessage
.
getWithdraw
());
imMessageOnlineSend
.
setWithdraw
(
imMessage
.
getWithdraw
());
imMessageOnlineSend
.
setEvent
(
imMessage
.
getEvent
());
imMessageOnlineSend
.
setEvent
(
imMessage
.
getEvent
());
imMessageOnlineSend
.
setSystemFlag
(
imMessage
.
getSystemFlag
());
imMessageOnlineSend
.
setSystemFlag
(
imMessage
.
getSystemFlag
());
imMessageOnlineSend
.
setType
(
data
.
getType
()
+
""
);
imMessageOnlineSend
.
setType
(
data
.
getType
());
imMessageOnlineSend
.
setAt
(
imMessage
.
getAt
());
imMessageOnlineSend
.
setAt
(
imMessage
.
getAt
());
return
imMessageOnlineSend
;
return
imMessageOnlineSend
;
}
}
...
...
core/src/main/java/com/wecloud/im/thousandchat/service/ThousandChatService.java
View file @
1f19ec16
...
@@ -193,7 +193,7 @@ public class ThousandChatService extends BaseServiceImpl<ImMsgReadLastestMapper,
...
@@ -193,7 +193,7 @@ public class ThousandChatService extends BaseServiceImpl<ImMsgReadLastestMapper,
// 封装响应的实体
// 封装响应的实体
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
ImMessageOnlineSend
imMessageOnlineSend
=
new
ImMessageOnlineSend
();
imMessageOnlineSend
.
setMsgId
(
lastestMsg
.
getId
());
imMessageOnlineSend
.
setMsgId
(
lastestMsg
.
getId
());
imMessageOnlineSend
.
setType
(
msgTypeEnum
.
getUriCode
()
+
""
);
imMessageOnlineSend
.
setType
(
msgTypeEnum
.
getUriCode
());
imMessageOnlineSend
.
setSender
(
curentClient
.
getClientId
());
imMessageOnlineSend
.
setSender
(
curentClient
.
getClientId
());
imMessageOnlineSend
.
setContent
(
contentMap
);
imMessageOnlineSend
.
setContent
(
contentMap
);
imMessageOnlineSend
.
setConversationId
(
lastestMsg
.
getFkConversationId
());
imMessageOnlineSend
.
setConversationId
(
lastestMsg
.
getFkConversationId
());
...
...
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