From 0ecfecd2b85b71884fcfba8fa6849be963e434fd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 16:47:53 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 138 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 31 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 c26a72b..a375da5 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;
@@ -21,6 +22,7 @@
import java.util.concurrent.TimeUnit;
/**
+ * @TODO 发布时，index存在重复发布的情况，可优化。用线程notify唤醒。
* @author wzy
* @date 2022-07-05
**/
@@ -37,14 +39,18 @@
@Autowired
private ICmsCoreService cmsCoreService;
- private final Executor executor = new ThreadPoolExecutor(5, 10, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+ private final Executor executor = new ThreadPoolExecutor(5, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@Override
public void releaseArticle(Long id, Long companyId) {
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity column = columnMapper.selectById(article.getColumnId());
- Map<String, Object> data = new HashMap<>();
+ Long beforeColumnId = article.getBeforeColumnId();
+ article.setBeforeColumnId(-1L);
+ articleMapper.updateById(article);
+
+ Map<String, Object> data = new Hashtable<>();
data.put("id", article.getId());
data.put("companyId", companyId);
@@ -55,6 +61,15 @@
if (column.getParentId() != 0L) {
releaseColumn(column.getParentId(), 1, companyId);
}
+
+ if (beforeColumnId != null && !article.getColumnId().equals(beforeColumnId)) {
+ ColumnEntity beforeColumn = columnMapper.selectById(beforeColumnId);
+ this.releaseColumn(beforeColumnId, 1, companyId);
+ if (beforeColumn.getParentId() != 0L) {
+ this.releaseColumn(beforeColumn.getParentId(), 1, companyId);
+ }
+ }
+
this.releaseIndex(companyId);
});
}
@@ -62,7 +77,85 @@
@Override
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);
+
+ map.put("releaseType", type);
+ executor.execute(() -> {
+ cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
+ if (columnEntity.getParentId() != 0L) {
+ ColumnEntity parentColumn = columnMapper.selectById(columnEntity.getParentId());
+ Map<String, Object> parentMap = buildColumnData(parentColumn);
+ parentMap.put("id", parentColumn.getId());
+ parentMap.put("releaseType", type);
+ cmsCoreService.columnProcess(parentMap, parentColumn.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<ArticleEntity> articles = articleMapper.selectArticleByColumnId(column.getId(), companyId, type);
+// if (CollUtil.isNotEmpty(articles)) {
+// for (ArticleEntity article : articles) {
+// if (article.getReleaseStatus() == 0) {
+// article.setReleaseStatus(1);
+// articleMapper.updateById(article);
+// }
+//
+// if (article.getType() == 1) {
+// map.put("id", article.getId());
+// cmsCoreService.articleProcess(map, column.getArticleTemplate(), column.getPath());
+// }
+// }
+// }
+// }
+// }
+// }
+//
+// List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(columnEntity.getId(), companyId, type);
+// if (CollUtil.isNotEmpty(articles)) {
+// for (ArticleEntity article : articles) {
+// if (article.getReleaseStatus() == 0) {
+// article.setReleaseStatus(1);
+// articleMapper.updateById(article);
+// }
+//
+// if (article.getType() == 1) {
+// map.put("id", article.getId());
+// cmsCoreService.articleProcess(map, columnEntity.getArticleTemplate(), columnEntity.getPath());
+// }
+// }
+// }
+//
+// releaseIndex(companyId);
+// });
+//
+// }
+ }
+
+ @Override
+ public void releaseColumns(int type, Long companyId) {
+ List<ColumnEntity> columns = columnMapper.selectColumnByParentId(0L, companyId, 2);
+
+ if (CollUtil.isEmpty(columns)) {
+ return;
+ }
+
+ for (ColumnEntity column : columns) {
+ releaseColumn(column.getId(), type, 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) {
@@ -71,35 +164,10 @@
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);
-
- 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.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(companyId);
- });
- }
+ map.put("companyId", columnEntity.getCompanyId());
+ return map;
}
@Override
@@ -109,4 +177,12 @@
cmsCoreService.indexProcess(map, null);
}
+
+ @Override
+ public void releaseAll(Long companyId) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("companyId", companyId);
+
+ releaseColumns(4, companyId);
+ }
}
--
Gitblit v1.9.1