添加实例的查询结果的条件排序

WxrLZQ · WxrLZQ · commit a90c1476f848 · 2021-09-06T11:10:53.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
@@ -1,13 +1,16 @@
 package com.lzq.api.dto;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author ：LZQ
@@ -83,4 +86,19 @@ public class ExampleAccount implements Serializable {
     @TableField(exist = false)
     @JsonProperty("myFavorites")
     private Boolean myFavorites=false;
+
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss:",timezone = "GMT+8")
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    @JsonProperty("updateTime")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss",timezone = "GMT+8")
+    private Date updateTime;
 }
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleAccountService.java b/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleAccountService.java
@@ -14,17 +14,21 @@ public interface ExampleAccountService {
 
     /**
      * 通过实例名查询实例
-     * @param exampleName 实例名
-     * @param currentPage 当前页
+     *
+     * @param exampleName    实例名
+     * @param currentPage    当前页
+     * @param orderCondition 排序条件
      * @return
      */
-    PageInfo<ExampleAccount> queryByExampleName(String exampleName, Integer currentPage);
+    PageInfo<ExampleAccount> queryByExampleName(String exampleName, Integer currentPage, Integer orderCondition);
 
     /**
      * 查询个人喜爱实例
-     * @param username 用户名
+     *
+     * @param username    用户名
      * @param currentPage 当前页
+     * @param orderCondition
      * @return
      */
-    PageInfo<ExampleAccount> queryPersonFavorites(String username, Integer currentPage);
+    PageInfo<ExampleAccount> queryPersonFavorites(String username, Integer currentPage,Integer orderCondition);
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleAccountMapper.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleAccountMapper.java
@@ -15,7 +15,7 @@
 @Repository
 public interface ExampleAccountMapper extends BaseMapper<ExampleAccount> {
 
-    public List<ExampleAccount> queryByExampleName(String exampleName);
+    public List<ExampleAccount> queryByExampleName(@Param("exampleName") String exampleName,@Param("orderCondition") Integer orderCondition);
 
-    List<ExampleAccount> queryPersonFavorites(@Param("username") String username);
+    List<ExampleAccount> queryPersonFavorites(@Param("username") String username,@Param("orderCondition") Integer orderCondition);
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleAccountServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleAccountServiceImpl.java
@@ -21,19 +21,19 @@
 public class ExampleAccountServiceImpl extends ServiceImpl<ExampleAccountMapper, ExampleAccount> implements ExampleAccountService {
 
     @Override
-    public PageInfo<ExampleAccount> queryByExampleName(String exampleName,Integer currentPage) {
+    public PageInfo<ExampleAccount> queryByExampleName(String exampleName, Integer currentPage, Integer orderCondition) {
         //当前页和每页条数
-        PageHelper.startPage(currentPage,12);
+        PageHelper.startPage(currentPage, 12);
         //获取全部数据
-        List<ExampleAccount> list = baseMapper.queryByExampleName(exampleName);
+        List<ExampleAccount> list = baseMapper.queryByExampleName(exampleName, orderCondition);
         return new PageInfo<>(list);
     }
 
     @Override
-    public PageInfo<ExampleAccount> queryPersonFavorites(String username, Integer currentPage) {
+    public PageInfo<ExampleAccount> queryPersonFavorites(String username, Integer currentPage, Integer orderCondition) {
         //当前页和每页条数
-        PageHelper.startPage(currentPage,12);
-        List<ExampleAccount> list = baseMapper.queryPersonFavorites(username);
+        PageHelper.startPage(currentPage, 12);
+        List<ExampleAccount> list = baseMapper.queryPersonFavorites(username, orderCondition);
         return new PageInfo<>(list);
     }
 }
diff --git a/springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml
@@ -2,46 +2,68 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lzq.dubboservice.mapper.ExampleAccountMapper">
     <sql id="Thebasic">
-        a.example_id, example_name, ispublic, label, img, file_name, favorites, a.username
+        a
+        .
+        example_id
+        , example_name, ispublic, label, img, file_name, favorites, a.username
     </sql>
 
     <select id="queryByExampleName" resultType="com.lzq.api.dto.ExampleAccount">
         select
-               a.username,
+        a.username,
+        name,
+        user_picture,
+        description,
+        example_id,
+        example_name,
+        label,
+        img,
+        b.favorites,
+        b.create_time,
+        b.update_time
+        from account a left join example b
+        on
+        a.username=b.username
+        where
+              b.example_name like concat('%',#{exampleName},'%')
+        or    b.label like concat('%',#{exampleName},'%')
+        <if test="orderCondition == 0">
+            order by b.create_time desc
+        </if>
+        <if test="orderCondition == 1">
+            order by b.update_time desc
+        </if>
+        <if test="orderCondition == 2">
+            order by b.favorites desc
+        </if>
+    </select>
+
+    <select id="queryPersonFavorites" resultType="com.lzq.api.dto.ExampleAccount">
+        select a.username,
                name,
                user_picture,
                description,
-               example_id,
+               a.example_id,
                example_name,
                label,
                img,
-               favorites
-        from account a left join example b
-        on
-            a.username=b.username
-        where b.example_name like concat('%',#{exampleName},'%')
-        order by b.favorites desc
-    </select>
-
-    <select id="queryPersonFavorites" resultType="com.lzq.api.dto.ExampleAccount">
-        select
-            a.username,
-            name,
-            user_picture,
-            description,
-            a.example_id,
-            example_name,
-            label,
-            img,
-            a.favorites
-        from example a left join favorites b
-        on
-            a.example_id=b.example_id
-        left join account c
-        on
-            a.username=c.username
-        where
-        b.username=#{username}
-
+               a.favorites
+        from example a
+                 left join favorites b
+                           on
+                               a.example_id = b.example_id
+                 left join account c
+                           on
+                               a.username = c.username
+        where b.username = #{username}
+        <if test="orderCondition == 0">
+            order by b.create_time desc
+        </if>
+        <if test="orderCondition == 1">
+            order by b.update_time desc
+        </if>
+        <if test="orderCondition == 2">
+            order by b.favorites desc
+        </if>
     </select>
 </mapper>
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
@@ -66,7 +66,7 @@ public Map<String, Object> queryByUsername(String username) {
         //获取喜爱人数
         Integer count = favoritesService.getCount(username);
         //当喜爱数不匹配时进行更新
-        if (!result.getFavorites().equals(count)){
+        if (!result.getFavorites().equals(count)) {
             result.setFavorites(count);
             Account account = new Account();
             account.setUsername(result.getUsername());
@@ -196,7 +196,7 @@ public Map<String, Object> getFanList(HttpServletRequest request, AccountResult
      */
     @GetMapping("/queryByExampleName")
     @ApiOperation("根据实例名查询实例")
-    public Map<String, Object> queryByExampleName(HttpServletRequest request, String exampleName, @RequestParam(defaultValue = "1") Integer currentPage,@RequestParam(defaultValue = "0") Integer orderCondition) {
+    public Map<String, Object> queryByExampleName(HttpServletRequest request, String exampleName, @RequestParam(defaultValue = "1") Integer currentPage, @RequestParam(defaultValue = "0") Integer orderCondition) {
         String username = null;
         if (request.getHeader("token") != null) {
             //获取token中的用户名
@@ -273,12 +273,13 @@ public Map<String, Object> getExample(HttpServletRequest request, Account accoun
      *
      * @param request
      * @param account
-     * @param currentPage
+     * @param currentPage    当前页数
+     * @param orderCondition 排序条件
      * @return
      */
     @GetMapping("/getFavorites")
     @ApiOperation("获取喜爱实例列表")
-    public Map<String, Object> getFavorites(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage) {
+    public Map<String, Object> getFavorites(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage, @RequestParam(defaultValue = "0") Integer orderCondition) {
         String username = null;
         PageInfo<ExampleAccount> list;
         if (request.getHeader("token") != null) {
@@ -290,7 +291,7 @@ public Map<String, Object> getFavorites(HttpServletRequest request, Account acco
         if (username != null) {
             //判断用户是否查看他人的喜爱实例
             if (username.equals(account.getUsername())) {
-                list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage);
+                list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage, orderCondition);
                 //关注列表
                 List<String> followList = redisTemplate.opsForList().range(username, 0, -1);
                 List<ExampleAccount> exampleList = list.getList();
@@ -307,7 +308,7 @@ public Map<String, Object> getFavorites(HttpServletRequest request, Account acco
                 List<Integer> favoritesList = redisTemplate.opsForList().range(username + "fav", 0, -1);
                 //获取缓存中用户的关注用户名
                 List<String> followList = redisTemplate.opsForList().range(username, 0, -1);
-                list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage);
+                list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage, orderCondition);
                 List<ExampleAccount> exampleList = list.getList();
                 for (ExampleAccount exampleAccount : exampleList) {
                     //判断该用户是否被关注，该用户是否是自己
@@ -323,7 +324,7 @@ public Map<String, Object> getFavorites(HttpServletRequest request, Account acco
                 list.setList(exampleList);
             }
         } else {
-            list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage);
+            list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage, orderCondition);
         }
         return ResultMapUtils.ResultMap(true, 0, list);
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`@Repository`
`16`	`16`	`public interface ExampleAccountMapper extends BaseMapper<ExampleAccount> {`
`17`	`17`
`18`		`- public List<ExampleAccount> queryByExampleName(String exampleName);`
	`18`	`+ public List<ExampleAccount> queryByExampleName(@Param("exampleName") String exampleName,@Param("orderCondition") Integer orderCondition);`
`19`	`19`
`20`		`- List<ExampleAccount> queryPersonFavorites(@Param("username") String username);`
	`20`	`+ List<ExampleAccount> queryPersonFavorites(@Param("username") String username,@Param("orderCondition") Integer orderCondition);`
`21`	`21`	`}`