Skip to content

Commit ab76cf5

Browse files
WxrLZQWxrLZQ
committed
查询个人作品接口添加排序条件
1 parent 9dcb1a3 commit ab76cf5

File tree

5 files changed

+49
-25
lines changed

5 files changed

+49
-25
lines changed

‎springboot-dubbo-api/src/main/java/com/lzq/api/dto/ExampleAccount.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public class ExampleAccount implements Serializable {
9494

9595
@JsonProperty("createTime")
9696
@TableField("create_time")
97-
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss:",timezone = "GMT+8")
97+
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
9898
private Date createTime;
9999
/**
100100
* 更新时间

‎springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.lzq.api.pojo;
22

33
import com.baomidou.mybatisplus.annotation.*;
4+
import com.fasterxml.jackson.annotation.JsonFormat;
45
import com.fasterxml.jackson.annotation.JsonIgnore;
56
import com.fasterxml.jackson.annotation.JsonProperty;
67
import lombok.AllArgsConstructor;
@@ -78,14 +79,16 @@ public class Example implements Serializable {
7879
/**
7980
* 创建时间
8081
*/
81-
@JsonIgnore
82-
@TableField(fill = FieldFill.INSERT)
82+
@JsonProperty("createTime")
83+
@TableField(value ="create_time",fill = FieldFill.INSERT)
84+
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
8385
private Date createTime;
8486
/**
8587
* 更新时间
8688
*/
87-
@JsonIgnore
88-
@TableField(fill = FieldFill.INSERT_UPDATE)
89+
@JsonProperty("updateTime")
90+
@TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
91+
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
8992
private Date updateTime;
9093
/**
9194
* 乐观锁

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public interface ExampleService {
4545
* @param currentPage 当前页
4646
* @return
4747
*/
48-
PageInfo<Example> queryByAccount(String username, Integer currentPage);
48+
PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition);
4949

5050

5151
/**
@@ -59,13 +59,15 @@ public interface ExampleService {
5959

6060
/**
6161
* 删除实例（物理删除实例）
62+
*
6263
* @param exampleId 实例id
6364
* @return
6465
*/
6566
Boolean deleteExample(String exampleId);
6667

6768
/**
6869
* 通过实例id查询实例信息
70+
*
6971
* @param exampleId
7072
* @return
7173
*/

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class ExampleServiceImpl extends ServiceImpl<ExampleMapper, Example> impl
2323

2424
@Override
2525
public Boolean insert(Example example) {
26-
return baseMapper.insert(example)>0?true:false;
26+
return baseMapper.insert(example) > 0 ? true : false;
2727
}
2828

