From 90f9311b8f92d84533860e374c2a38c16f8a6e7d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Aug 2022 18:01:27 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 345573c..2c500ac 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,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
+import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.conversion.ArticleConversion;
import com.xcong.farmer.cms.core.node.AttrNode;
import com.xcong.farmer.cms.core.tag.data.ArticleData;
@@ -24,19 +25,44 @@
public class ArticleDataParserHandler implements DataParserHandler {
private final ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
-
@Override
public void dataParser(AttrNode node) {
- log.info("文章解析");
+// log.info("######文章解析########");
+ String baseUrl = (String) node.getSystemDataValue("baseUrl");
+
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);
-
ArticleData articleData = ArticleConversion.INSTANCE.entityToData(data);
- articleData.setNext(ArticleConversion.INSTANCE.entityToData(next));
- articleData.setPrev(ArticleConversion.INSTANCE.entityToData(prev));
+
+ ArticleEntity prevEntity = articleMapper.selectPrevOrNextArticle(data.getId(), data.getColumnId(), 1);
+ if (prevEntity != null) {
+ ArticleData prev = ArticleConversion.INSTANCE.entityToData(prevEntity);
+ if (prevEntity.getType() == 2) {
+ prev.setUrl(prevEntity.getArticleUrl());
+ } else {
+ prev.setUrl(baseUrl + prevEntity.getPath() + "/" + prevEntity.getId() + ".html");
+ }
+
+ articleData.setPrev(prev);
+ } else {
+ articleData.setPrev(new ArticleData());
+ }
+
+ ArticleEntity nextEntity = articleMapper.selectPrevOrNextArticle(data.getId(), data.getColumnId(), 2);
+ if (nextEntity != null) {
+ ArticleData next = ArticleConversion.INSTANCE.entityToData(nextEntity);
+ if (nextEntity.getType() == 2) {
+ next.setUrl(nextEntity.getArticleUrl());
+ } else {
+ next.setUrl(baseUrl + nextEntity.getPath() + "/" + nextEntity.getId() + ".html");
+ }
+
+ articleData.setNext(next);
+ } else {
+ articleData.setNext(new ArticleData());
+ }
+
node.setData(articleData);
}
}
--
Gitblit v1.9.1