From b95699652357c6218b45eceb81170ddfebb30e1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:06:25 +0800
Subject: [PATCH] fix conflect
---
src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java
index acfed60..61ecde7 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ArticlesDataParserHandler.java
@@ -1,6 +1,17 @@
package com.xcong.farmer.cms.core.handler;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.Articles;
+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 java.util.ArrayList;
import java.util.HashMap;
@@ -11,23 +22,48 @@
* @author wzy
* @date 2022-06-24
**/
+@Slf4j
public class ArticlesDataParserHandler implements DataParserHandler {
+ private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
+ private String BASE_URL = "http://192.168.0.1";
@Override
public void dataParser(AttrNode node) {
- System.out.println("ArticlesDataParserHandler");
- List<Map<String, Object>> list = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
- map.put("path", "这是链接1");
- map.put("title", "这是标题1");
- list.add(map);
+ log.info("文章列表解析");
+ Long companyId = (Long) node.getSystemDataValue("companyId");
+ Articles param = (Articles) node.getParam();
- Map<String, Object> map2 = new HashMap<>();
- map2.put("path", "这是链接2");
- map2.put("title", "这是标题2");
- list.add(map2);
+ if (StrUtil.isEmpty(param.getColId())) {
+ Page<ArticleEntity> page = new Page<>(Integer.parseInt(param.getPage()), Integer.parseInt(param.getLimit()));
- node.setData(list);
+ ArticleEntity article = new ArticleEntity();
+ article.setColumnCode(param.getCode());
+ article.setCompanyId(companyId);
+ IPage<ArticleEntity> listPage = articleMapper.selectArticleInPage(page, article);
+
+ List<ArticleData> list = new ArrayList<>();
+ for (ArticleEntity record : listPage.getRecords()) {
+ ArticleData articleData = entityToData(record);
+ list.add(articleData);
+ }
+
+ node.setData(list);
+ } else {
+
+ }
+ }
+
+ public ArticleData entityToData(ArticleEntity article) {
+ ArticleData articleData = ArticleConversion.INSTANCE.entityToData(article);
+
+ if (article.getType() == 2) {
+ articleData.setUrl(article.getArticleUrl());
+ } else {
+ articleData.setUrl(BASE_URL + article.getPath() + "/" + article.getId() + ".html");
+ }
+
+
+ return articleData;
}
}
--
Gitblit v1.9.1