fix:execute in thread

Helius

2022-08-09 1789de3365e7074f864b975a26c64aaf168b271a

fix:execute in thread

 src/main/java/com/xcong/farmer/cms/common/contants/AppContants.java

@@ -1,5 +1,10 @@
package com.xcong.farmer.cms.common.contants;

import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

/**
 * @author wzy
 * @date 2020-05-12
@@ -28,5 +33,7 @@

    public static final String PICTURE_PATH = "D:\\Tools\\";

    public static final Executor EXECUTOR = new ThreadPoolExecutor(10, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());


}

 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java

@@ -2,6 +2,7 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.core.template.TemplateConfiguration;
import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper;
@@ -32,7 +33,7 @@
    @Autowired
    private WebSetMapper webSetMapper;

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


    @Override
@@ -47,7 +48,7 @@

        try {
            String finalTemplateName = templateName;
            executor.execute(() -> {
            AppContants.EXECUTOR.execute(() -> {
                cfg.process(data, finalTemplateName);
            });
        } catch (Exception e) {
@@ -91,7 +92,7 @@

        try {
            String finalTemplateName = templateName;
            executor.execute(() -> {
            AppContants.EXECUTOR.execute(() -> {
                cfg.process(data, finalTemplateName);
            });
        } catch (Exception e) {
@@ -110,7 +111,7 @@

        try {
            String finalTemplateName = templateName;
            executor.execute(() -> {
            AppContants.EXECUTOR.execute(() -> {
                cfg.process(data, finalTemplateName);
            });
        } catch (Exception e) {
@@ -134,7 +135,7 @@

        try {
            String finalTemplateName = templateName;
            executor.execute(() -> {
            AppContants.EXECUTOR.execute(() -> {
                cfg.process(data, finalTemplateName);
            });
        } catch (Exception e) {

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

@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import com.xcong.farmer.cms.common.contants.AppContants;
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;
@@ -91,90 +92,93 @@
    @Override
    public void releaseColumn(Long id, int type, Long companyId) {
        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())) {
                String outputPath = FileUtils.path(cmsProperties.getOutputPath(), company.getCode()) + "/" + columnEntity.getBeforeColumnCode();
                log.info("删除路径为:{}", outputPath);
                FileUtil.del(outputPath);
            }
        AppContants.EXECUTOR.execute(() -> {
            Map<String, Object> map = buildColumnData(columnEntity);

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

            columnEntity.setBeforeColumnCode("-1");
            columnEntity.setBeforeParentId(-1L);
            columnMapper.updateById(columnEntity);
            releaseAll(companyId);
            return;
        }

        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 (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 (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());
                if (columnEntity.getBeforeParentId() != -1) {
                    ColumnEntity parent = columnMapper.selectById(columnEntity.getBeforeParentId());
                    String path = FileUtils.path(cmsProperties.getOutputPath(), company.getCode()) + parent.getPath() + "/" + columnEntity.getColumnCode();
                    log.info("删除路径为:{}", path);
                    FileUtil.del(path);
                }

                columnEntity.setBeforeColumnCode("-1");
                columnEntity.setBeforeParentId(-1L);
                columnMapper.updateById(columnEntity);
                releaseAll(companyId);
                return;
            }
        }

        map.put("id", columnEntity.getId());
            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);
                    }

        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());
                    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());

            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);
            }
        });
    }

    @Override
@@ -185,9 +189,11 @@
            return;
        }

        for (ColumnEntity column : columns) {
            releaseColumn(column.getId(), type, companyId);
        }
        AppContants.EXECUTOR.execute(() -> {
            for (ColumnEntity column : columns) {
                releaseColumn(column.getId(), type, companyId);
            }
        });
    }

    private Map<String, Object> buildColumnData(ColumnEntity columnEntity) {