From cf566cbe51e917833f3e4e9820b8656b9c7c6a7c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 11:21:30 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java |   74 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 18 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 85f4e75..a0ac657 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
@@ -22,6 +22,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
+ * @TODO 发布时，index存在重复发布的情况，可优化。用线程notify唤醒。
  * @author wzy
  * @date 2022-07-05
  **/
@@ -38,12 +39,15 @@
     @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());
+
+        article.setBeforeColumnId(null);
+        articleMapper.updateById(article);
 
         Map<String, Object> data = new Hashtable<>();
         data.put("id", article.getId());
@@ -63,17 +67,7 @@
     @Override
     public void releaseColumn(Long id, int type, Long companyId) {
         ColumnEntity columnEntity = columnMapper.selectById(id);
-        Map<String, Object> map = new Hashtable<>();
-        map.put("id", columnEntity.getId());
-        map.put("code", columnEntity.getColumnCode());
-        if (columnEntity.getParentId() == 0L) {
-            map.put("parentCode", columnEntity.getColumnCode());
-        } else {
-            ColumnEntity parent = columnMapper.selectById(columnEntity.getParentId());
-            map.put("parentCode", parent.getColumnCode());
-        }
-        map.put("templatePath", columnEntity.getPath());
-        map.put("companyId", companyId);
+        Map<String, Object> map = buildColumnData(columnEntity);
 
         executor.execute(() -> {
             cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
@@ -86,22 +80,58 @@
                     List<ColumnEntity> columns = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
                     if (CollUtil.isNotEmpty(columns)) {
                         for (ColumnEntity column : columns) {
-                            map.put("id", column.getId());
-                            map.put("code", column.getColumnCode());
-                            cmsCoreService.columnProcess(map, column.getListTemplate());
+                            Map<String, Object> data = buildColumnData(column);
+                            cmsCoreService.columnProcess(data, column.getListTemplate());
 
                             List<Long> ids = articleMapper.selectArticleIdsByColumnId(column.getId(), companyId,type);
-                            cmsCoreService.articlesProcess(map, ids, column.getArticleTemplate(), column.getPath());
+                            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());
+                List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(columnEntity.getId(), companyId, type);
+                if (CollUtil.isNotEmpty(articles)) {
+                    for (ArticleEntity article : articles) {
+                        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) {
+            map.put("parentCode", columnEntity.getColumnCode());
+        } else {
+            ColumnEntity parent = columnMapper.selectById(columnEntity.getParentId());
+            map.put("parentCode", parent.getColumnCode());
+        }
+        map.put("columnTitle", columnEntity.getColumnName());
+        map.put("templatePath", columnEntity.getPath());
+        map.put("companyId", columnEntity.getCompanyId());
+        return map;
     }
 
     @Override
@@ -111,4 +141,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