修改栏目发布bug

Helius

2022-07-08 2b9bed85bac6906bd6c53bbe82057cc78d1af9f7

 src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java

@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.core.handler;

import cn.hutool.core.collection.CollUtil;
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;
@@ -27,29 +28,38 @@

    private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
    private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
    private String BASE_URL = "http://192.168.0.1/";
    private CmsProperties cmsProperties = SpringContextHolder.getBean(CmsProperties.class);

    @Override
    public void dataParser(AttrNode node) {
        log.info("导航栏解析");
        Long companyId = (Long) node.getSystemDataValue("companyId");

        List<ColumnEntity> columns = columnMapper.selectColumnByParentId(0L, companyId);
        List<ColumnEntity> columns = columnMapper.selectColumnByParentId(0L, companyId, 1);

        if (CollUtil.isEmpty(columns)) {
            return;
        }

        List<NavData> list = new ArrayList<>();

        NavData index = new NavData();
        index.setTitle("首页");
        index.setUrl(cmsProperties.getBaseUrl());
        index.setCode("index");
        list.add(index);

        for (ColumnEntity column : columns) {
            NavData navData = columnToNav(column);

            List<ColumnEntity> child = columnMapper.selectColumnByParentId(column.getId(), companyId);
            List<ColumnEntity> child = columnMapper.selectColumnByParentId(column.getId(), companyId, 1);
            if (CollUtil.isNotEmpty(child)) {
                List<NavData> childNavData = columnsToNavs(child);
                navData.setChildren(childNavData);
            }
            list.add(navData);
        }

        node.setData(list);
    }

@@ -65,13 +75,14 @@
    public NavData columnToNav(ColumnEntity column) {
        NavData navData = ColumnConversion.INSTANCE.columnToNav(column);

        navData.setUrl(BASE_URL + navData.getCode());
        navData.setUrl(cmsProperties.getBaseUrl() + column.getPath());
        if (column.getType() == 2) {
            if (column.getTargetType() == 1) {
                ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
                navData.setUrl(BASE_URL + article.getColumnCode() + "/" + article.getId() + ".html");
                navData.setUrl(cmsProperties.getBaseUrl() + article.getPath() + "/" + article.getId() + ".html");
            } else if (column.getTargetType() == 2) {
                navData.setUrl(BASE_URL + column.getTargetUrl());
                ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
                navData.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
            } else {
                navData.setUrl(column.getTargetUrl());
            }