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

Helius

2022-07-07 f04b8922283120e2bc4a476ddc302ebd3b0894e4

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

 src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java

@@ -100,5 +100,7 @@
    private List<Long> columnIds;
    @TableField(exist = false)
    private List<Long> columnList;
    @TableField(exist = false)
    private String timeType;

}

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

@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.modules.system.service.Impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -286,6 +287,10 @@
        if(UserEntity.USER_BELONG_TOP != companyId){
            articleEntity.setCompanyId(companyId);
        }
        String timeType = webArticleInPageDto.getTimeType();
        if(StrUtil.isNotEmpty(timeType)){
            articleEntity.setTimeType(timeType);
        }
        IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);
        return Result.ok(list);
    }

 src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java

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

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,7 @@
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminArticleVo;
import com.xcong.farmer.cms.modules.system.vo.WebArticleVo;
import com.xcong.farmer.cms.modules.test.dao.TestUserDao;
import com.xcong.farmer.cms.modules.test.entity.TestUserEntity;
import org.jsoup.Jsoup;
@@ -124,16 +126,48 @@
    private ArticleMapper articleMapper;

    @Test
    public void articleTest(){
        WebArticleInPageDto webArticleInPageDto = new WebArticleInPageDto();
        webArticleInPageDto.setTimeType("一周内");
        webArticleInPageDto.setPageNum(1);
        webArticleInPageDto.setPageSize(8);
        Long companyId = 24L;
        Page<WebArticleVo> page = new Page<>(webArticleInPageDto.getPageNum(), webArticleInPageDto.getPageSize());
        ArticleEntity articleEntity = new ArticleEntity();
        Long columnId = webArticleInPageDto.getColumnId() == null ? 0L : webArticleInPageDto.getColumnId();
        if(columnId != 0L){
            articleEntity.setColumnId(columnId);
        }
        String author = webArticleInPageDto.getAuthor();
        if(StrUtil.isNotEmpty(author)){
            articleEntity.setAuthor(author);
        }
        String queryKey = webArticleInPageDto.getQueryKey();
        if(StrUtil.isNotEmpty(queryKey)){
            articleEntity.setTitle(queryKey);
        }
        if(UserEntity.USER_BELONG_TOP != companyId){
            articleEntity.setCompanyId(companyId);
        }
        String timeType = webArticleInPageDto.getTimeType();
        if(StrUtil.isNotEmpty(timeType)){
            articleEntity.setTimeType(timeType);
        }
        IPage<WebArticleVo> list = articleMapper.selectWebArticleInPage(page,articleEntity);
        System.out.println(list.getRecords());
    }

    @Test
    public void dateTest(){
        String columnIdStrs = "68,63";
        AdminArticleDto adminArticleDto = new AdminArticleDto();

        adminArticleDto.setColumnId(columnIdStrs);
        adminArticleDto.setColumnIdStr(columnIdStrs);
        adminArticleDto.setPageNum(1);
        adminArticleDto.setPageSize(8);
        Page<AdminArticleVo> page = new Page<>(adminArticleDto.getPageNum(), adminArticleDto.getPageSize());
        ArticleEntity articleEntity = new ArticleEntity();
        String columnIdStr = adminArticleDto.getColumnId();
        String columnIdStr = adminArticleDto.getColumnIdStr();
        if(StrUtil.isNotEmpty(columnIdStr)){
            long[] columnIdLongs = StrUtil.splitToLong(columnIdStr, StrUtil.COMMA);
            List<Long> columnList = new ArrayList<>();