From 067a97bbdb615cc8795e161788a356d3f4ec756d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Aug 2022 11:59:25 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 150 +++++++++++++++++++++++++------------------------
1 files changed, 76 insertions(+), 74 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 73ced4f..f31cef4 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
@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import com.xcong.farmer.cms.common.utils.FileUtils;
@@ -55,8 +56,6 @@
@Autowired
private WebSetMapper webSetMapper;
- 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);
@@ -70,24 +69,23 @@
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, companyId);
- if (column.getParentId() != 0L) {
- releaseColumn(column.getParentId(), 1, companyId);
- }
+ log.info("执行文章发布");
+ cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
- 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.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
@@ -95,6 +93,7 @@
ColumnEntity columnEntity = columnMapper.selectById(id);
Map<String, Object> map = buildColumnData(columnEntity);
+ // 判断栏目是否编辑了栏目编码或者修改了父级栏目
if (columnEntity.getBeforeParentId() != -1 || !"-1".equals(columnEntity.getBeforeColumnCode())) {
CompanyEntity company = companyMapper.selectById(companyId);
if (!"-1".equals(columnEntity.getBeforeColumnCode())) {
@@ -105,7 +104,7 @@
if (columnEntity.getBeforeParentId() != -1) {
ColumnEntity parent = columnMapper.selectById(columnEntity.getBeforeParentId());
- String path = cmsProperties.getOutputPath() + parent.getPath() + "/" + columnEntity.getColumnCode();
+ String path = FileUtils.path(cmsProperties.getOutputPath(), company.getCode()) + parent.getPath() + "/" + columnEntity.getColumnCode();
log.info("删除路径为:{}", path);
FileUtil.del(path);
}
@@ -117,65 +116,64 @@
return;
}
- executor.execute(() -> {
- 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);
- }
+ 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());
- }
+ if (article.getType() == 1) {
+ Map<String, Object> articleMap = new HashMap<>();
+ BeanUtil.copyProperties(map, articleMap);
+ articleMap.put("id", article.getId());
+ cmsCoreService.articleProcess(articleMap, columnEntity.getArticleTemplate(), columnEntity.getPath());
}
}
+ }
- map.put("id", columnEntity.getId());
+ map.put("id", columnEntity.getId());
- 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());
- cmsCoreService.columnProcess(parentMap, parentColumn.getListTemplate());
+ 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());
+ cmsCoreService.columnProcess(parentMap, parentColumn.getListTemplate());
+ }
+
+ releaseIndex(companyId, false);
+
+ if (type != 1) {
+ if (columnEntity.getParentId() == 0L) {
+ List<ColumnEntity> columns = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
+ if (CollUtil.isNotEmpty(columns)) {
+ for (ColumnEntity column : columns) {
+ List<ArticleEntity> articleList = articleMapper.selectArticleByColumnId(column.getId(), companyId, type);
+ if (CollUtil.isNotEmpty(articleList)) {
+ for (ArticleEntity article : articleList) {
+ if (article.getReleaseStatus() == 0) {
+ article.setReleaseStatus(1);
+ articleMapper.updateById(article);
+ }
+
+ if (article.getType() == 1) {
+ Map<String, Object> articleMap = new HashMap<>();
+ BeanUtil.copyProperties(map, articleMap);
+ articleMap.put("id", article.getId());
+ cmsCoreService.articleProcess(articleMap, column.getArticleTemplate(), column.getPath());
+ }
+ }
+ }
+
+ Map<String, Object> data = buildColumnData(column);
+ cmsCoreService.columnProcess(data, column.getListTemplate());
+ }
+ }
}
releaseIndex(companyId, false);
- });
-
- 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) {
- 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());
- }
- }
- }
-
- Map<String, Object> data = buildColumnData(column);
- cmsCoreService.columnProcess(data, column.getListTemplate());
- }
- }
- }
-
- releaseIndex(companyId, false);
- });
-
}
}
@@ -217,10 +215,14 @@
cmsCoreService.indexProcess(map, webSetting.getIndexTemplate());
if (hasSearch) {
- executor.execute(() -> {
- cmsCoreService.process(map, "search", webSetting.getSearchTemplate());
- cmsCoreService.process(map, "message", webSetting.getMsgTemplate());
- });
+ Map<String, Object> search = new HashMap<>();
+ search.put("companyId", companyId);
+
+ Map<String, Object> message = new HashMap<>();
+ message.put("companyId", companyId);
+
+ cmsCoreService.process(search, "search", webSetting.getSearchTemplate());
+ cmsCoreService.process(message, "message", webSetting.getMsgTemplate());
}
}
--
Gitblit v1.9.1