From 9b51a62597487073b54aa27cdd059828ebfcb2ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 19:19:47 +0800
Subject: [PATCH] 加synchronized
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 83 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index ae44d80..58513fb 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
@@ -40,30 +41,60 @@
private final Executor executor = new ThreadPoolExecutor(5, 10, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@Override
- public void releaseArticle(Long id) {
- Long companyId = LoginUserUtil.getCompanyId();
+ public void releaseArticle(Long id, Long companyId) {
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity column = columnMapper.selectById(article.getColumnId());
- Map<String, Object> data = new HashMap<>();
+ Map<String, Object> data = new Hashtable<>();
data.put("id", article.getId());
data.put("companyId", companyId);
executor.execute(()->{
+ log.info("执行文章发布");
cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
- this.releaseColumn(column.getId(), 1);
+ this.releaseColumn(column.getId(), 1, companyId);
if (column.getParentId() != 0L) {
- releaseColumn(column.getParentId(), 1);
+ releaseColumn(column.getParentId(), 1, companyId);
}
- this.releaseIndex();
+ this.releaseIndex(companyId);
});
}
@Override
- public void releaseColumn(Long id, int type) {
- Long companyId = LoginUserUtil.getCompanyId();
+ public void releaseColumn(Long id, int type, Long companyId) {
ColumnEntity columnEntity = columnMapper.selectById(id);
- Map<String, Object> map = new HashMap<>();
+ Map<String, Object> map = buildColumnData(columnEntity);
+
+ executor.execute(() -> {
+ cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
+ releaseIndex(companyId);
+ });
+
+ if (type != 1) {
+ executor.execute(() -> {
+ if (columnEntity.getParentId() == 0L) {
+ List<ColumnEntity> columns = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
+ if (CollUtil.isNotEmpty(columns)) {
+ for (ColumnEntity column : columns) {
+ Map<String, Object> data = buildColumnData(column);
+ cmsCoreService.columnProcess(data, column.getListTemplate());
+
+ List<Long> ids = articleMapper.selectArticleIdsByColumnId(column.getId(), companyId,type);
+ cmsCoreService.articlesProcess(data, ids, column.getArticleTemplate(), column.getPath());
+ }
+ }
+ }
+
+ List<Long> ids = articleMapper.selectArticleIdsByColumnId(columnEntity.getId(), companyId, type);
+ cmsCoreService.articlesProcess(map, ids, columnEntity.getArticleTemplate(), columnEntity.getPath());
+
+ releaseIndex(companyId);
+ });
+ }
+ }
+
+ private Map<String, Object> buildColumnData(ColumnEntity columnEntity) {
+ Map<String, Object> map = new Hashtable<>();
map.put("id", columnEntity.getId());
map.put("code", columnEntity.getColumnCode());
if (columnEntity.getParentId() == 0L) {
@@ -72,41 +103,15 @@
ColumnEntity parent = columnMapper.selectById(columnEntity.getParentId());
map.put("parentCode", parent.getColumnCode());
}
+ map.put("columnTitle", columnEntity.getColumnName());
map.put("templatePath", columnEntity.getPath());
- map.put("companyId", companyId);
-
- if (type != 1) {
- executor.execute(() -> {
- if (columnEntity.getParentId() == 0L) {
- List<ColumnEntity> columns = columnMapper.selectColumnByParentId(columnEntity.getParentId(), companyId);
- if (CollUtil.isNotEmpty(columns)) {
- for (ColumnEntity column : columns) {
- map.put("id", column.getId());
- cmsCoreService.columnProcess(map, column.getListTemplate());
-
- List<Long> ids = articleMapper.selectArticleIdsByColumnId(column.getId(), companyId,type);
- cmsCoreService.articlesProcess(map, ids, column.getArticleTemplate(), column.getPath());
- }
- }
- }
-
- List<Long> ids = articleMapper.selectArticleIdsByColumnId(columnEntity.getId(), companyId, type);
- cmsCoreService.articlesProcess(map, ids, columnEntity.getArticleTemplate(), columnEntity.getPath());
-
- releaseIndex();
- });
-
- executor.execute(() -> {
- cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
- releaseIndex();
- });
- }
+ map.put("companyId", columnEntity.getCompanyId());
+ return map;
}
@Override
- public void releaseIndex() {
+ public void releaseIndex(Long companyId) {
Map<String, Object> map = new HashMap<>();
- Long companyId = LoginUserUtil.getCompanyId();
map.put("companyId", companyId);
cmsCoreService.indexProcess(map, null);
--
Gitblit v1.9.1