Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beyond-clouds
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
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
段启岩
beyond-clouds
Commits
7c0d2717
Commit
7c0d2717
authored
Feb 01, 2020
by
张晋雄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户模块基本功能
parent
dec08b0a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
71 deletions
+45
-71
src/main/java/cn/meteor/beyondclouds/modules/user/api/UserApi.java
+27
-9
src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserBlacklistService.java
+5
-0
src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserFollowService.java
+7
-27
src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserFollowServiceImpl.java
+6
-35
No files found.
src/main/java/cn/meteor/beyondclouds/modules/user/api/UserApi.java
View file @
7c0d2717
...
@@ -144,10 +144,10 @@ public class UserApi {
...
@@ -144,10 +144,10 @@ public class UserApi {
}
}
@ApiOperation
((
"关注"
))
@ApiOperation
((
"关注"
))
@PostMapping
(
"/user/{userId}/follower"
)
@PostMapping
(
"/user/{userId}/follower"
)
public
Response
follower
(
@PathVariable
(
name
=
"userId"
)
String
userId
,
@CurrentSubject
Subject
subject
){
public
Response
follower
(
@PathVariable
(
name
=
"userId"
)
String
userId
,
@CurrentSubject
Subject
subject
){
userFollowService
.
follower
(
userId
,
String
.
valueOf
(
subject
.
getId
()));
userFollowService
.
follower
(
userId
,
String
.
valueOf
(
subject
.
getId
()));
return
Response
.
success
();
return
Response
.
success
();
...
@@ -156,6 +156,7 @@ public class UserApi {
...
@@ -156,6 +156,7 @@ public class UserApi {
@ApiOperation
((
"取消关注"
))
@ApiOperation
((
"取消关注"
))
@DeleteMapping
(
"/user/{userId}/follower"
)
@DeleteMapping
(
"/user/{userId}/follower"
)
public
Response
delFollower
(
@PathVariable
(
name
=
"userId"
)
String
userId
,
@CurrentSubject
Subject
subject
){
public
Response
delFollower
(
@PathVariable
(
name
=
"userId"
)
String
userId
,
@CurrentSubject
Subject
subject
){
userFollowService
.
delFollower
(
userId
,
String
.
valueOf
(
subject
.
getId
()));
userFollowService
.
delFollower
(
userId
,
String
.
valueOf
(
subject
.
getId
()));
return
Response
.
success
();
return
Response
.
success
();
...
@@ -165,8 +166,8 @@ public class UserApi {
...
@@ -165,8 +166,8 @@ public class UserApi {
@GetMapping
(
"/my/fans"
)
@GetMapping
(
"/my/fans"
)
public
Response
myFans
(
@Valid
PageForm
pageForm
,
@CurrentSubject
Subject
subject
){
public
Response
myFans
(
@Valid
PageForm
pageForm
,
@CurrentSubject
Subject
subject
){
// 根据
用户获取列表
并返回
// 根据
userId获取粉丝
并返回
IPage
<
UserFollow
>
fansPage
=
userFollowService
.
getPage
(
pageForm
.
getPage
(),
pageForm
.
getSize
(),
String
.
valueOf
(
subject
.
getId
()));
IPage
<
UserFollow
>
fansPage
=
userFollowService
.
get
Fans
Page
(
pageForm
.
getPage
(),
pageForm
.
getSize
(),
String
.
valueOf
(
subject
.
getId
()));
PageVO
<
UserFollow
>
fansPageVo
=
new
PageVO
<>();
PageVO
<
UserFollow
>
fansPageVo
=
new
PageVO
<>();
fansPageVo
.
setTotalPage
(
fansPage
.
getPages
());
fansPageVo
.
setTotalPage
(
fansPage
.
getPages
());
fansPageVo
.
setDataList
(
fansPage
.
getRecords
());
fansPageVo
.
setDataList
(
fansPage
.
getRecords
());
...
@@ -176,22 +177,39 @@ public class UserApi {
...
@@ -176,22 +177,39 @@ public class UserApi {
@ApiOperation
((
"获取他人粉丝"
))
@ApiOperation
((
"获取他人粉丝"
))
@GetMapping
(
"/user/{userId}/fans"
)
@GetMapping
(
"/user/{userId}/fans"
)
public
Response
otherFans
(
@PathVariable
(
name
=
"userId"
)
String
userId
){
public
Response
otherFans
(
@Valid
PageForm
pageForm
,
@PathVariable
(
name
=
"userId"
)
String
userId
){
return
Response
.
success
(
userFollowService
.
Fans
(
userId
));
// 根据userId获取粉丝并返回
IPage
<
UserFollow
>
fansPage
=
userFollowService
.
getFansPage
(
pageForm
.
getPage
(),
pageForm
.
getSize
(),
userId
);
PageVO
<
UserFollow
>
fansPageVo
=
new
PageVO
<>();
fansPageVo
.
setTotalPage
(
fansPage
.
getPages
());
fansPageVo
.
setDataList
(
fansPage
.
getRecords
());
return
Response
.
success
(
fansPageVo
);
}
}
@ApiOperation
((
"获取我的关注"
))
@ApiOperation
((
"获取我的关注"
))
@GetMapping
(
"/my/follower"
)
@GetMapping
(
"/my/follower"
)
public
Response
myFollower
(
@CurrentSubject
Subject
subject
){
public
Response
myFollower
(
@Valid
PageForm
pageForm
,
@CurrentSubject
Subject
subject
){
return
Response
.
success
(
userFollowService
.
myFollower
(
String
.
valueOf
(
subject
.
getId
())));
// 根据userId获取关注列表并返回
IPage
<
UserFollow
>
followersPage
=
userFollowService
.
getFollowersPage
(
pageForm
.
getPage
(),
pageForm
.
getSize
(),
String
.
valueOf
(
subject
.
getId
()));
PageVO
<
UserFollow
>
followersPageVo
=
new
PageVO
<>();
followersPageVo
.
setTotalPage
(
followersPage
.
getPages
());
followersPageVo
.
setDataList
(
followersPage
.
getRecords
());
return
Response
.
success
(
followersPageVo
);
}
}
@ApiOperation
((
"获取他人关注"
))
@ApiOperation
((
"获取他人关注"
))
@GetMapping
(
"/user/{userId}/follower"
)
@GetMapping
(
"/user/{userId}/follower"
)
public
Response
otherFollower
(
@PathVariable
(
name
=
"userId"
)
String
userId
){
public
Response
otherFollower
(
@Valid
PageForm
pageForm
,
@PathVariable
(
name
=
"userId"
)
String
userId
){
return
Response
.
success
(
userFollowService
.
otherFollower
(
userId
));
// 根据userId获取关注列表并返回
IPage
<
UserFollow
>
followersPage
=
userFollowService
.
getFollowersPage
(
pageForm
.
getPage
(),
pageForm
.
getSize
(),
userId
);
PageVO
<
UserFollow
>
followersPageVo
=
new
PageVO
<>();
followersPageVo
.
setTotalPage
(
followersPage
.
getPages
());
followersPageVo
.
setDataList
(
followersPage
.
getRecords
());
return
Response
.
success
(
followersPageVo
);
}
}
...
...
src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserBlacklistService.java
View file @
7c0d2717
...
@@ -13,5 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
...
@@ -13,5 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
*/
public
interface
IUserBlacklistService
extends
IService
<
UserBlacklist
>
{
public
interface
IUserBlacklistService
extends
IService
<
UserBlacklist
>
{
/**
* 拉黑
* @param blackId
* @param userId
*/
void
blacklist
(
String
blackId
,
String
userId
);
void
blacklist
(
String
blackId
,
String
userId
);
}
}
src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserFollowService.java
View file @
7c0d2717
package
cn
.
meteor
.
beyondclouds
.
modules
.
user
.
service
;
package
cn
.
meteor
.
beyondclouds
.
modules
.
user
.
service
;
import
cn.meteor.beyondclouds.modules.user.entity.User
;
import
cn.meteor.beyondclouds.modules.user.entity.UserFollow
;
import
cn.meteor.beyondclouds.modules.user.entity.UserFollow
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
/**
/**
* @author 段启岩
* @author 段启岩
...
@@ -30,41 +28,23 @@ public interface IUserFollowService extends IService<UserFollow> {
...
@@ -30,41 +28,23 @@ public interface IUserFollowService extends IService<UserFollow> {
void
delFollower
(
String
userId
,
String
myUserId
);
void
delFollower
(
String
userId
,
String
myUserId
);
/**
* 查看我的粉丝
* @param userId
* @return
*/
List
<
User
>
myFans
(
String
userId
);
/**
* 查看其他用户的粉丝
* @param userId
* @return
*/
List
<
User
>
Fans
(
String
userId
);
/**
/**
* 查看我关注的人
* 根据userId查询粉丝
* @param userId
* @param pageNumber
* @return
* @param pageSize
*/
List
<
User
>
myFollower
(
String
userId
);
/**
* 查看其他用户关注的人
* @param userId
* @param userId
* @return
* @return
*/
*/
List
<
User
>
otherFollower
(
String
userId
);
IPage
<
UserFollow
>
getFansPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
);
/**
/**
* 根据userId
做分页查询
* 根据userId
查询关注的用户
* @param pageNumber
* @param pageNumber
* @param pageSize
* @param pageSize
* @param userId
* @param userId
* @return
* @return
*/
*/
IPage
<
UserFollow
>
getPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
);
IPage
<
UserFollow
>
getFollowersPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
);
}
}
src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserFollowServiceImpl.java
View file @
7c0d2717
...
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
/**
* @author 段启岩
* @author 段启岩
...
@@ -59,43 +58,15 @@ public class UserFollowServiceImpl extends ServiceImpl<IUserFollowMapper, UserFo
...
@@ -59,43 +58,15 @@ public class UserFollowServiceImpl extends ServiceImpl<IUserFollowMapper, UserFo
}
}
@Override
@Override
public
List
<
User
>
myFans
(
String
userId
)
{
public
IPage
<
UserFollow
>
getFansPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
IPage
<
UserFollow
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
QueryWrapper
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
UserFollow
>
projectQueryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"followed_id"
,
userId
);
projectQueryWrapper
.
eq
(
"followed_id"
,
userId
);
return
page
(
page
,
projectQueryWrapper
);
return
list
(
queryWrapper
);
}
@Override
public
List
<
User
>
Fans
(
String
userId
)
{
QueryWrapper
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"followed_id"
,
userId
);
return
list
(
queryWrapper
);
}
@Override
public
List
<
User
>
myFollower
(
String
userId
)
{
return
null
;
}
@Override
public
List
<
User
>
otherFollower
(
String
userId
)
{
QueryWrapper
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"follower_id"
,
userId
);
return
list
(
queryWrapper
);
}
}
@Override
@Override
public
IPage
<
UserFollow
>
getPage
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
public
IPage
<
UserFollow
>
get
Followers
Page
(
Integer
pageNumber
,
Integer
pageSize
,
String
userId
)
{
IPage
<
UserFollow
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
IPage
<
UserFollow
>
page
=
new
Page
<>(
pageNumber
,
pageSize
);
QueryWrapper
<
UserFollow
>
projectQueryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
UserFollow
>
projectQueryWrapper
=
new
QueryWrapper
<>();
projectQueryWrapper
.
eq
(
"follower_id"
,
userId
);
projectQueryWrapper
.
eq
(
"follower_id"
,
userId
);
...
...
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