From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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 538f32e..a405ee4 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
@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.core.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.farmer.cms.core.template.TemplateConfiguration;
import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
@@ -7,8 +8,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.validation.constraints.NotNull;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* @author wzy
@@ -21,28 +28,60 @@
@Autowired
private TemplateConfiguration cfg;
+
@Override
- public void articleProcess(Long id, String templateName, String templatePath) {
- Map<String, Object> data = new HashMap<>();
- data.put("id", id);
- data.put("companyId", 23L);
+ public void articleProcess(Map<String, Object> data, String templateName, String templatePath) {
data.put("templateType", "article");
data.put("templatePath", templatePath);
- data.put("templateName", id);
+ data.put("templateName", data.get("id"));
if (StrUtil.isEmpty(templateName)) {
- templateName = "defualt.artile.html";
+ templateName = "defualt.article.html";
}
+
cfg.process(data, templateName);
}
@Override
- public void columnProcess(Map<String, Object> data, String templateName, boolean article) {
- data.put("companyId", 23L);
+ public void articlesProcess(Map<String, Object> data, List<Long> ids, String templateName, String templatePath) {
+ if (CollUtil.isEmpty(ids)) {
+ return;
+ }
+
+ for (Long id : ids) {
+ data.put("id", id);
+ articleProcess(data, templateName, templatePath);
+ }
+ }
+
+ @Override
+ public void columnsProcess(Map<String, Object> data, List<Long> ids, String templateName) {
+ if (CollUtil.isEmpty(ids)) {
+ return;
+ }
+
+ for (Long id : ids) {
+ data.put("id", id);
+ columnProcess(data, templateName);
+ }
+ }
+
+ @Override
+ public void columnProcess(Map<String, Object> data, String templateName) {
data.put("templateType", "column");
data.put("page", 1);
if (StrUtil.isEmpty(templateName)) {
templateName = "defualt.list.html";
}
+
+ cfg.process(data, templateName);
+ }
+
+ @Override
+ public void indexProcess(@NotNull Map<String, Object> data, String templateName) {
+ if (StrUtil.isEmpty(templateName)) {
+ templateName = "index.html";
+ }
+
cfg.process(data, templateName);
}
}
--
Gitblit v1.9.1