From 69830f1a3b084ad6800c8013268624a11d7fa5f3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 09:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cms' into anentang
---
src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
index cac8b9a..a4e63b5 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
@@ -1,14 +1,17 @@
package com.xcong.farmer.cms.core.handler;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.conversion.ColumnConversion;
import com.xcong.farmer.cms.core.node.AttrNode;
import com.xcong.farmer.cms.core.tag.data.NavData;
import com.xcong.farmer.cms.core.tag.model.Nav;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
+import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
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.CmsTemplateMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
import com.xcong.farmer.cms.utils.SpringContextHolder;
@@ -28,12 +31,14 @@
private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
- private CmsProperties cmsProperties = SpringContextHolder.getBean(CmsProperties.class);
+ private CmsTemplateMapper cmsTemplateMapper = SpringContextHolder.getBean(CmsTemplateMapper.class);
+ private String baseUrl = "";
@Override
public void dataParser(AttrNode node) {
- log.info("导航栏解析");
+// log.info("导航栏解析");
Long companyId = (Long) node.getSystemDataValue("companyId");
+ baseUrl = (String) node.getSystemDataValue("baseUrl");
List<ColumnEntity> columns = columnMapper.selectColumnByParentId(0L, companyId, 1);
@@ -44,8 +49,14 @@
List<NavData> list = new ArrayList<>();
NavData index = new NavData();
- index.setTitle("首页");
- index.setUrl(cmsProperties.getBaseUrl());
+ //首页是否设置，设置了从内容模版表中取名称
+ CmsTemplateEntity cmsTemplateEntity = cmsTemplateMapper.selectByPathAndCompanyId("index.html", companyId);
+ if(ObjectUtil.isNotEmpty(cmsTemplateEntity)){
+ index.setTitle(cmsTemplateEntity.getName());
+ }else{
+ index.setTitle("首页");
+ }
+ index.setUrl(baseUrl);
index.setCode("index");
list.add(index);
@@ -75,14 +86,14 @@
public NavData columnToNav(ColumnEntity column) {
NavData navData = ColumnConversion.INSTANCE.columnToNav(column);
- navData.setUrl(cmsProperties.getBaseUrl() + column.getPath());
+ navData.setUrl(baseUrl + column.getPath());
if (column.getType() == 2) {
if (column.getTargetType() == 1) {
ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
- navData.setUrl(cmsProperties.getBaseUrl() + article.getPath() + "/" + article.getId() + ".html");
+ navData.setUrl(baseUrl + article.getPath() + "/" + article.getId() + ".html");
} else if (column.getTargetType() == 2) {
ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
- navData.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
+ navData.setUrl(baseUrl + columnEntity.getPath());
} else {
navData.setUrl(column.getTargetUrl());
}
--
Gitblit v1.9.1