From 1ef4e7a2787b284c950923f4b4bf28a80079e99f Mon Sep 17 00:00:00 2001
From: linfeng <2445465217@qq.com>
Date: Wed, 14 Dec 2022 10:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/AppUserController.java   |  3 ++-
 .../impl/CommentThumbsServiceImpl.java        | 21 ++++++++++++++++++-
 .../app/service/impl/FollowServiceImpl.java   | 19 ++++++++---------
 .../impl/PostCollectionServiceImpl.java       |  5 +++--
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/linfeng/modules/admin/controller/AppUserController.java b/src/main/java/io/linfeng/modules/admin/controller/AppUserController.java
index 177cb2a..4fb2594 100644
--- a/src/main/java/io/linfeng/modules/admin/controller/AppUserController.java
+++ b/src/main/java/io/linfeng/modules/admin/controller/AppUserController.java
@@ -8,7 +8,8 @@
  * Copyright (c) 2021-2023 linfeng all rights reserved.
  * 版权所有 ，侵权必究！
  * -----------------------------------
- */package io.linfeng.modules.admin.controller;
+ */
+package io.linfeng.modules.admin.controller;
 
 import java.util.Arrays;
 import java.util.Map;
diff --git a/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java b/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java
index a50e13b..52f6a33 100644
--- a/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java
+++ b/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java
@@ -46,6 +46,12 @@ public class CommentThumbsServiceImpl extends ServiceImpl<CommentThumbsDao, Comm
         return new PageUtils(page);
     }
 
+    /**
+     * 是否点赞
+     * @param uid
+     * @param id
+     * @return
+     */
     @Override
     public Boolean isThumbs(Integer uid, Long id) {
         CommentThumbsEntity one = baseMapper.selectOne(new LambdaQueryWrapper<CommentThumbsEntity>()
@@ -62,6 +68,11 @@ public class CommentThumbsServiceImpl extends ServiceImpl<CommentThumbsDao, Comm
                 .count();
     }
 
+    /**
+     * 点赞
+     * @param request
+     * @param user
+     */
     @Override
     public void addThumbs(AddThumbsForm request, AppUserEntity user) {
         CommentThumbsEntity one=baseMapper.selectOne(new LambdaQueryWrapper<CommentThumbsEntity>()
@@ -74,9 +85,17 @@ public class CommentThumbsServiceImpl extends ServiceImpl<CommentThumbsDao, Comm
         ct.setUid(user.getUid());
         ct.setCId(request.getId());
         ct.setCreateTime(DateUtil.nowDateTime());
-        this.save(ct);
+        boolean save = this.save(ct);
+        if(!save){
+            throw new LinfengException("点赞失败");
+        }
     }
 
+    /**
+     * 取消点赞
+     * @param request
+     * @param user
+     */
     @Override
     public void cancelThumbs(AddThumbsForm request, AppUserEntity user) {
         baseMapper.delete(new LambdaQueryWrapper<CommentThumbsEntity>()
diff --git a/src/main/java/io/linfeng/modules/app/service/impl/FollowServiceImpl.java b/src/main/java/io/linfeng/modules/app/service/impl/FollowServiceImpl.java
index 5b74481..83e33a7 100644
--- a/src/main/java/io/linfeng/modules/app/service/impl/FollowServiceImpl.java
+++ b/src/main/java/io/linfeng/modules/app/service/impl/FollowServiceImpl.java
@@ -64,8 +64,7 @@ public class FollowServiceImpl extends ServiceImpl<FollowDao, FollowEntity> impl
         LambdaQueryWrapper<FollowEntity> queryWrapper= Wrappers.lambdaQuery();
         queryWrapper.eq(FollowEntity::getUid,uid);
         queryWrapper.eq(FollowEntity::getFollowUid,id);
-        Integer num = baseMapper.selectCount(queryWrapper);
-        return num!=0;
+        return baseMapper.selectCount(queryWrapper) != 0;
     }
 
     @Override
@@ -79,15 +78,13 @@ public class FollowServiceImpl extends ServiceImpl<FollowDao, FollowEntity> impl
         LambdaQueryWrapper<FollowEntity> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(FollowEntity::getUid, uid);
         lambdaQueryWrapper.eq(FollowEntity::getFollowUid, followUid);
-        Integer num = baseMapper.selectCount(lambdaQueryWrapper);
-        if(num == 0){
+        if(baseMapper.selectCount(lambdaQueryWrapper) == 0){
             return 0;
         }
-        LambdaQueryWrapper<FollowEntity> lambdaQueryWrapper2 = Wrappers.lambdaQuery();
-        lambdaQueryWrapper2.eq(FollowEntity::getUid, followUid);
-        lambdaQueryWrapper2.eq(FollowEntity::getFollowUid, uid);
-        Integer num2 = baseMapper.selectCount(lambdaQueryWrapper2);
-        return num2==0?2:1;
+        LambdaQueryWrapper<FollowEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(FollowEntity::getUid, followUid);
+        wrapper.eq(FollowEntity::getFollowUid, uid);
+        return baseMapper.selectCount(wrapper) == 0 ? 2 : 1;
     }
 
     @Override
@@ -104,7 +101,9 @@ public class FollowServiceImpl extends ServiceImpl<FollowDao, FollowEntity> impl
 
     @Override
     public List<Integer> getFollowUids(AppUserEntity user) {
-        List<FollowEntity> list = this.lambdaQuery().eq(FollowEntity::getUid, user.getUid()).list();
+        List<FollowEntity> list = this.lambdaQuery()
+                .eq(FollowEntity::getUid, user.getUid())
+                .list();
         return list.stream().map(FollowEntity::getFollowUid).collect(Collectors.toList());
     }
 
diff --git a/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java b/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java
index f0d7fc6..ccb23d2 100644
--- a/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java
+++ b/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java
@@ -48,8 +48,9 @@ public class PostCollectionServiceImpl extends ServiceImpl<PostCollectionDao, Po
     @Override
     public Integer collectCount(Integer postId) {
 
-        return baseMapper.selectCount(new LambdaQueryWrapper<PostCollectionEntity>()
-                .eq(PostCollectionEntity::getPostId, postId));
+        return this.lambdaQuery()
+                .eq(PostCollectionEntity::getPostId,postId)
+                .count();
     }
 
     @Override