From 7e6145c0904a36523ef08c3d802614535e1b31eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Aug 2022 11:16:46 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 6 ++----
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 42 ++++++++++++++++++++++--------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
index 979c54a..778210b 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
@@ -161,14 +161,12 @@
if ("column".equals(type)){
Long id = (Long) data.get("id");
ColumnEntity columnEntity = columnMapper.selectById(id);
- data.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
+ globalSetting.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
} else if ("article".equals(type)) {
Long id = (Long) data.get("id");
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity columnEntity = columnMapper.selectById(article.getColumnId());
- data.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
- } else {
- data.put("title", globalSetting.get("title"));
+ globalSetting.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
}
data.putAll(globalSetting);
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 12f45a9..4d243a7 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
@@ -62,31 +62,33 @@
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity column = columnMapper.selectById(article.getColumnId());
- Long beforeColumnId = article.getBeforeColumnId();
- article.setBeforeColumnId(-1L);
- articleMapper.updateById(article);
+ AppContants.EXECUTOR.execute(() -> {
+ 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);
+ Map<String, Object> data = new Hashtable<>();
+ data.put("id", article.getId());
+ data.put("companyId", companyId);
- log.info("执行文章发布");
- cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
+ log.info("执行文章发布");
+ cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
- this.releaseColumn(column.getId(), 1, companyId);
- if (column.getParentId() != 0L) {
- releaseColumn(column.getParentId(), 1, companyId);
- }
-
- if (beforeColumnId != -1 && !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.releaseColumn(column.getId(), 1, companyId);
+ if (column.getParentId() != 0L) {
+ releaseColumn(column.getParentId(), 1, companyId);
}
- }
- this.releaseIndex(companyId, false);
+ if (beforeColumnId != -1 && !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, false);
+ });
}
@Override
--
Gitblit v1.9.1