fix column update

Helius

2022-07-12 5e54f37b9bfd01874c22c017c768adb2f8fee24d

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

@@ -4,8 +4,11 @@
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.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 +25,8 @@
import java.util.concurrent.TimeUnit;

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

    @Autowired
    private ICmsCoreService cmsCoreService;

    @Autowired
    private WebSetMapper webSetMapper;

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

@@ -54,7 +60,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 +76,7 @@
                }
            }

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

@@ -104,7 +110,7 @@
                cmsCoreService.columnProcess(parentMap, parentColumn.getListTemplate());
            }

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

        if (type != 1) {
@@ -134,7 +140,7 @@
                    }
                }

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

        }
@@ -170,11 +176,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
@@ -183,5 +197,6 @@
        map.put("companyId", companyId);

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