fix:视频课审核理由null

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/service/impl/BbsArticleServiceImpl.java

@@ -5,29 +5,31 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.common.enums.SysUserType;
+import com.yonge.cooleshow.bbs.dao.BbsArticleDao;
 import com.yonge.cooleshow.bbs.dao.BbsAuthRecordDao;
+import com.yonge.cooleshow.bbs.dto.search.BbsArticleSearch;
 import com.yonge.cooleshow.bbs.dto.search.BbsReplySearch;
+import com.yonge.cooleshow.bbs.entity.BbsArticle;
 import com.yonge.cooleshow.bbs.entity.BbsAuthRecord;
 import com.yonge.cooleshow.bbs.enums.ArticleEnum;
 import com.yonge.cooleshow.bbs.enums.YesOrNoEnum;
+import com.yonge.cooleshow.bbs.service.BbsArticleService;
+import com.yonge.cooleshow.bbs.vo.BbsArticleVo;
 import com.yonge.cooleshow.bbs.vo.BbsReplyVo;
+import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.toolset.base.exception.BizException;
-import javafx.scene.Parent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.bbs.entity.BbsArticle;
-import com.yonge.cooleshow.bbs.vo.BbsArticleVo;
-import com.yonge.cooleshow.bbs.dto.search.BbsArticleSearch;
-import com.yonge.cooleshow.bbs.dao.BbsArticleDao;
-import com.yonge.cooleshow.bbs.service.BbsArticleService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/service/impl/BbsLikeServiceImpl.java

@@ -11,8 +11,12 @@ import com.yonge.cooleshow.bbs.vo.BbsLikeVo;
 import com.yonge.cooleshow.bbs.dto.search.BbsLikeSearch;
 import com.yonge.cooleshow.bbs.dao.BbsLikeDao;
 import com.yonge.cooleshow.bbs.service.BbsLikeService;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class BbsLikeServiceImpl extends ServiceImpl<BbsLikeDao, BbsLike> implements BbsLikeService {
@@ -39,13 +43,27 @@ public class BbsLikeServiceImpl extends ServiceImpl<BbsLikeDao, BbsLike> impleme
      */
     @Override
     public void dolike(Long articleId, Long userId) {
-        String key = LIKE + articleId;
-        Boolean isLike = redisTemplate.opsForSet().isMember(key, userId);
+        // String key = LIKE + articleId;
+        // Boolean isLike = redisTemplate.opsForSet().isMember(key, userId);
+        //
+        // if (isLike) {
+        //     redisTemplate.opsForSet().remove(key, userId);
+        // } else {
+        //     redisTemplate.opsForSet().add(key, userId);
+        // }
 
-        if (isLike) {
-            redisTemplate.opsForSet().remove(key, userId);
+        List<BbsLike> list = this.lambdaQuery()
+                                 .eq(BbsLike::getArticleId, articleId)
+                                 .eq(BbsLike::getLikeUserId, userId)
+                                 .list();
+        if (CollectionUtils.isEmpty(list)) {
+            BbsLike bbsLike = new BbsLike();
+            bbsLike.setLikeUserId(userId);
+            bbsLike.setArticleId(articleId);
+            bbsLike.setCreatedTime(new Date());
+            this.save(bbsLike);
         } else {
-            redisTemplate.opsForSet().add(key, userId);
+            this.removeByIds(list.stream().map(BbsLike::getId).collect(Collectors.toList()));
         }
     }
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/service/impl/BbsPrivateMessageServiceImpl.java

@@ -2,17 +2,17 @@ package com.yonge.cooleshow.bbs.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.bbs.dto.BbsPrivateMessageDto;
+import com.yonge.cooleshow.bbs.dao.BbsPrivateMessageDao;
 import com.yonge.cooleshow.bbs.dto.MessageReadDto;
 import com.yonge.cooleshow.bbs.dto.PrivateMessagePersonVo;
-import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
-import com.yonge.cooleshow.bbs.vo.BbsPrivateMessageVo;
 import com.yonge.cooleshow.bbs.dto.search.BbsPrivateMessageSearch;
-import com.yonge.cooleshow.bbs.dao.BbsPrivateMessageDao;
+import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
 import com.yonge.cooleshow.bbs.service.BbsPrivateMessageService;
+import com.yonge.cooleshow.bbs.vo.BbsPrivateMessageVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -37,6 +37,7 @@ public class BbsPrivateMessageServiceImpl extends ServiceImpl<BbsPrivateMessageD
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean read(MessageReadDto readDto) {
         return baseMapper.read(readDto) ;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
@@ -132,8 +133,12 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             }
         } else {
             try {
+                String remark = "无";
+                if (StringUtils.isEmpty(examineVo.getRemarks())) {
+                    remark = examineVo.getRemarks();
+                }
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.VIDEO_SHEET_AUTH_UNPASS,
-                        receivers, null, 0, null, ClientEnum.TEACHER.getCode(),lessonGroup.getLessonName(),examineVo.getRemarks());
+                        receivers, null, 0, null, ClientEnum.TEACHER.getCode(),lessonGroup.getLessonName(),remark);
             }catch (Exception e){
                 log.warn("视频课审核失败，{}",e.getMessage());
             }