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
13c4b726
Commit
13c4b726
authored
May 26, 2021
by
giaogiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会话列表attribute参数 转换成json格式
parent
7ee633b2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
59 additions
and
11 deletions
+59
-11
common/src/main/java/com/wecloud/im/controller/ImConversationController.java
+3
-3
common/src/main/java/com/wecloud/im/service/ImConversationService.java
+2
-1
common/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
+19
-3
common/src/main/java/com/wecloud/im/tillo/app_ws/model/request/ReceiveModel.java
+1
-2
common/src/main/java/com/wecloud/im/vo/ImConversationCreateVo.java
+26
-0
common/src/main/java/com/wecloud/im/vo/MyConversationListVo.java
+7
-1
common/src/main/resources/mapper/ImConversationMapper.xml
+1
-1
No files found.
common/src/main/java/com/wecloud/im/controller/ImConversationController.java
View file @
13c4b726
package
com
.
wecloud
.
im
.
controller
;
import
com.wecloud.im.entity.ImConversation
;
import
com.wecloud.im.param.add.ImConversationCreate
;
import
com.wecloud.im.service.ImConversationService
;
import
com.wecloud.im.vo.ImConversationCreateVo
;
import
com.wecloud.im.vo.MyConversationListVo
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.controller.BaseController
;
...
...
@@ -37,8 +37,8 @@ public class ImConversationController extends BaseController {
*/
@PostMapping
(
"/create"
)
@ApiOperation
(
value
=
"创建会话"
,
notes
=
"两个用户如果已经创建过会话,不能重复创建会话"
)
public
ApiResult
<
ImConversation
>
createImConversation
(
@RequestBody
ImConversationCreate
imConversationCreate
)
throws
Exception
{
ApiResult
<
ImConversation
>
imConversation
=
imConversationService
.
createImConversation
(
imConversationCreate
);
public
ApiResult
<
ImConversation
CreateVo
>
createImConversation
(
@RequestBody
ImConversationCreate
imConversationCreate
)
throws
Exception
{
ApiResult
<
ImConversation
CreateVo
>
imConversation
=
imConversationService
.
createImConversation
(
imConversationCreate
);
return
imConversation
;
}
...
...
common/src/main/java/com/wecloud/im/service/ImConversationService.java
View file @
13c4b726
...
...
@@ -4,6 +4,7 @@ import com.wecloud.im.entity.ImConversation;
import
com.wecloud.im.param.ImConversationPageParam
;
import
com.wecloud.im.param.ImConversationQueryVo
;
import
com.wecloud.im.param.add.ImConversationCreate
;
import
com.wecloud.im.vo.ImConversationCreateVo
;
import
com.wecloud.im.vo.MyConversationListVo
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.service.BaseService
;
...
...
@@ -29,7 +30,7 @@ public interface ImConversationService extends BaseService<ImConversation> {
boolean
saveImConversation
(
ImConversation
imConversation
)
throws
Exception
;
ApiResult
<
ImConversation
>
createImConversation
(
ImConversationCreate
imConversationCreate
);
ApiResult
<
ImConversation
CreateVo
>
createImConversation
(
ImConversationCreate
imConversationCreate
);
/**
* 修改
...
...
common/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
View file @
13c4b726
...
...
@@ -18,6 +18,7 @@ import com.wecloud.im.service.ImApplicationService;
import
com.wecloud.im.service.ImClientService
;
import
com.wecloud.im.service.ImConversationMembersService
;
import
com.wecloud.im.service.ImConversationService
;
import
com.wecloud.im.vo.ImConversationCreateVo
;
import
com.wecloud.im.vo.MyConversationListVo
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl
;
...
...
@@ -31,7 +32,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
/**
...
...
@@ -66,7 +69,7 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
}
@Override
public
ApiResult
<
ImConversation
>
createImConversation
(
ImConversationCreate
imConversationCreate
)
{
public
ApiResult
<
ImConversation
CreateVo
>
createImConversation
(
ImConversationCreate
imConversationCreate
)
{
JwtToken
jwtToken
=
(
JwtToken
)
SecurityUtils
.
getSubject
().
getPrincipal
();
...
...
@@ -131,7 +134,10 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
imConversationMembersService
.
save
(
imConversationMembers2
);
}
return
ApiResult
.
ok
(
imConversation
);
ImConversationCreateVo
imConversationCreateVo
=
new
ImConversationCreateVo
();
imConversationCreateVo
.
setId
(
imConversationId
);
return
ApiResult
.
ok
(
imConversationCreateVo
);
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
...
...
@@ -163,7 +169,17 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
ImClient
client
=
imClientService
.
getClient
();
return
imConversationMapper
.
getMyImConversationListAndMsgCount
(
client
.
getId
());
List
<
MyConversationListVo
>
myImConversationListAndMsgCount
=
imConversationMapper
.
getMyImConversationListAndMsgCount
(
client
.
getId
());
JsonMapper
jsonMapper
=
new
JsonMapper
();
List
<
MyConversationListVo
>
myImConversationListAndMsgCountNew
=
new
ArrayList
<>();
// 转换json格式
for
(
MyConversationListVo
myconversationlistvo
:
myImConversationListAndMsgCount
)
{
HashMap
attributess
=
jsonMapper
.
readValue
(
myconversationlistvo
.
getAttribute
(),
HashMap
.
class
);
myconversationlistvo
.
setAttributes
(
attributess
);
myImConversationListAndMsgCountNew
.
add
(
myconversationlistvo
);
}
return
myImConversationListAndMsgCountNew
;
}
...
...
common/src/main/java/com/wecloud/im/tillo/app_ws/model/request/ReceiveModel.java
View file @
13c4b726
...
...
@@ -15,8 +15,7 @@ import java.util.HashMap;
@Data
@NoArgsConstructor
@AllArgsConstructor
public
class
ReceiveModel
implements
Serializable
{
public
class
ReceiveModel
implements
Serializable
{
/**
* 枚举类UriPathEnum 请求uri的编码
...
...
common/src/main/java/com/wecloud/im/vo/ImConversationCreateVo.java
0 → 100644
View file @
13c4b726
package
com
.
wecloud
.
im
.
vo
;
import
io.geekidea.springbootplus.framework.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
/**
* 会话表
*
* @author wei
* @since 2021-05-07
*/
@Data
@Accessors
(
chain
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"ImConversationCreateVo"
)
public
class
ImConversationCreateVo
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
"会话id"
)
private
Long
id
;
}
common/src/main/java/com/wecloud/im/vo/MyConversationListVo.java
View file @
13c4b726
package
com
.
wecloud
.
im
.
vo
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -7,6 +8,7 @@ import lombok.experimental.Accessors;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.HashMap
;
/**
* <pre>
...
...
@@ -34,8 +36,12 @@ public class MyConversationListVo implements Serializable {
@ApiModelProperty
(
"可选 对话的名字,可为群组命名。"
)
private
String
name
;
@ApiModelProperty
(
value
=
"可选 自定义属性,供开发者扩展使用。"
,
hidden
=
true
)
@JsonIgnore
private
String
attribute
;
@ApiModelProperty
(
"可选 自定义属性,供开发者扩展使用。"
)
private
String
attributes
;
private
HashMap
attributes
;
@ApiModelProperty
(
"可选 对话类型标志,是否是系统对话,后面会说明。"
)
private
Boolean
system
;
...
...
common/src/main/resources/mapper/ImConversationMapper.xml
View file @
13c4b726
...
...
@@ -24,7 +24,7 @@
SELECT imConversation.id,
imConversation.create_time,
imConversation.`name`,
imConversation.attributes,
imConversation.attributes
as attribute
,
imConversation.system,
im_client.client_id AS creator,
(SELECT COUNT(im_inbox.id)
...
...
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