Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 1facfdc9361d888d72c959bac4d8fb05dcad02d7

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java

@@ -6,6 +6,7 @@
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.service.IReleaseService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,14 +33,25 @@

    @Override
    public void releaseArticle(Long id) {
        Long companyId = LoginUserUtil.getCompanyId();
        ArticleEntity article = articleMapper.selectById(id);

        ColumnEntity column = columnMapper.selectById(article.getColumnId());
        cmsCoreService.articleProcess(article.getId(), column.getArticleTemplate(), column.getPath());

        Map<String, Object> data = new HashMap<>();
        data.put("id", article.getId());
        data.put("companyId", companyId);

        cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
        this.releaseColumn(column.getId(), false);
        if (column.getParentId() != 0L) {
            releaseColumn(column.getParentId(), false);
        }
        this.releaseIndex();
    }

    @Override
    public void releaseColumn(Long id, boolean article) {
        Long companyId = LoginUserUtil.getCompanyId();
        ColumnEntity columnEntity = columnMapper.selectById(id);
        Map<String, Object> map = new HashMap<>();
        map.put("id", columnEntity.getId());
@@ -51,12 +63,17 @@
            map.put("parentCode", parent.getColumnCode());
        }
        map.put("templatePath", columnEntity.getPath());
        cmsCoreService.columnProcess(map, columnEntity.getListTemplate(), article);
        map.put("companyId", companyId);

        cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
    }

    @Override
    public void releaseIndex() {
        Map<String, Object> map = new HashMap<>();
        Long companyId = LoginUserUtil.getCompanyId();
        map.put("companyId", companyId);

        cmsCoreService.indexProcess(map, null);
    }
}