From 62d3f103086822a1bc51971a0733cb3d9b756bc0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Aug 2022 15:29:10 +0800
Subject: [PATCH] ifx
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
index 366a9df..71292cf 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
@@ -2,8 +2,13 @@
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.entity.ArticleEntity;
+import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
+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.WebSetMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +37,12 @@
@Autowired
private WebSetMapper webSetMapper;
- private final Executor executor = new ThreadPoolExecutor(10, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+ @Autowired
+ private ColumnMapper columnMapper;
+ @Autowired
+ private ArticleMapper articleMapper;
+
+// private final Executor executor = new ThreadPoolExecutor(10, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@Override
@@ -41,13 +51,14 @@
data.put("templatePath", templatePath);
data.put("templateName", data.get("id"));
globalData(data);
+
if (StrUtil.isEmpty(templateName)) {
templateName = "defualt.article.html";
}
try {
String finalTemplateName = templateName;
- executor.execute(() -> {
+ AppContants.EXECUTOR.execute(() -> {
cfg.process(data, finalTemplateName);
});
} catch (Exception e) {
@@ -91,7 +102,7 @@
try {
String finalTemplateName = templateName;
- executor.execute(() -> {
+ AppContants.EXECUTOR.execute(() -> {
cfg.process(data, finalTemplateName);
});
} catch (Exception e) {
@@ -110,7 +121,7 @@
try {
String finalTemplateName = templateName;
- executor.execute(() -> {
+ AppContants.EXECUTOR.execute(() -> {
cfg.process(data, finalTemplateName);
});
} catch (Exception e) {
@@ -134,7 +145,7 @@
try {
String finalTemplateName = templateName;
- executor.execute(() -> {
+ AppContants.EXECUTOR.execute(() -> {
cfg.process(data, finalTemplateName);
});
} catch (Exception e) {
@@ -147,6 +158,18 @@
Long companyId = (Long) data.get("companyId");
Map<String, String> globalSetting = webSetMapper.selectSiteGlobalSetting(companyId);
+ String type = (String) data.get("templateType");
+ if ("column".equals(type)){
+ Long id = (Long) data.get("id");
+ ColumnEntity columnEntity = columnMapper.selectById(id);
+ globalSetting.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
+ } else if ("article".equals(type)) {
+ Long id = (Long) data.get("id");
+ ArticleEntity article = articleMapper.selectById(id);
+ ColumnEntity columnEntity = columnMapper.selectById(article.getColumnId());
+ globalSetting.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
+ }
+
data.putAll(globalSetting);
}
}
--
Gitblit v1.9.1