peihaoyu/forest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #135 from ronger-x/master

Browse Source 
🎨 代码优化
This commit is contained in:
ronger 2023-05-13 09:53:45 +08:00 committed by GitHub
commit 02c809f2d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/rymcu/forest/handler/AccountHandler.java
View File

@ -3,10 +3,8 @@ package com.rymcu.forest.handler;
import com.rymcu.forest.handler.event.AccountEvent;
import com.rymcu.forest.mapper.UserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.event.TransactionalEventListener;
import javax.annotation.Resource;
@ -24,9 +22,7 @@ public class AccountHandler {
@Resource
private UserMapper userMapper;
@Async("taskExecutor")
@EventListener
@Transactional(rollbackFor = Exception.class)
@TransactionalEventListener
public void processAccountLastOnlineTimeEvent(AccountEvent accountEvent) {
userMapper.updateLastOnlineTimeByAccount(accountEvent.getAccount());
}

17
src/main/java/com/rymcu/forest/handler/ArticleHandler.java
View File

@ -7,10 +7,8 @@ import com.rymcu.forest.handler.event.ArticleEvent;
import com.rymcu.forest.lucene.service.LuceneService;
import com.rymcu.forest.util.NotificationUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.event.TransactionalEventListener;
import javax.annotation.Resource;
@ -26,11 +24,8 @@ public class ArticleHandler {
@Resource
private LuceneService luceneService;
@EventListener
@Async("taskExecutor")
@Transactional(rollbackFor = Exception.class)
public void processArticlePostEvent(ArticleEvent articleEvent) throws InterruptedException {
Thread.sleep(1000);
@TransactionalEventListener
public void processArticlePostEvent(ArticleEvent articleEvent) {
log.info(String.format("执行文章发布相关事件：[%s]", JSON.toJSONString(articleEvent)));
// 发送系统通知
if (articleEvent.getNotification()) {
@ -57,10 +52,8 @@ public class ArticleHandler {
log.info("执行完成文章发布相关事件...id={}", articleEvent.getIdArticle());
}
@EventListener
@Async("taskExecutor")
public void processArticleDeleteEvent(ArticleDeleteEvent articleDeleteEvent) throws InterruptedException {
Thread.sleep(1000);
@TransactionalEventListener
public void processArticleDeleteEvent(ArticleDeleteEvent articleDeleteEvent) {
log.info(String.format("执行文章删除相关事件：[%s]", JSON.toJSONString(articleDeleteEvent)));
luceneService.deleteArticle(articleDeleteEvent.getIdArticle());
log.info("执行完成文章删除相关事件...id={}", articleDeleteEvent.getIdArticle());

11
src/main/java/com/rymcu/forest/handler/CommentHandler.java
View File

@ -8,12 +8,11 @@ import com.rymcu.forest.mapper.CommentMapper;
import com.rymcu.forest.util.Html2TextUtil;
import com.rymcu.forest.util.NotificationUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.event.TransactionalEventListener;
import javax.annotation.Resource;
import javax.mail.MessagingException;
/**
* Created on 2022/8/17 7:38.
@ -30,10 +29,8 @@ public class CommentHandler {
@Resource
private CommentMapper commentMapper;
@Async("taskExecutor")
@EventListener
@Transactional(rollbackFor = Exception.class)
public void processCommentCreatedEvent(CommentEvent commentEvent) {
@TransactionalEventListener
public void processCommentCreatedEvent(CommentEvent commentEvent) throws MessagingException {
log.info(String.format("开始执行评论发布事件：[%s]", JSON.toJSONString(commentEvent)));
String commentContent = commentEvent.getContent();
int length = commentContent.length();

13
src/main/java/com/rymcu/forest/handler/FollowHandler.java
View File

@ -5,10 +5,10 @@ import com.rymcu.forest.core.constant.NotificationConstant;
import com.rymcu.forest.handler.event.FollowEvent;
import com.rymcu.forest.util.NotificationUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.event.TransactionalEventListener;
import javax.mail.MessagingException;
/**
* Created on 2023/4/28 16:07.
@ -20,11 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
@Slf4j
@Component
public class FollowHandler {
@Async("taskExecutor")
@EventListener
@Transactional(rollbackFor = Exception.class)
public void processFollowEvent(FollowEvent followEvent) throws InterruptedException {
Thread.sleep(1000);
@TransactionalEventListener
public void processFollowEvent(FollowEvent followEvent) throws MessagingException {
log.info(String.format("执行关注相关事件: [%s]", JSON.toJSONString(followEvent)));
// 发送系统通知
NotificationUtils.saveNotification(followEvent.getFollowingId(), followEvent.getIdFollow(), NotificationConstant.Follow, followEvent.getSummary());

95
src/main/java/com/rymcu/forest/util/NotificationUtils.java
View File

@ -10,9 +10,9 @@ import com.rymcu.forest.entity.Notification;
import com.rymcu.forest.entity.User;
import com.rymcu.forest.service.*;
import javax.mail.MessagingException;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.*;
/**
* 消息通知工具类
@ -21,75 +21,56 @@ import java.util.concurrent.*;
*/
public class NotificationUtils {
private static NotificationService notificationService = SpringContextHolder.getBean(NotificationService.class);
private static UserService userService = SpringContextHolder.getBean(UserService.class);
private static FollowService followService = SpringContextHolder.getBean(FollowService.class);
private static JavaMailService mailService = SpringContextHolder.getBean(JavaMailService.class);
private static ArticleService articleService = SpringContextHolder.getBean(ArticleService.class);
private static CommentService commentService = SpringContextHolder.getBean(CommentService.class);
private static final NotificationService notificationService = SpringContextHolder.getBean(NotificationService.class);
private static final UserService userService = SpringContextHolder.getBean(UserService.class);
private static final FollowService followService = SpringContextHolder.getBean(FollowService.class);
private static final JavaMailService mailService = SpringContextHolder.getBean(JavaMailService.class);
private static final ArticleService articleService = SpringContextHolder.getBean(ArticleService.class);
private static final CommentService commentService = SpringContextHolder.getBean(CommentService.class);
public static void sendAnnouncement(Long dataId, String dataType, String dataSummary) {
ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
CompletableFuture.supplyAsync(() -> {
List<User> users = userService.findAll();
users.forEach(user -> {
try {
List<User> users = userService.findAll();
users.forEach(user -> {
saveNotification(user.getIdUser(), dataId, dataType, dataSummary);
});
} catch (Exception ex) {
ex.printStackTrace();
saveNotification(user.getIdUser(), dataId, dataType, dataSummary);
} catch (MessagingException e) {
throw new RuntimeException(e);
}
return 0;
}, executor);
});
}
public static void saveNotification(Long idUser, Long dataId, String dataType, String dataSummary) {
ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
CompletableFuture.supplyAsync(() -> {
try {
Notification notification = notificationService.findNotification(idUser, dataId, dataType);
if (notification == null || NotificationConstant.UpdateArticle.equals(dataType)) {
System.out.println("------------------- 开始执行消息通知 ------------------");
Integer result = notificationService.save(idUser, dataId, dataType, dataSummary);
if (result == 0) {
// TODO 记录操作失败数据
}
}
if (NotificationConstant.Comment.equals(dataType)) {
notification = notificationService.findNotification(idUser, dataId, dataType);
NotificationDTO notificationDTO = genNotification(notification);
mailService.sendNotification(notificationDTO);
}
} catch (Exception ex) {
public static void saveNotification(Long idUser, Long dataId, String dataType, String dataSummary) throws MessagingException {
Notification notification = notificationService.findNotification(idUser, dataId, dataType);
if (notification == null || NotificationConstant.UpdateArticle.equals(dataType)) {
System.out.println("------------------- 开始执行消息通知 ------------------");
Integer result = notificationService.save(idUser, dataId, dataType, dataSummary);
if (result == 0) {
// TODO 记录操作失败数据
ex.printStackTrace();
}
return 0;
}, executor);
}
if (NotificationConstant.Comment.equals(dataType)) {
notification = notificationService.findNotification(idUser, dataId, dataType);
NotificationDTO notificationDTO = genNotification(notification);
mailService.sendNotification(notificationDTO);
}
}
public static void sendArticlePush(Long dataId, String dataType, String dataSummary, Long articleAuthorId) {
ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
CompletableFuture.supplyAsync(() -> {
List<Follow> follows;
if (NotificationConstant.PostArticle.equals(dataType)) {
// 关注用户通知
follows = followService.findByFollowingId("0", articleAuthorId);
} else {
// 关注文章通知
follows = followService.findByFollowingId("3", articleAuthorId);
}
follows.forEach(follow -> {
try {
List<Follow> follows;
if (NotificationConstant.PostArticle.equals(dataType)) {
// 关注用户通知
follows = followService.findByFollowingId("0", articleAuthorId);
} else {
// 关注文章通知
follows = followService.findByFollowingId("3", articleAuthorId);
}
follows.forEach(follow -> {
saveNotification(follow.getFollowerId(), dataId, dataType, dataSummary);
});
} catch (Exception ex) {
ex.printStackTrace();
saveNotification(follow.getFollowerId(), dataId, dataType, dataSummary);
} catch (MessagingException e) {
throw new RuntimeException(e);
}
return 0;
}, executor);
});
}
public static NotificationDTO genNotification(Notification notification) {

6
src/test/java/com/rymcu/forest/service/TagServiceTest.java
View File

@ -118,7 +118,7 @@ class TagServiceTest extends BaseServiceTest {
@DisplayName("添加/更新标签")
void saveTag() throws Exception {
List<LabelModel> tagLabels = tagService.findTagLabels();
assertEquals(1, tagLabels.size());
assertNotNull(tagLabels);
Tag tag = new Tag();
tag.setTagDescription("test1");
@ -130,7 +130,7 @@ class TagServiceTest extends BaseServiceTest {
assertNotNull(tag1.getIdTag());
tagLabels = tagService.findTagLabels();
assertEquals(1, tagLabels.size());
assertNotNull(tagLabels);
tag.setIdTag(null);
assertThrows(BusinessException.class, () -> tagService.saveTag(tag));
@ -142,4 +142,4 @@ class TagServiceTest extends BaseServiceTest {
List<LabelModel> tagLabels = tagService.findTagLabels();
assertFalse(tagLabels.isEmpty());
}
}
}