Skip to content

Commit 57e39b7

Browse files
WxrLZQWxrLZQ
committed
查询关注和粉丝列表的返回对象更改为AccountResult
1 parent 3a0c53d commit 57e39b7

File tree

13 files changed

+68
-74
lines changed

13 files changed

+68
-74
lines changed

‎springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountResultService.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,19 @@ public interface AccountResultService {
2727
*/
2828
Boolean updateFavorites(AccountResult result);
2929

30+
/**
31+
* 获取关注列表
32+
* @param result
33+
* @param currentPage 当前页
34+
* @return
35+
*/
36+
PageInfo<AccountResult> getFollowList(Account result, Integer currentPage);
37+
38+
/**
39+
* 获取粉丝列表
40+
* @param result
41+
* @return
42+
*/
43+
PageInfo<AccountResult> getFanList(Account result,Integer currentPage);
44+
3045
}

‎springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountService.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,7 @@ public interface AccountService {
8383
*/
8484
Account queryByGitId(String githubId, String giteeId);
8585

86-
/**
87-
* 获取关注列表
88-
* @param result
89-
* @param currentPage 当前页
90-
* @return
91-
*/
92-
PageInfo<Account> getFollowList(Account result, Integer currentPage);
9386

94-
/**
95-
* 获取粉丝列表
96-
* @param result
97-
* @return
98-
*/
99-
PageInfo<Account> getFanList(Account result,Integer currentPage);
10087

10188
/**
10289
* 根据用户名查询用户信息

‎springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountMapper.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,5 @@ public interface AccountMapper extends BaseMapper<Account> {
3131

3232
Integer bindGit(Account account);
3333

34-
List<Account> getFollowList(Account result);
3534

36-
List<Account> getFanList(Account result);
3735
}

‎springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountResultMapper.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
44
import com.lzq.api.dto.AccountResult;
5+
import com.lzq.api.pojo.Account;
56
import org.springframework.stereotype.Repository;
67

78
import java.util.List;
@@ -15,4 +16,8 @@
1516
public interface AccountResultMapper extends BaseMapper<AccountResult> {
1617

1718
Integer updateFavorites(AccountResult result);
19+
20+
List<AccountResult> getFollowList(Account result);
21+
22+
List<AccountResult> getFanList(Account result);
1823
}

‎springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountResultServiceImpl.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.github.pagehelper.PageHelper;
77
import com.github.pagehelper.PageInfo;
88
import com.lzq.api.dto.AccountResult;
9+
import com.lzq.api.pojo.Account;
910
import com.lzq.api.service.AccountResultService;
1011
import com.lzq.dubboservice.mapper.AccountResultMapper;
1112
import org.apache.commons.lang.StringUtils;
@@ -35,4 +36,19 @@ public AccountResult queryByUsername(String username) {
3536
public Boolean updateFavorites(AccountResult result) {
3637
return baseMapper.updateFavorites(result)>0?true:false;
3738
}
39+
40+
@Override
41+
public PageInfo<AccountResult> getFollowList(Account result, Integer currentPage) {
42+
PageHelper.startPage(currentPage,24);
43+
List<AccountResult> list = baseMapper.getFollowList(result);
44+
return new PageInfo<>(list);
45+
46+
}
47+
48+
@Override
49+
public PageInfo<AccountResult> getFanList(Account result,Integer currentPage) {
50+
PageHelper.startPage(currentPage,24);
51+
List<AccountResult> list = baseMapper.getFanList(result);
52+
return new PageInfo<>(list);
53+
}
3854
}

‎springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountServiceImpl.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,6 @@ public Account queryByPassword(Account account) {
124124
return baseMapper.selectOne(wrapper);
125125
}
126126

127-
@Override
128-
public PageInfo<Account> getFollowList(Account result, Integer currentPage) {
129-
PageHelper.startPage(currentPage,24);
130-
List<Account> list = baseMapper.getFollowList(result);
131-
return new PageInfo<>(list);
132-
133-
}
134127

135-
@Override
136-
public PageInfo<Account> getFanList(Account result,Integer currentPage) {
137-
PageHelper.startPage(currentPage,24);
138-
List<Account> list = baseMapper.getFanList(result);
139-
return new PageInfo<>(list);
140-
}
141128

142129
}

‎springboot-dubbo-service/src/main/resources/mapper/AccoutMapper.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,5 @@
4444
update account set favorites=favorites-1 where username=#{username}
4545
</update>
4646

47-
<select id="getFollowList" resultType="com.lzq.api.pojo.Account">
48-
select
49-
<include refid="Account"/>
50-
from account a left join follow b
51-
on
52-
a.username=b.follow_username
53-
where
54-
b.username=#{username}
55-
</select>
5647

57-
<select id="getFanList" resultType="com.lzq.api.pojo.Account">
58-
select
59-
<include refid="Account"/>
60-
from account a left join follow b
61-
on
62-
a.username=b.username
63-
where
64-
b.follow_username=#{username}
65-
</select>
6648
</mapper>

‎springboot-dubbo-service/src/main/resources/mapper/AccoutResultMapper.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mapper namespace="com.lzq.dubboservice.mapper.AccountResultMapper">
44

55
<sql id="AccountResult">
6-
a.username, name, email, contact_email, user_picture
6+
a.username, name, user_picture , description, works, fan
77
</sql>
88

99
<select id="getFollowList" resultType="com.lzq.api.dto.AccountResult">
@@ -29,4 +29,5 @@
2929
<update id="updateFavorites">
3030
update account set favorites=#{favorites} where username=#{username}
3131
</update>
32+
3233
</mapper>

‎springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ protected void configure(HttpSecurity http) throws Exception {
115115
.logoutUrl("/index/logout")
116116
//退出成功
117117
.logoutSuccessHandler((httpServletRequest, httpServletResponse, authentication) -> {
118+
httpServletRequest.getSession().removeAttribute("map");
118119
Map<String, Object> map = ResultMapUtils.ResultMapWithToken(true, 0, null, null);
119120
UserUtils.responseMessage(httpServletResponse, map, objectMapper);
120121
})

‎springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
@Slf4j
4242
@RestController
43-
@RequestMapping("/example")
43+
@RequestMapping(value = "/example",headers ="token")
4444
@Api(value = "实例接口",description = "实例接口")
4545
public class ExampleController {
4646

0 commit comments

Comments
 (0)