From 60de114aa423ebbed620d39f4bcf7ece0633530f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Aug 2022 14:17:38 +0800
Subject: [PATCH] 20220812

---
 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java |   94 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 3 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 a405ee4..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,14 @@
 
 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;
 import org.springframework.stereotype.Service;
@@ -28,17 +34,37 @@
     @Autowired
     private TemplateConfiguration cfg;
 
+    @Autowired
+    private WebSetMapper webSetMapper;
+
+    @Autowired
+    private ColumnMapper columnMapper;
+    @Autowired
+    private ArticleMapper articleMapper;
+
+//    private final Executor executor = new ThreadPoolExecutor(10, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+
 
     @Override
     public void articleProcess(Map<String, Object> data, String templateName, String templatePath) {
         data.put("templateType", "article");
         data.put("templatePath", templatePath);
         data.put("templateName", data.get("id"));
+        globalData(data);
+
         if (StrUtil.isEmpty(templateName)) {
             templateName = "defualt.article.html";
         }
 
-        cfg.process(data, templateName);
+        try {
+            String finalTemplateName = templateName;
+            AppContants.EXECUTOR.execute(() -> {
+                cfg.process(data, finalTemplateName);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("发布文章出错", e);
+        }
     }
 
     @Override
@@ -69,19 +95,81 @@
     public void columnProcess(Map<String, Object> data, String templateName) {
         data.put("templateType", "column");
         data.put("page", 1);
+        globalData(data);
         if (StrUtil.isEmpty(templateName)) {
             templateName = "defualt.list.html";
         }
 
-        cfg.process(data, templateName);
+        try {
+            String finalTemplateName = templateName;
+            AppContants.EXECUTOR.execute(() -> {
+                cfg.process(data, finalTemplateName);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("发布栏目错误", e);
+        }
     }
 
     @Override
     public void indexProcess(@NotNull Map<String, Object> data, String templateName) {
+        data.put("templateType", "index");
+        globalData(data);
         if (StrUtil.isEmpty(templateName)) {
             templateName = "index.html";
         }
 
-        cfg.process(data, templateName);
+        try {
+            String finalTemplateName = templateName;
+            AppContants.EXECUTOR.execute(() -> {
+                cfg.process(data, finalTemplateName);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("发布首页错误", e);
+        }
+    }
+
+    @Override
+    public void process(Map<String, Object> data, String templateType, String templateName) {
+        data.put("templateType", templateType);
+        globalData(data);
+
+        if ("search".equals(templateType) && StrUtil.isBlank(templateName)) {
+            templateName = "search.html";
+        }
+
+        if ("message".equals(templateType) && StrUtil.isBlank(templateName)) {
+            templateName = "message.html";
+        }
+
+        try {
+            String finalTemplateName = templateName;
+            AppContants.EXECUTOR.execute(() -> {
+                cfg.process(data, finalTemplateName);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("发布错误", e);
+        }
+    }
+
+    private void globalData(Map<String, Object> data) {
+        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