修改

Helius

2022-11-12 067546725a07d08e0346ebf3a410d481e97e5730

 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java

@@ -5,6 +5,10 @@
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.core.template.TemplateConfiguration;
import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
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.ColumnMapper;
import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +37,11 @@
    @Autowired
    private WebSetMapper webSetMapper;

    @Autowired
    private ColumnMapper columnMapper;
    @Autowired
    private ArticleMapper articleMapper;

//    private final Executor executor = new ThreadPoolExecutor(10, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());


@@ -42,6 +51,7 @@
        data.put("templatePath", templatePath);
        data.put("templateName", data.get("id"));
        globalData(data);

        if (StrUtil.isEmpty(templateName)) {
            templateName = "defualt.article.html";
        }
@@ -148,6 +158,18 @@
        Long companyId = (Long) data.get("companyId");
        Map<String, String> globalSetting = webSetMapper.selectSiteGlobalSetting(companyId);

        String type = (String) data.get("templateType");
        if ("column".equals(type)){
            Long id = (Long) data.get("id");
            ColumnEntity columnEntity = columnMapper.selectById(id);
            globalSetting.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
        } else if ("article".equals(type)) {
            Long id = (Long) data.get("id");
            ArticleEntity article = articleMapper.selectById(id);
            ColumnEntity columnEntity = columnMapper.selectById(article.getColumnId());
            globalSetting.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
        }

        data.putAll(globalSetting);
    }
}