修改

Helius

2022-11-12 067546725a07d08e0346ebf3a410d481e97e5730

 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,49 +28,39 @@

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

    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);
        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(baseUrl);
        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);
        }
//        List<Map<String, Object>> list = new ArrayList<>();
//        Map<String, Object> aa = new HashMap<>();
//        aa.put("title", "导航1");
//        list.add(aa);
//
//        Map<String, Object> bb = new HashMap<>();
//        bb.put("title", "导航2");
//
//        List<Map<String, Object>> sub = new ArrayList<>();
//        Map<String, Object> subBB = new HashMap<>();
//        subBB.put("title", "子导航1");
//        subBB.put("src", "http://1234");
//        sub.add(subBB);
//        Map<String, Object> subAA = new HashMap<>();
//        subAA.put("title", "子导航2");
//        subAA.put("src", "http://123455555");
//        sub.add(subAA);
//
//        bb.put("children", sub);
//        list.add(bb);

        node.setData(list);
    }

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

        navData.setUrl(BASE_URL + navData.getCode());
        navData.setUrl(baseUrl + 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(baseUrl + 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(baseUrl + columnEntity.getPath());
            } else {
                navData.setUrl(column.getTargetUrl());
            }