From 23ded627f87ca96ef793013dd3f44ab05e2d111b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 12:13:34 +0800
Subject: [PATCH] 修改article handler 增加 ‡签

---
 src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java
index b5b5b7f..345573c 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java
@@ -2,11 +2,14 @@
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.xcong.farmer.cms.conversion.ArticleConversion;
 import com.xcong.farmer.cms.core.node.AttrNode;
+import com.xcong.farmer.cms.core.tag.data.ArticleData;
 import com.xcong.farmer.cms.core.tag.model.Article;
 import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
 import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
 import com.xcong.farmer.cms.utils.SpringContextHolder;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,25 +20,23 @@
  * @author wzy
  * @date 2022-06-24
  **/
+@Slf4j
 public class ArticleDataParserHandler implements DataParserHandler {
 
     private final ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
 
     @Override
     public void dataParser(AttrNode node) {
-        System.out.println("ArticleDataParserHandler");
+        log.info("文章解析");
         Article tag = (Article) node.getParam();
         ArticleEntity data = articleMapper.selectById(tag.getId());
 
         ArticleEntity prev = articleMapper.selectPrevOrNextArticle(data.getId(), data.getColumnId(), 1);
         ArticleEntity next = articleMapper.selectPrevOrNextArticle(data.getId(), data.getColumnId(), 2);
 
-        Map map = JSONObject.parseObject(JSONObject.toJSONString(data), Map.class);
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("title", "这是单个文章标题");
-
-        map.put("prev", prev);
-        map.put("next", next);
-        node.setData(map);
+        ArticleData articleData = ArticleConversion.INSTANCE.entityToData(data);
+        articleData.setNext(ArticleConversion.INSTANCE.entityToData(next));
+        articleData.setPrev(ArticleConversion.INSTANCE.entityToData(prev));
+        node.setData(articleData);
     }
 }

--
Gitblit v1.9.1