Merge branch 'master' of 39.106.16.162:/home/git/teaching-backend/teaching-backend

src/main/java/com/teaching/backend/controller/cms/CmsEssayController.java

@@ -87,4 +87,14 @@ public class CmsEssayController {
     public BaseResponse<String> editStatus(@RequestBody CmsEssay cmsEssay){
         return cmsEssayService.editStatus(cmsEssay);
     }
+
+    /**
+     * 浏览量
+     * @param id
+     * @return
+     */
+    @PutMapping("/views/{id}")
+    public BaseResponse<String> views(@PathVariable Integer id){
+        return cmsEssayService.views(id);
+    }
 }

src/main/java/com/teaching/backend/model/entity/cms/CmsEssay.java

@@ -58,6 +58,9 @@ public class CmsEssay implements Serializable {
     @ApiModelProperty(value = "发布文章的用户id")
     private Integer userId;
 
+//    @TableField(exist = false)
+    private String username;
+
     @ApiModelProperty(value = "文章文件")
     private String file;
 

src/main/java/com/teaching/backend/model/entity/favour/SeCourseFavour.java

@@ -31,12 +31,6 @@ public class SeCourseFavour implements Serializable {
      */
     private String userId;
 
-    /**
-     * 创建用户 id
-     */
-    private DateTime createtime;
-
-
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/teaching/backend/service/cms/ICmsEssayService.java

@@ -28,4 +28,6 @@ public interface ICmsEssayService extends IService<CmsEssay> {
     BaseResponse<String> editStatus(CmsEssay cmsEssay);
 
     BaseResponse<CmsEssay> queryEssayById(Integer essayId);
+
+    BaseResponse<String> views(Integer id);
 }

src/main/java/com/teaching/backend/service/impl/cms/CmsEssayServiceImpl.java

@@ -6,9 +6,12 @@ import com.teaching.backend.common.BaseResponse;
 import com.teaching.backend.common.ResultUtils;
 import com.teaching.backend.mapper.cms.CmsEssayMapper;
 import com.teaching.backend.model.entity.cms.CmsEssay;
+import com.teaching.backend.model.entity.umsAdmin.UmsUser;
 import com.teaching.backend.service.cms.ICmsEssayService;
+import com.teaching.backend.service.impl.umsAdmin.UmsUserServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -23,10 +26,18 @@ import java.util.List;
 @Service
 public class CmsEssayServiceImpl extends ServiceImpl<CmsEssayMapper, CmsEssay> implements ICmsEssayService {
 
+    @Resource
+    private UmsUserServiceImpl userService;
+
     @Override
     public BaseResponse<String> addEssay(CmsEssay cmsEssay) {
         //设置文章发布时间
         cmsEssay.setPublishTime(LocalDate.now());
+        //设置发布人姓名
+        String nickName = userService.getById(cmsEssay.getUserId()).getNickName();
+        cmsEssay.setUsername(nickName);
+        //将浏览次数设置为0
+        cmsEssay.setReadingNumber(0);
         //如果数据库里没有文章,文章id设为2
         Long count = query().count();
         if (count == 0){
@@ -48,6 +59,9 @@ public class CmsEssayServiceImpl extends ServiceImpl<CmsEssayMapper, CmsEssay> i
 
     @Override
     public BaseResponse<String> editEssay(CmsEssay cmsEssay) {
+        //设置发布人姓名
+        String nickName = userService.getById(cmsEssay.getUserId()).getNickName();
+        cmsEssay.setUsername(nickName);
         //获取要修改的文章id
         Integer id = cmsEssay.getId();
         //判断文章id是否为1
@@ -80,4 +94,10 @@ public class CmsEssayServiceImpl extends ServiceImpl<CmsEssayMapper, CmsEssay> i
     public BaseResponse<CmsEssay> queryEssayById(Integer essayId) {
         return ResultUtils.success(getById(essayId));
     }
+
+    @Override
+    public BaseResponse<String> views(Integer id) {
+        boolean update = update().setSql("reading_number = reading_number + 1 where id = " + id).update();
+        return update ? ResultUtils.success("浏览次数加1") : ResultUtils.success("error!!!");
+    }
 }

src/main/java/com/teaching/backend/service/impl/favour/SeCourseFavourServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -66,40 +67,41 @@ public class SeCourseFavourServiceImpl extends ServiceImpl<SeCourseFavourMapper,
         System.out.println("进入点赞" + courseId + userId);
         //从数据库中校验是否存在courseid
         Courses courses = coursesMapper.selectById(courseId);
-        boolean result = false;
-        if(courses == null){
-            return ResultUtils.error(ErrorCode.NOT_FOUND_ERROR,"课程不存在");
+
+        if (courses == null) {
+            return ResultUtils.error(ErrorCode.NOT_FOUND_ERROR, "课程不存在");
         }
-        //查询数据库记录，该用户是否点赞
-        SeCourseFavour seCourseFavour = new SeCourseFavour();
-        seCourseFavour.setCourseId(courseId);
-        seCourseFavour.setUserId(userId);
-        seCourseFavour.setCreatetime(DateTime.now());
-        QueryWrapper<SeCourseFavour> favourQueryWrapper = new QueryWrapper<>(seCourseFavour);
-        SeCourseFavour oldSeCourseFavour = this.getOne(favourQueryWrapper);
+
+        LambdaQueryWrapper<SeCourseFavour> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SeCourseFavour::getCourseId, courseId)
+                .eq(SeCourseFavour::getUserId, userId);
+
+        SeCourseFavour oldSeCourseFavour = seCourseFavourMapper.selectOne(lambdaQueryWrapper);
+        System.out.println("查询条件: courseId=" + courseId + ", userId=" + userId);
+        System.out.println("查询结果: " + oldSeCourseFavour);
+
         //已点赞
-        if (oldSeCourseFavour != null) {
-            // 取消点赞 删除记录
-            result = this.remove(favourQueryWrapper);
-            if (result) {
-                System.out.println("取消点赞成功");
-                return ResultUtils.success(result);
+
+        if (oldSeCourseFavour == null) {
+            // 如果没有记录，则添加收藏
+            SeCourseFavour newSeCourseFavour = new SeCourseFavour();
+            newSeCourseFavour.setCourseId(courseId);
+            newSeCourseFavour.setUserId(userId);
+            int insertResult = seCourseFavourMapper.insert(newSeCourseFavour);
+
+            if (insertResult > 0) {
+                return ResultUtils.success(true);
             } else {
-                throw new BusinessException(ErrorCode.SYSTEM_ERROR);
+                return ResultUtils.error(ErrorCode.OPERATION_ERROR);
             }
         } else {
-            // 每个用户串行点赞
-            // 锁必须要包裹住事务方法
-            Lock lock = new ReentrantLock();
-            lock.lock();
-            try {
-                result = this.save(seCourseFavour);
-            } catch (Exception e) {
-                throw new BusinessException(ErrorCode.OPERATION_ERROR);
-            } finally {
-                lock.unlock();
-                System.out.println("点赞成功");
-                return ResultUtils.success(result);
+            // 如果有记录，则删除记录，也就是取消收藏
+            int deleteResult = seCourseFavourMapper.delete(lambdaQueryWrapper);
+
+            if (deleteResult > 0) {
+                return ResultUtils.success(false);
+            } else {
+                return ResultUtils.error(ErrorCode.OPERATION_ERROR);
             }
         }
     }