查看个人/他人的个人实例作品

WxrLZQ · WxrLZQ · commit a76dd51b89cb · 2021-09-01T09:45:44.000+08:00
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/dto/ExampleAccount.java b/springboot-dubbo-api/src/main/java/com/lzq/api/dto/ExampleAccount.java
@@ -79,6 +79,7 @@ public class ExampleAccount implements Serializable {
     @JsonProperty("favorites")
     private String favorites;
 
+
     @TableField(exist = false)
     @JsonProperty("myFavorites")
     private Boolean myFavorites=false;
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java
@@ -65,6 +65,10 @@ public class Example implements Serializable {
     @TableField(value = "favorites")
     @JsonProperty("favorites")
     private String favorites;
+
+    @TableField(exist = false)
+    @JsonProperty("myFavorites")
+    private Boolean myFavorites=false;
     /**
      * 用户名
      */
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java b/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java
@@ -1,6 +1,7 @@
 package com.lzq.api.service;
 
 
+import com.github.pagehelper.PageInfo;
 import com.lzq.api.pojo.Example;
 
 import java.util.List;
@@ -13,22 +14,6 @@
  */
 public interface ExampleService {
 
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param exampleId 主键
-     * @return 实例对象
-     */
-    Example queryById(Integer exampleId);
-
-    /**
-     * 查询多条数据
-     *
-     * @param offset 查询起始位置
-     * @param limit  查询条数
-     * @return 对象列表
-     */
-    List<Example> queryAllByLimit(int offset, int limit);
 
     /**
      * 新增数据
@@ -58,17 +43,21 @@ public interface ExampleService {
 
     /**
      * 通过用户名查询实例
-     * @param username
+     * @param username 用户名
+     * @param currentPage 当前页
      * @return
      */
-    List<Example> queryByAccount(String username);
+    PageInfo<Example> queryByAccount(String username, Integer currentPage);
 
 
     /**
      * 查询用户公开的实例
-     * @param username
+     * @param username 用户名
+     * @param currentPage 当前页
      * @return
      */
-    List<Example> queryByPublic(String username);
+    PageInfo<Example> queryByPublic(String username,Integer currentPage);
+
+
 
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java
@@ -2,6 +2,9 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.lzq.api.pojo.Example;
 import com.lzq.api.service.ExampleService;
 import com.lzq.dubboservice.mapper.ExampleMapper;
@@ -18,15 +21,6 @@
 @Component
 @Service(interfaceClass = ExampleService.class)
 public class ExampleServiceImpl extends ServiceImpl<ExampleMapper, Example> implements ExampleService {
-    @Override
-    public Example queryById(Integer exampleId) {
-        return null;
-    }
-
-    @Override
-    public List<Example> queryAllByLimit(int offset, int limit) {
-        return null;
-    }
 
     @Override
     public Boolean insert(Example example) {
@@ -44,17 +38,25 @@ public boolean deleteById(Integer exampleId) {
     }
 
     @Override
-    public List<Example> queryByAccount(String username) {
+    public PageInfo<Example> queryByAccount(String username, Integer currentPage) {
+        Page<Example> page = new Page<>();
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
-        wrapper.eq("username",username);
-        return baseMapper.selectList(wrapper);
+        wrapper.eq("username", username);
+        //当前页和每页条数
+        PageHelper.startPage(currentPage, 12);
+        List<Example> list = baseMapper.selectList(wrapper);
+        return new PageInfo<>(list);
     }
 
     @Override
-    public List<Example> queryByPublic(String username) {
+    public PageInfo<Example> queryByPublic(String username, Integer currentPage) {
+        Page<Example> page = new Page<>();
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
-        wrapper.eq("username",username);
-        wrapper.eq("ispublic",0);
-        return baseMapper.selectList(wrapper);
+        wrapper.eq("username", username);
+        wrapper.eq("ispublic", 0);
+        //当前页和每页条数
+        PageHelper.startPage(currentPage, 12);
+        List<Example> list = baseMapper.selectList(wrapper);
+        return new PageInfo<>(list);
     }
 }
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java
@@ -141,32 +141,6 @@ public Map<String, Object> SaveExample(Example example, Content exampleContent,
         }
     }
 
-    /**
-     * 根据用户名查询全部实例
-     * @return
-     */
-    @GetMapping("/getExample")
-    @ApiOperation("查询个人全部实例")
-    public Map<String,Object> getExample(HttpServletRequest request){
-        //获取用户名
-        String username = JWTUtils.verify(request.getHeader("token"))
-                .getClaim("username").asString();
-        List<Example> list = exampleService.queryByAccount(username);
-        return ResultMapUtils.ResultMap(true,0,list);
-    }
-
-    /**
-     * 获取其他用户的公开实例
-     * @param username
-     * @return
-     */
-    @GetMapping("/getPublicExample")
-    @ApiOperation("获取其他用户的公开实例")
-    public Map<String,Object> getPublicExample(String username){
-        List<Example> list = exampleService.queryByPublic(username);
-        return ResultMapUtils.ResultMap(true,0,list);
-    }
-
     /**
      * 添加喜爱
      * @param favorites
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java
@@ -3,8 +3,11 @@
 import com.github.pagehelper.PageInfo;
 import com.lzq.api.dto.AccountResult;
 import com.lzq.api.dto.ExampleAccount;
+import com.lzq.api.pojo.Account;
+import com.lzq.api.pojo.Example;
 import com.lzq.api.service.AccountResultService;
 import com.lzq.api.service.ExampleAccountService;
+import com.lzq.api.service.ExampleService;
 import com.lzq.web.utils.JWTUtils;
 import com.lzq.web.utils.ResultMapUtils;
 import io.swagger.annotations.Api;
@@ -15,6 +18,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -28,20 +32,22 @@
  */
 @Slf4j
 @RestController
-@RequestMapping("/search")
+@RequestMapping("/query")
 @Api(value = "搜索接口", description = "搜索接口")
-public class SearchController {
+public class QueryController {
 
     @Reference
     private AccountResultService accountResultService;
 
     @Reference
     private ExampleAccountService exampleAccountService;
 
+    @Reference
+    private ExampleService exampleService;
+
     @Autowired
     private RedisTemplate redisTemplate;
 
-
     /**
      * 根据用户名查询用户信息
      *
@@ -55,7 +61,6 @@ public Map<String, Object> queryByUsername(String username) {
         return ResultMapUtils.ResultMap(true, 0, result);
     }
 
-
     /**
      * 获取关注列表
      *
@@ -65,7 +70,7 @@ public Map<String, Object> queryByUsername(String username) {
      */
     @GetMapping("/getFollow")
     @ApiOperation("获取关注列表")
-    public Map<String, Object> getFollowList(HttpServletRequest request, AccountResult result, Integer currentPage) {
+    public Map<String, Object> getFollowList(HttpServletRequest request, AccountResult result, @RequestParam(defaultValue = "1") Integer currentPage) {
         String username = null;
         PageInfo<AccountResult> list = null;
         //判断用户是否登录
@@ -117,7 +122,7 @@ public Map<String, Object> getFollowList(HttpServletRequest request, AccountResu
      */
     @GetMapping("/getFan")
     @ApiOperation("获取粉丝列表")
-    public Map<String, Object> getFanList(HttpServletRequest request, AccountResult result, Integer currentPage) {
+    public Map<String, Object> getFanList(HttpServletRequest request, AccountResult result, @RequestParam(defaultValue = "1") Integer currentPage) {
         String username = null;
         PageInfo<AccountResult> list = null;
         //判断用户是否登录
@@ -165,7 +170,6 @@ public Map<String, Object> getFanList(HttpServletRequest request, AccountResult
         return ResultMapUtils.ResultMap(true, 0, list);
     }
 
-
     /**
      * 根据实例名查询实例
      *
@@ -176,7 +180,7 @@ public Map<String, Object> getFanList(HttpServletRequest request, AccountResult
      */
     @GetMapping("/queryByExampleName")
     @ApiOperation("根据实例名查询实例")
-    public Map<String, Object> queryByExampleName(HttpServletRequest request, String exampleName, Integer currentPage) {
+    public Map<String, Object> queryByExampleName(HttpServletRequest request, String exampleName, @RequestParam(defaultValue = "1") Integer currentPage) {
         String username = null;
         if (request.getHeader("token") != null) {
             //获取token中的用户名
@@ -188,8 +192,10 @@ public Map<String, Object> queryByExampleName(HttpServletRequest request, String
         List<ExampleAccount> list = pageInfo.getList();
         //当用户不登陆时不需要进行任何操作查询数据直接返回
         if (username != null) {
+            //获取redis缓存中所关注的用户名列表
             List<String> followlist = redisTemplate.opsForList().range(username, 0, -1);
-            List<String> favoriteslist = redisTemplate.opsForList().range(username + "fav", 0, -1);
+            //获取redis缓存中所喜欢的实例id列表
+            List<Integer> favoriteslist = redisTemplate.opsForList().range(username + "fav", 0, -1);
             //遍历修改数组
             for (ExampleAccount exampleAccount : list) {
                 //当该用户被当前用户关注时设置为true,否则为false
@@ -208,4 +214,37 @@ public Map<String, Object> queryByExampleName(HttpServletRequest request, String
         return ResultMapUtils.ResultMap(true, 0, pageInfo);
     }
 
+    /**
+     * 根据用户名查询全部实例
+     *
+     * @return
+     */
+    @GetMapping("/getExample")
+    @ApiOperation("查询个人全部实例")
+    public Map<String, Object> getExample(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage) {
+        String username = null;
+        PageInfo<Example> list;
+        if (request.getHeader("token") != null) {
+            //获取token中的用户名
+            username = JWTUtils.verify(request.getHeader("token"))
+                    .getClaim("username").toString();
+        }
+        //用户名相同则查询自己的实例，不同则查询他人的公开实例
+        if (username.equals(account.getUsername())) {
+            list = exampleService.queryByAccount(account.getUsername(),currentPage);
+        } else {
+            //获取redis缓存中所喜欢的实例id列表
+            List<Integer> favoriteslist = redisTemplate.opsForList().range(username + "fav", 0, -1);
+            list = exampleService.queryByPublic(account.getUsername(),currentPage);
+            //获取实例集合
+            List<Example> exampleList = list.getList();
+            for (Example example : exampleList) {
+                if (favoriteslist.contains(example.getExampleId())){
+                    example.setMyFavorites(true);
+                }
+            }
+        }
+        return ResultMapUtils.ResultMap(true, 0, list);
+    }
+
 }
