fix

Helius

2022-07-12 c331c21472fa85fd7b6c7847c82722b6e35cb533

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java

@@ -1,11 +1,18 @@
package com.xcong.farmer.cms.modules.system.service.Impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import com.xcong.farmer.cms.common.utils.FileUtils;
import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
import com.xcong.farmer.cms.modules.system.entity.CompanyEntity;
import com.xcong.farmer.cms.modules.system.entity.WebSettingEntity;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.mapper.CompanyMapper;
import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper;
import com.xcong.farmer.cms.modules.system.service.IReleaseService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import lombok.extern.slf4j.Slf4j;
@@ -22,8 +29,8 @@
import java.util.concurrent.TimeUnit;

/**
 * @TODO 发布时，index存在重复发布的情况，可优化。用线程notify唤醒。
 * @author wzy
 * @TODO 发布时，index存在重复发布的情况，可优化。用线程notify唤醒。
 * @date 2022-07-05
 **/
@Slf4j
@@ -38,6 +45,15 @@

    @Autowired
    private ICmsCoreService cmsCoreService;

    @Autowired
    private CmsProperties cmsProperties;

    @Autowired
    private CompanyMapper companyMapper;

    @Autowired
    private WebSetMapper webSetMapper;

    private final Executor executor = new ThreadPoolExecutor(5, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());

@@ -54,7 +70,7 @@
        data.put("id", article.getId());
        data.put("companyId", companyId);

        executor.execute(()->{
        executor.execute(() -> {
            log.info("执行文章发布");
            cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
            this.releaseColumn(column.getId(), 1, companyId);
@@ -70,7 +86,7 @@
                }
            }

            this.releaseIndex(companyId);
            this.releaseIndex(companyId, false);
        });
    }

@@ -79,10 +95,55 @@
        ColumnEntity columnEntity = columnMapper.selectById(id);
        Map<String, Object> map = buildColumnData(columnEntity);

        map.put("releaseType", type);
        if (columnEntity.getBeforeParentId() != -1 || !"-1".equals(columnEntity.getBeforeColumnCode())) {
            CompanyEntity company = companyMapper.selectById(companyId);
            if (!"-1".equals(columnEntity.getBeforeColumnCode())) {
                String outputPath = FileUtils.path(cmsProperties.getOutputPath(), company.getCode()) + "/" + columnEntity.getBeforeColumnCode();
                log.info("删除路径为:{}", outputPath);
                FileUtil.del(outputPath);
            }

            if (columnEntity.getBeforeParentId() != -1) {
                ColumnEntity parent = columnMapper.selectById(columnEntity.getBeforeParentId());
                String path = cmsProperties.getOutputPath() + parent.getPath() + "/" + columnEntity.getColumnCode();
                log.info("删除路径为:{}", path);
                FileUtil.del(path);
            }

            columnEntity.setBeforeColumnCode("-1");
            columnEntity.setBeforeParentId(-1L);
            columnMapper.updateById(columnEntity);
            releaseAll(companyId);
            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);
                    }

                    if (article.getType() == 1) {
                        map.put("id", article.getId());
                        cmsCoreService.articleProcess(map, columnEntity.getArticleTemplate(), columnEntity.getPath());
                    }
                }
            }

            map.put("id", columnEntity.getId());

            cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
            releaseIndex(companyId);
            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) {
@@ -91,10 +152,7 @@
                    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(columnEntity.getId(), companyId, type);
                            List<ArticleEntity> articles = articleMapper.selectArticleByColumnId(column.getId(), companyId, type);
                            if (CollUtil.isNotEmpty(articles)) {
                                for (ArticleEntity article : articles) {
                                    if (article.getReleaseStatus() == 0) {
@@ -104,30 +162,18 @@

                                    if (article.getType() == 1) {
                                        map.put("id", article.getId());
                                        cmsCoreService.articleProcess(map, columnEntity.getArticleTemplate(), columnEntity.getPath());
                                        cmsCoreService.articleProcess(map, column.getArticleTemplate(), column.getPath());
                                    }
                                }
                            }

                            Map<String, Object> data = buildColumnData(column);
                            cmsCoreService.columnProcess(data, column.getListTemplate());
                        }
                    }
                }

                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);
                releaseIndex(companyId, false);
            });

        }
@@ -163,11 +209,19 @@
    }

    @Override
    public void releaseIndex(Long companyId) {
    public void releaseIndex(Long companyId, boolean hasSearch) {
        Map<String, Object> map = new HashMap<>();
        map.put("companyId", companyId);

        cmsCoreService.indexProcess(map, null);
        WebSettingEntity webSetting = webSetMapper.selectByCompanyId(companyId);

        cmsCoreService.indexProcess(map, webSetting.getIndexTemplate());
        if (hasSearch) {
            executor.execute(() -> {
                cmsCoreService.process(map, "search", webSetting.getSearchTemplate());
                cmsCoreService.process(map, "message", webSetting.getMsgTemplate());
            });
        }
    }

    @Override
@@ -176,5 +230,6 @@
        map.put("companyId", companyId);

        releaseColumns(4, companyId);
        releaseIndex(companyId, true);
    }
}