把AccountResultService中的查询粉丝列表和查询关注列表接口移植到AccountService中

Author: WxrLZQ

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

@@ -94,7 +94,7 @@ public class Account implements Serializable, UserDetails {
      */
     @JsonIgnore
     @TableField(exist = false)
-    private Role role;
+    private Role role=new Role(1,"ROLE_normal");
     /**
      * 描述
      */
@@ -131,6 +131,12 @@ public class Account implements Serializable, UserDetails {
     @TableField("recycle")
     @JsonIgnore
     private Integer recycle;
+    /**
+     * 我的关注
+     */
+    @TableField(exist = false)
+    @JsonProperty("myFollow")
+    private Boolean myFollow=false;
     /**
      * 创建时间
      */

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

@@ -20,21 +20,6 @@ public interface AccountResultService {
      */
     AccountResult queryByUsername(String username);
 
-    /**
-     * 获取关注列表
-     * @param result
-     * @param currentPage 当前页
-     * @return
-     */
-    PageInfo<AccountResult> getFollowList(AccountResult result, Integer currentPage);
-
-    /**
-     * 获取粉丝列表
-     * @param result
-     * @return
-     */
-    PageInfo<AccountResult> getFanList(AccountResult result,Integer currentPage);
-
     /**
      * 更新喜爱数（校正喜爱数）
      * @param result

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

@@ -1,6 +1,7 @@
 package com.lzq.api.service;
 
 
+import com.github.pagehelper.PageInfo;
 import com.lzq.api.pojo.Account;
 
 /**
@@ -31,7 +32,7 @@ public interface AccountService {
      * @param account 实例对象
      * @return
      */
-    Boolean update(Account account) throws Exception;
+    Boolean update(Account account);
 
 
     /**
@@ -75,6 +76,21 @@ public interface AccountService {
      */
     Account queryByGitId(String githubId, String giteeId);
 
+    /**
+     * 获取关注列表
+     * @param result
+     * @param currentPage 当前页
+     * @return
+     */
+    PageInfo<Account> getFollowList(Account result, Integer currentPage);
+
+    /**
+     * 获取粉丝列表
+     * @param result
+     * @return
+     */
+    PageInfo<Account> getFanList(Account result,Integer currentPage);
+
     /**
      * 根据用户名查询用户信息
      * @param username

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

@@ -5,6 +5,8 @@
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author ：LZQ
  * @description：TODO
@@ -26,4 +28,8 @@ public interface AccountMapper extends BaseMapper<Account> {
     Integer reduceRecycle(@Param("username") String username);
 
     Integer bindGit(Account account);
+
+    List<Account> getFollowList(Account result);
+
+    List<Account> getFanList(Account result);
 }

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

@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lzq.api.dto.AccountResult;
-import com.lzq.api.pojo.Account;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -15,9 +14,5 @@
 @Repository
 public interface AccountResultMapper extends BaseMapper<AccountResult> {
 
-    public List<AccountResult> getFollowList(AccountResult result);
-
-    public List<AccountResult> getFanList(AccountResult result);
-
     Integer updateFavorites(AccountResult result);
 }

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

@@ -31,21 +31,6 @@ public AccountResult queryByUsername(String username) {
         return baseMapper.selectOne(wrapper);
     }
 
-    @Override
-    public PageInfo<AccountResult> getFollowList(AccountResult result, Integer currentPage) {
-        PageHelper.startPage(currentPage,24);
-        List<AccountResult> list = baseMapper.getFollowList(result);
-        return new PageInfo<>(list);
-
-    }
-
-    @Override
-    public PageInfo<AccountResult> getFanList(AccountResult result,Integer currentPage) {
-        PageHelper.startPage(currentPage,24);
-        List<AccountResult> list = baseMapper.getFanList(result);
-        return new PageInfo<>(list);
-    }
-
     @Override
     public Boolean updateFavorites(AccountResult result) {
         return baseMapper.updateFavorites(result)>0?true:false;

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

@@ -2,13 +2,17 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.lzq.api.pojo.Account;
 import com.lzq.api.service.AccountService;
 import com.lzq.dubboservice.mapper.AccountMapper;
 import org.apache.commons.lang.StringUtils;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @author ：LZQ
  * @description：AccountService实现类
@@ -32,19 +36,10 @@ public void insert(Account account) {
     }
 
     @Override
-    public Boolean update(Account account) throws NullPointerException {
+    public Boolean update(Account account){
         QueryWrapper<Account> wrapper = new QueryWrapper<>();
         //当同时存在时则修改邮箱
-        if (StringUtils.isNotBlank(account.getEmail())
-                && StringUtils.isNotBlank(account.getUsername())){
-            wrapper.eq("username",account.getUsername());
-        }else if (StringUtils.isNotBlank(account.getEmail())){
-            wrapper.eq("email",account.getEmail());
-        }else if (StringUtils.isNotBlank(account.getUsername())){
-            wrapper.eq("username",account.getUsername());
-        }else {
-            throw new NullPointerException();
-        }
+        wrapper.eq("username",account.getUsername());
         return baseMapper.update(account,wrapper)>0?true:false;
     }
 
@@ -109,5 +104,19 @@ public Boolean reduceRecycle(String username) {
         return baseMapper.reduceRecycle(username)>0?true:false;
     }
 
+    @Override
+    public PageInfo<Account> getFollowList(Account result, Integer currentPage) {
+        PageHelper.startPage(currentPage,24);
+        List<Account> list = baseMapper.getFollowList(result);
+        return new PageInfo<>(list);
+
+    }
+
+    @Override
+    public PageInfo<Account> getFanList(Account result,Integer currentPage) {
+        PageHelper.startPage(currentPage,24);
+        List<Account> list = baseMapper.getFanList(result);
+        return new PageInfo<>(list);
+    }
 
 }

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

@@ -2,25 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lzq.dubboservice.mapper.AccountMapper">
 
+    <sql id="Account">
+        a.username, name, user_picture
+    </sql>
 
     <update id="addFavorites">
         update account set favorites=favorites+1 where username=#{username}
     </update>
+
     <update id="updateFavorites">
         update account set favorites=#{favorites} where username=#{username}
     </update>
+
     <update id="addWorks">
         update account set works=works+1 where username=#{username}
     </update>
+
     <update id="reduceWorks">
         update account set works=works-1 where username=#{username}
     </update>
+
     <update id="increaseRecycle">
         update account set recycle=recycle+1 where username=#{username}
     </update>
+
     <update id="reduceRecycle">
         update account set recycle=recycle-1 where username=#{username}
     </update>
+
     <update id="bindGit">
         update account
         <if test=" githubId != '' and githubId != null ">
@@ -31,4 +40,24 @@
         </if>
         where username=#{username}
     </update>
+
+    <select id="getFollowList" resultType="com.lzq.api.pojo.Account">
+        select
+        <include refid="Account"/>
+        from account a left join follow b
+        on
+        a.username=b.follow_username
+        where
+        b.username=#{username}
+    </select>
+
+    <select id="getFanList" resultType="com.lzq.api.pojo.Account">
+        select
+        <include refid="Account"/>
+        from account a left join follow b
+        on
+        a.username=b.username
+        where
+        b.follow_username=#{username}
+    </select>
 </mapper>

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

@@ -76,7 +76,8 @@ public class ExampleController {
     @ApiOperation("创建一个实例")
     public Map<String, Object> CreateFile(Example example, Content exampleContent, String content) {
         log.info("开始"+System.currentTimeMillis());
-        String uuid = UUID.randomUUID().toString().replaceAll("-","");
+        //生成22位uuid
+        String uuid = ExampleUtils.getUUid();
         Boolean bol =false;
         //随机生成uuid
         //判断用户是保存实例还是第一次创建实例

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

@@ -10,7 +10,6 @@
 import com.lzq.web.utils.JWTUtils;
 import com.lzq.web.utils.ResultMapUtils;
 import com.lzq.web.utils.UserUtils;
-import com.lzq.web.utils.VerifyCodeUtils;
 import com.qiniu.util.Auth;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -236,7 +235,7 @@ public Map<String, Object> modifyPossword(HttpServletRequest request, Account ac
     @GetMapping({"/send"})
     @ApiOperation("发送邮箱验证码")
     public Map<String, Object> sendEmail(String email) {
-        String code = VerifyCodeUtils.getCode();
+        String code = UserUtils.getCode();
         Mail mail = new Mail();
         mail.setTo(email);
         mail.setSubject("验证码");
@@ -362,5 +361,9 @@ public Map<String, Object> doLogin(HttpServletRequest request) {
     }
 
 
-
+    @GetMapping("/Test")
+    public Map<String,Object> Test(String username){
+        Account account = accountService.queryByUsername(username);
+        return ResultMapUtils.ResultMap(true,0,account);
+    }
 }