20220606

xiaoyong931011

2022-07-07 10fdc02eb340cac4adc87c708556e27daa3b6e1b

20220606

 src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java

@@ -15,7 +15,7 @@
    private Integer contentType;

    @ApiModelProperty(value = "所属栏目ID", example = "2")
    private String columnId;
    private String columnIdStr;

    @ApiModelProperty(value = "每页条数", example = "10")
    private Integer pageSize;

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

@@ -99,6 +99,6 @@
    @TableField(exist = false)
    private List<Long> columnIds;
    @TableField(exist = false)
    private List<Long> columnlist;
    private List<Long> columnList;

}

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/ArticleMapper.java

@@ -24,5 +24,5 @@

    IPage<ArticleEntity> selectArticleInPage(Page<ArticleEntity> page, @Param("record") ArticleEntity article);

    IPage<WebArticleVo> selectWebArticleInPage(Page<WebArticleVo> page, ArticleEntity articleEntity);
    IPage<WebArticleVo> selectWebArticleInPage(Page<WebArticleVo> page, @Param("record")ArticleEntity articleEntity);
}

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

@@ -55,14 +55,14 @@
        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
        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<>();
            for(long columnIdLong : columnIdLongs){
                columnList.add(columnIdLong);
            }
            articleEntity.setColumnlist(columnList);
            articleEntity.setColumnList(columnList);
        }
        String title = adminArticleDto.getTitle();
        if(StrUtil.isNotEmpty(title)){

 src/main/resources/mapper/ArticleMapper.xml

@@ -12,9 +12,9 @@
        <where>
            and a.del_status = 1
            <if test="record != null" >
                <if test="record.columnlist != null">
                <if test="record.columnList != null">
                    and a.column_id in
                    <foreach collection="record.columnlist" separator="," close=")" open="(" item="item">
                    <foreach collection="record.columnList" separator="," close=")" open="(" item="item">
                        #{item}
                    </foreach>
                </if>

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

@@ -1,14 +1,25 @@
package com.xcong.farmer.cms;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.common.utils.FileUtils;
import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.modules.system.dto.AdminArticleDto;
import com.xcong.farmer.cms.modules.system.dto.WebArticleInPageDto;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
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.test.dao.TestUserDao;
import com.xcong.farmer.cms.modules.test.entity.TestUserEntity;
import org.jsoup.Jsoup;
@@ -106,17 +117,52 @@
        System.out.println(content);
    }

    @Autowired
    private ColumnMapper columnMapper;

    @Autowired
    private ArticleMapper articleMapper;

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

        adminArticleDto.setColumnId(columnIdStrs);
        adminArticleDto.setPageNum(1);
        adminArticleDto.setPageSize(8);
        Page<AdminArticleVo> page = new Page<>(adminArticleDto.getPageNum(), adminArticleDto.getPageSize());
        ArticleEntity articleEntity = new ArticleEntity();
        String columnIdStr = adminArticleDto.getColumnId();
        if(StrUtil.isNotEmpty(columnIdStr)){
            long[] columnIdLongs = StrUtil.splitToLong(columnIdStr, StrUtil.COMMA);
            List<Long> columnList = new ArrayList<>();
            for(long columnIdLong : columnIdLongs){
                columnList.add(columnIdLong);
            }
            System.out.println(columnList);
            articleEntity.setColumnList(columnList);
        }
        String title = adminArticleDto.getTitle();
        if(StrUtil.isNotEmpty(title)){
            articleEntity.setTitle(title);
        }
        Integer contentType = adminArticleDto.getContentType() == null ? 0 : adminArticleDto.getContentType();
        if(contentType != 0){
            QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
            objectQueryWrapper.eq("content_type",contentType);
            List<ColumnEntity> columnEntities = columnMapper.selectList(objectQueryWrapper);
            if(CollUtil.isNotEmpty(columnEntities)){
                List<Long> columIds = new ArrayList<>();
                for(ColumnEntity columnEntity : columnEntities){
                    Long id = columnEntity.getId();
                    columIds.add(id);
                }
                articleEntity.setColumnIds(columIds);
            }
        }
        articleEntity.setCompanyId(24L);
        IPage<AdminArticleVo> list = articleMapper.selectAdminArticleInPage(page,articleEntity);
        System.out.println(list.getRecords());
    }

}