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

Helius

2022-07-12 3a8d8b6de6daf6e7198a2b8d562dc2fbf49a4a2a

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

@@ -115,6 +115,9 @@
        String atlas = adminAddArticleDto.getAtlas();
            articleEntity.setAtlas(atlas);
        Date releaseTime = adminAddArticleDto.getReleaseTime();
        if (releaseTime == null) {
            releaseTime = new Date();
        }
            articleEntity.setReleaseTime(releaseTime);
        Integer isTop = adminAddArticleDto.getIsTop();
        articleEntity.setIsTop(isTop);
@@ -178,7 +181,12 @@
        if(ObjectUtil.isEmpty(columnEntity)){
            return Result.fail("请选择文章栏目");
        }

        if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == -1) {
            articleEntity.setBeforeColumnId(articleEntity.getColumnId());
        }
        articleEntity.setColumnId(columnId);

        Integer visits = adminUpdateArticleDto.getVisits() == null ? 0 : adminUpdateArticleDto.getVisits();
        articleEntity.setVisits(visits);
        String mainDiagram = adminUpdateArticleDto.getMainDiagram();
@@ -199,6 +207,7 @@
        articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
        articleEntity.setType(adminUpdateArticleDto.getType());
        articleEntity.setContentType(adminUpdateArticleDto.getContentType());

        String authorBelong = adminUpdateArticleDto.getAuthorBelong();
        articleEntity.setAuthorBelong(authorBelong);
        this.baseMapper.updateById(articleEntity);
@@ -229,6 +238,8 @@
        }
        articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
        this.baseMapper.updateById(articleEntity);

        releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
        return Result.ok("操作成功");
    }

@@ -281,11 +292,21 @@
            articleEntity.setTimeType(timeType);
        }
        IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);

        if (CollUtil.isNotEmpty(list.getRecords())) {
            for (WebArticleVo record : list.getRecords()) {
                // 站内
                if (record.getType() == 1) {
                    record.setArticleUrl(record.getBaseUrl() + record.getPath() + "/" + record.getId() + ".html");
                }
            }
        }
        return Result.ok(list);
    }

    @Override
    public Result updateStatusOn(Long id) {
        Long companyId = LoginUserUtil.getCompanyId();
        ArticleEntity articleEntity = this.baseMapper.selectById(id);
        if(ObjectUtil.isEmpty(articleEntity)){
            return Result.fail("文章不存在");
@@ -293,7 +314,7 @@
        articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
        this.baseMapper.updateById(articleEntity);

        releaseService.releaseArticle(articleEntity.getId());
        releaseService.releaseArticle(articleEntity.getId(), companyId);
        return Result.ok("操作成功");
    }