2929
@Override
@@ -33,13 +33,24 @@ public Boolean update(Example example) {
3333

3434
@Override
3535
public boolean deleteById(String exampleId) {
36-
return baseMapper.deleteById(exampleId)>0?true:false;
36+
return baseMapper.deleteById(exampleId) > 0 ? true : false;
3737
}
3838

3939
@Override
40-
public PageInfo<Example> queryByAccount(String username, Integer currentPage) {
40+
public PageInfo<Example> queryByAccount(String username, Integer currentPage, Integer orderCondition) {
4141
QueryWrapper<Example> wrapper = new QueryWrapper<>();
4242
wrapper.eq("username", username);
43+
switch (orderCondition){
44+
case 0:
45+
wrapper.orderByDesc("create_time");
46+
break;
47+
case 1:
48+
wrapper.orderByDesc("update_time");
49+
break;
50+
case 2:
51+
wrapper.orderByDesc("favorites");
52+
break;
53+
}
4354
//当前页和每页条数
4455
PageHelper.startPage(currentPage, 12);
4556
List<Example> list = baseMapper.selectList(wrapper);
@@ -59,14 +70,14 @@ public PageInfo<Example> queryByPublic(String username, Integer currentPage) {
5970

6071
@Override
6172
public Boolean deleteExample(String exampleId) {
62-
return baseMapper.deleteExample(exampleId)>0?true:false;
73+
return baseMapper.deleteExample(exampleId) > 0 ? true : false;
6374

6475
}
6576

6677
@Override
6778
public Example queryById(String exampleId) {
6879
QueryWrapper<Example> wrapper = new QueryWrapper<>();
69-
wrapper.eq("example_id",exampleId);
80+
wrapper.eq("example_id", exampleId);
7081
return baseMapper.selectOne(wrapper);
7182
}
7283

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

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ public class QueryController {
6464
@ApiOperation("根据用户名查询用户信息")
6565
public Map<String, Object> queryByUsername(HttpSession session, String username) {
6666

67-
log.info("根据用户名查询用户信息接口："+username);
67+
log.info("根据用户名查询用户信息接口：" + username);
6868
//获取用户信息
6969
AccountResult result = accountResultService.queryByUsername(username);
7070
//获取喜爱人数
7171
Integer count = favoritesService.getCount(username);
72-
if (result!=null){
72+
if (result != null) {
7373
//当喜爱数不匹配时进行更新
7474
if (!result.getFavorites().equals(count)) {
7575
result.setFavorites(count);
@@ -90,12 +90,13 @@ public Map<String, Object> queryByUsername(HttpSession session, String username)
9090
*/
9191
@GetMapping("/getFollow")
9292
@ApiOperation("获取关注列表")
93-
public Map<String, Object> getFollowList(HttpServletRequest request, Account result, @RequestParam(defaultValue = "1") Integer currentPage) {
93+
public Map<String, Object> getFollowList(HttpServletRequest request, Account result,
94+
@RequestParam(defaultValue = "1") Integer currentPage) {
9495
String username = null;
9596
PageInfo<Account> list = null;
9697
String token = request.getHeader("token");
9798
//判断用户是否登录
98-
if (StringUtils.isNotBlank(token)){
99+
if (StringUtils.isNotBlank(token)) {
99100
username = JWTUtils.verify(token)
100101
.getClaim("username").asString();
101102
}
@@ -143,7 +144,8 @@ public Map<String, Object> getFollowList(HttpServletRequest request, Account res
143144
*/
144145
@GetMapping("/getFan")
145146
@ApiOperation("获取粉丝列表")
146-
public Map<String, Object> getFanList(HttpServletRequest request, Account result, @RequestParam(defaultValue = "1") Integer currentPage) {
147+
public Map<String, Object> getFanList(HttpServletRequest request, Account result,
148+
@RequestParam(defaultValue = "1") Integer currentPage) {
147149
String username = null;
148150
PageInfo<Account> list = null;
149151
//判断用户是否登录
@@ -194,13 +196,15 @@ public Map<String, Object> getFanList(HttpServletRequest request, Account result
194196
* 根据实例名查询实例
195197
*
196198
* @param request
197-
* @param content 实例名获取实例名
199+
* @param content 实例名获取实例名
198200
* @param currentPage 当前页
199201
* @return
200202
*/
201203
@GetMapping("/queryByExampleName")
202204
@ApiOperation("根据实例名或者标签查询实例")
203-
public Map<String, Object> queryByExampleName(HttpServletRequest request, String content, @RequestParam(defaultValue = "1") Integer currentPage, @RequestParam(defaultValue = "0") Integer orderCondition) {
205+
public Map<String, Object> queryByExampleName(HttpServletRequest request, String content,
206+
@RequestParam(defaultValue = "1") Integer currentPage,
207+
@RequestParam(defaultValue = "0") Integer orderCondition) {
204208
String username = null;
205209
if (request.getHeader("token") != null) {
206210
//获取token中的用户名
@@ -240,7 +244,9 @@ public Map<String, Object> queryByExampleName(HttpServletRequest request, String
240244
*/
241245
@GetMapping("/getExample")
242246
@ApiOperation("查询个人全部实例")
243-
public Map<String, Object> getExample(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage,@RequestParam(defaultValue = "0") Integer orderCondition) {
247+
public Map<String, Object> getExample(HttpServletRequest request, Account account,
248+
@RequestParam(defaultValue = "1") Integer currentPage,
249+
@RequestParam(defaultValue = "0") Integer orderCondition) {
244250
String username = null;
245251
PageInfo<Example> list;
246252
if (request.getHeader("token") != null) {
@@ -252,10 +258,10 @@ public Map<String, Object> getExample(HttpServletRequest request, Account accoun
252258
if (username != null) {
253259
//用户名相同则查询自己的实例，不同则查询他人的公开实例
254260
if (username.equals(account.getUsername())) {
255-
list = exampleService.queryByAccount(account.getUsername(), currentPage);
261+
list = exampleService.queryByAccount(account.getUsername(), currentPage, orderCondition);
256262
} else {
257263
//获取redis缓存中所喜欢的实例id列表
258-
List<Integer> favoriteslist = redisTemplate.opsForList().range(username + "fav", 0, -1);
264+
List<String> favoriteslist = redisTemplate.opsForList().range(username + "fav", 0, -1);
259265
list = exampleService.queryByPublic(account.getUsername(), currentPage);
260266
//获取实例集合
261267
List<Example> exampleList = list.getList();
@@ -283,7 +289,9 @@ public Map<String, Object> getExample(HttpServletRequest request, Account accoun
283289
*/
284290
@GetMapping("/getFavorites")
285291
@ApiOperation("获取喜爱实例列表")
286-
public Map<String, Object> getFavorites(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage, @RequestParam(defaultValue = "0") Integer orderCondition) {
292+
public Map<String, Object> getFavorites(HttpServletRequest request, Account account,
293+
@RequestParam(defaultValue = "1") Integer currentPage,
294+
@RequestParam(defaultValue = "0") Integer orderCondition) {
287295
String username = null;
288296
PageInfo<ExampleAccount> list;
289297
if (request.getHeader("token") != null) {
@@ -310,21 +318,21 @@ public Map<String, Object> getFavorites(HttpServletRequest request, Account acco
310318
} else {
311319
//获取缓存中用户的喜爱实例id
312320
List<String> favoritesList = redisTemplate.opsForList().range(username + "fav", 0, -1);
313-
log.info("查询到的个人喜爱列表"+favoritesList);
321+
log.info("查询到的个人喜爱列表" + favoritesList);
314322
//获取缓存中用户的关注用户名
315323
List<String> followList = redisTemplate.opsForList().range(username, 0, -1);
316324
list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage, orderCondition);
317325
List<ExampleAccount> exampleList = list.getList();
318326
for (ExampleAccount exampleAccount : exampleList) {
319-
log.info("遍历实例id:"+exampleAccount.getExampleId());
327+
log.info("遍历实例id:" + exampleAccount.getExampleId());
320328
//判断该用户是否被关注，该用户是否是自己
321329
if (followList.contains(exampleAccount.getUsername())) {
322330
exampleAccount.setMyFollow(true);
323331
} else if (username.equals(exampleAccount.getUsername())) {
324332
exampleAccount.setMyFollow(null);
325333
}
326334
if (favoritesList.contains(exampleAccount.getExampleId())) {
327-
log.info("我匹配正确了"+exampleAccount.getExampleId());
335+
log.info("我匹配正确了" + exampleAccount.getExampleId());
328336
exampleAccount.setMyFavorites(true);
329337
}
330338
}

0 commit comments

Comments
 (0)