查询个人/他人喜爱实例

WxrLZQ · WxrLZQ · commit cfa44acba85d · 2021-09-01T14:55:53.000+08:00
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java b/springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java
@@ -91,9 +91,9 @@ public class AccountResult implements Serializable{
     /**
      * 关注
      */
-    @TableField("follow")
-    @JsonProperty("follow")
-    private Integer follow;
+    @TableField("following")
+    @JsonProperty("following")
+    private Integer following;
     @TableField(exist = false)
     /**
      * 我的关注
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java
@@ -112,9 +112,9 @@ public class Account implements Serializable, UserDetails {
     /**
      * 关注
      */
-    @TableField("follow")
-    @JsonProperty("follow")
-    private Integer follow;
+    @TableField("following")
+    @JsonProperty("following")
+    private Integer following;
     /**
      * 创建时间
      */
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
@@ -64,7 +64,7 @@ public class Example implements Serializable {
      */
     @TableField(value = "favorites")
     @JsonProperty("favorites")
-    private String favorites;
+    private Integer favorites;
 
     @TableField(exist = false)
     @JsonProperty("myFavorites")
@@ -91,9 +91,14 @@ public class Example implements Serializable {
      * 乐观锁
      */
     @JsonIgnore
-    @Version //乐观锁注解
+    @Version
     private Integer version;
-
+    /**
+     * 是否删除
+     */
+    @JsonIgnore
+    @TableLogic
+    private Integer deleted;
 
 
 }
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
@@ -11,5 +11,20 @@
  */
 public interface ExampleAccountService {
 
+
+    /**
+     * 通过实例名查询实例
+     * @param exampleName 实例名
+     * @param currentPage 当前页
+     * @return
+     */
     PageInfo<ExampleAccount> queryByExampleName(String exampleName, Integer currentPage);
+
+    /**
+     * 查询个人喜爱实例
+     * @param username 用户名
+     * @param currentPage 当前页
+     * @return
+     */
+    PageInfo<ExampleAccount> queryPersonFavorites(String username, Integer currentPage);
 }
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
@@ -40,10 +40,10 @@ public interface ExampleService {
     boolean deleteById(Integer exampleId);
 
 
-
     /**
      * 通过用户名查询实例
-     * @param username 用户名
+     *
+     * @param username    用户名
      * @param currentPage 当前页
      * @return
      */
@@ -52,11 +52,12 @@ public interface ExampleService {
 
     /**
      * 查询用户公开的实例
-     * @param username 用户名
+     *
+     * @param username    用户名
      * @param currentPage 当前页
      * @return
      */
-    PageInfo<Example> queryByPublic(String username,Integer currentPage);
+    PageInfo<Example> queryByPublic(String username, Integer currentPage);
 
 
 
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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lzq.api.dto.ExampleAccount;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,5 +14,8 @@
  */
 @Repository
 public interface ExampleAccountMapper extends BaseMapper<ExampleAccount> {
+
     public List<ExampleAccount> queryByExampleName(String exampleName);
+
+    List<ExampleAccount> queryPersonFavorites(@Param("username") String username);
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleMapper.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleMapper.java
@@ -2,15 +2,21 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lzq.api.dto.ExampleAccount;
 import com.lzq.api.pojo.Account;
 import com.lzq.api.pojo.Example;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author ：LZQ
  * @description：TODO
  * @date ：2021/8/26 15:07
  */
 @Repository
 public interface ExampleMapper extends BaseMapper<Example> {
+
+
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountResultServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountResultServiceImpl.java
@@ -33,7 +33,6 @@ public AccountResult queryByUsername(String username) {
 
     @Override
     public PageInfo<AccountResult> getFollowList(AccountResult result, Integer currentPage) {
-        Page<AccountResult> page = new Page<>();
         PageHelper.startPage(currentPage,24);
         List<AccountResult> list = baseMapper.getFollowList(result);
         return new PageInfo<>(list);
@@ -42,7 +41,6 @@ public PageInfo<AccountResult> getFollowList(AccountResult result, Integer curre
 
     @Override
     public PageInfo<AccountResult> getFanList(AccountResult result,Integer currentPage) {
-        Page<AccountResult> page = new Page<>();
         PageHelper.startPage(currentPage,24);
         List<AccountResult> list = baseMapper.getFanList(result);
         return new PageInfo<>(list);
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
@@ -1,7 +1,6 @@
 package com.lzq.dubboservice.service;
 
 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.dto.ExampleAccount;
@@ -23,11 +22,18 @@ public class ExampleAccountServiceImpl extends ServiceImpl<ExampleAccountMapper,
 
     @Override
     public PageInfo<ExampleAccount> queryByExampleName(String exampleName,Integer currentPage) {
-        Page<ExampleAccount> page = new Page<>();
         //当前页和每页条数
         PageHelper.startPage(currentPage,12);
         //获取全部数据
         List<ExampleAccount> list = baseMapper.queryByExampleName(exampleName);
         return new PageInfo<>(list);
     }
+
+    @Override
+    public PageInfo<ExampleAccount> queryPersonFavorites(String username, Integer currentPage) {
+        //当前页和每页条数
+        PageHelper.startPage(currentPage,12);
+        List<ExampleAccount> list = baseMapper.queryPersonFavorites(username);
+        return new PageInfo<>(list);
+    }
 }
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
@@ -39,7 +39,6 @@ public boolean deleteById(Integer exampleId) {
 
     @Override
     public PageInfo<Example> queryByAccount(String username, Integer currentPage) {
-        Page<Example> page = new Page<>();
         QueryWrapper<Example> wrapper = new QueryWrapper<>();
         wrapper.eq("username", username);
         //当前页和每页条数
@@ -50,7 +49,6 @@ public PageInfo<Example> queryByAccount(String username, Integer currentPage) {
 
     @Override
     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);
@@ -59,4 +57,6 @@ public PageInfo<Example> queryByPublic(String username, Integer currentPage) {
         List<Example> list = baseMapper.selectList(wrapper);
         return new PageInfo<>(list);
     }
+
+
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/FollowServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/FollowServiceImpl.java
@@ -39,7 +39,7 @@ public boolean addFollow(Follow follow) {
                 wrapperO.eq("username", follow.getUsername());
                 //获取关注人信息
                 Account accountO = accountMapper.selectOne(wrapperO);
-                accountO.setFollow(accountO.getFollow() + 1);
+                accountO.setFollowing(accountO.getFollowing() + 1);
                 //更新关注数
                 i1 = accountMapper.update(accountO, wrapperO);
             } while (i1 == 0);
@@ -73,7 +73,7 @@ public boolean cancelFollow(Follow follow) {
                 wrapperO.eq("username", follow.getUsername());
                 //获取关注人信息
                 Account accountO = accountMapper.selectOne(wrapperO);
-                accountO.setFollow(accountO.getFollow() - 1);
+                accountO.setFollowing(accountO.getFollowing() - 1);
                 //更新关注数
                 i1 = accountMapper.update(accountO, wrapperO);
             } while (i1 == 0);
diff --git a/springboot-dubbo-service/src/main/resources/mapper/AccoutResultMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/AccoutResultMapper.xml
@@ -4,7 +4,7 @@
 
     <sql id="AccountResult">
         a.username, name, email, contact_email, password, user_picture,
-          description, fan, follow
+          description, fan, following
     </sql>
 
     <select id="getFollowList" resultType="com.lzq.api.dto.AccountResult">
diff --git a/springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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
+    </sql>
 
     <select id="queryByExampleName" resultType="com.lzq.api.dto.ExampleAccount">
         select
@@ -13,8 +16,32 @@
                label,
                img,
                favorites
-        from account a left join example b on a.username=b.username
+        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,
+            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}
+
+    </select>
 </mapper>
diff --git a/springboot-dubbo-service/src/main/resources/mapper/ExampleMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/ExampleMapper.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lzq.dubboservice.mapper.ExampleMapper">
+
 </mapper>
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java b/springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java
@@ -66,7 +66,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 //放行index接口
                 .antMatchers("/").permitAll()
                 // .antMatchers("/index/**").permitAll()
-                .antMatchers("/user/**").authenticated()
+                .antMatchers("/user/**","/example/**").authenticated()
                 //所有请求都需要登录验证
                 // .anyRequest().authenticated()
                 .and()
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/config/WebConfigurer.java b/springboot-dubbo-web/src/main/java/com/lzq/web/config/WebConfigurer.java
@@ -10,6 +10,6 @@ public class WebConfigurer implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new JWTIntercepter()).addPathPatterns("/user/**");
+        registry.addInterceptor(new JWTIntercepter()).addPathPatterns("/user/**","/example/**");
     }
 }
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
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/intercepter/JWTIntercepter.java b/springboot-dubbo-web/src/main/java/com/lzq/web/intercepter/JWTIntercepter.java
