Helius
2022-08-09 1789de3365e7074f864b975a26c64aaf168b271a
fix:execute in thread
3 files modified
24 ■■■■ changed files
src/main/java/com/xcong/farmer/cms/common/contants/AppContants.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java 11 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
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,6 +92,8 @@
    @Override
    public void releaseColumn(Long id, int type, Long companyId) {
        ColumnEntity columnEntity = columnMapper.selectById(id);
        AppContants.EXECUTOR.execute(() -> {
        Map<String, Object> map = buildColumnData(columnEntity);
        // 判断栏目是否编辑了栏目编码或者修改了父级栏目
@@ -175,6 +178,7 @@
            releaseIndex(companyId, false);
        }
        });
    }
    @Override
@@ -185,9 +189,11 @@
            return;
        }
        AppContants.EXECUTOR.execute(() -> {
        for (ColumnEntity column : columns) {
            releaseColumn(column.getId(), type, companyId);
        }
        });
    }
    private Map<String, Object> buildColumnData(ColumnEntity columnEntity) {