20220606

xiaoyong931011

2022-07-08 bd4ab82f2e0c485f36a254e3cbf72f21dabfd628

20220606

 src/main/java/com/xcong/farmer/cms/configurations/SwaggerConfig.java

@@ -30,10 +30,14 @@
    public Docket createRestApi(){
        // 添加请求参数，我们这里把token作为请求头部参数传入后端
        ParameterBuilder parameterBuilder = new ParameterBuilder();
        ParameterBuilder parameterBuilderWebsite = new ParameterBuilder();
        List<Parameter> parameters = new ArrayList<Parameter>();
        parameterBuilder.name("Authorization").description("令牌").modelRef(new ModelRef("string")).parameterType("header")
                .required(false).build();
        parameters.add(parameterBuilder.build());
        parameterBuilderWebsite.name("website").description("website").modelRef(new ModelRef("string")).parameterType("header")
                .required(false).build();
        parameters.add(parameterBuilderWebsite.build());
        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.any())
                .paths(PathSelectors.any()).build().globalOperationParameters(parameters);
    }

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

@@ -314,7 +314,7 @@
        Long companyId = 0L;
        if(CollUtil.isNotEmpty(companyEntities)){
            for(CompanyEntity companyEntity : companyEntities){
                boolean contains = StrUtil.contains(website, companyEntity.getWebAddress());
                boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
                if(contains){
                    companyId = companyEntity.getId();
                }

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

@@ -165,6 +165,7 @@

    @Override
    public Result viewTemplateInfo(Long id) {
        Result result = new Result();
        CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
        String templatePath = cmsProperties.getTemplatePath();
        String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
@@ -174,11 +175,12 @@
            bytes = Files.readAllBytes(Paths.get(pathName));
        } catch (IOException e) {
            e.printStackTrace();
            return Result.ok("未找到模板");
            return result.fail("未找到模板");
        }

        String content = new String(bytes, StandardCharsets.UTF_8);
        return Result.ok(content );
        result.setData(content);
        return result;
    }

}

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

@@ -314,7 +314,7 @@
        Long companyId = 0L;
        if(CollUtil.isNotEmpty(companyEntities)){
            for(CompanyEntity companyEntity : companyEntities){
                boolean contains = StrUtil.contains(website, companyEntity.getWebAddress());
                boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
                if(contains){
                    companyId = companyEntity.getId();
                }

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

@@ -99,7 +99,7 @@
        Long companyId = 0L;
        if(CollUtil.isNotEmpty(companyEntities)){
            for(CompanyEntity companyEntity : companyEntities){
                boolean contains = StrUtil.contains(website, companyEntity.getWebAddress());
                boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
                if(contains){
                    companyId = companyEntity.getId();
                }

 src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java

@@ -57,4 +57,10 @@

    @ApiModelProperty(value = "是否删除 0：已删除 1：未删除")
    private Integer delStatus;

    @ApiModelProperty(value = "1-站内 2-外部链接")
    private Integer type;

    @ApiModelProperty(value = "外部链接地址")
    private String articleUrl;
}

 src/main/java/com/xcong/farmer/cms/modules/system/vo/WebArticleVo.java

@@ -50,4 +50,10 @@
    @ApiModelProperty(value = "文章详情")
    private String articleDetails;

    @ApiModelProperty(value = "1-站内 2-外部链接")
    private Integer type;

    @ApiModelProperty(value = "外部链接地址")
    private String articleUrl;

}

 src/main/resources/mapper/ArticleMapper.xml

@@ -96,10 +96,8 @@
        <where>
            and a.del_status = 1
            and a.release_status = 1
            and a.company_id = #{record.companyId}
            <if test="record != null" >
                <if test="record.companyId != null">
                    and a.company_id = #{record.companyId}
                </if>
                <if test="record.columnId != null">
                    and a.column_id = #{record.columnId}
                </if>

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

@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,13 +13,11 @@
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.entity.*;
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.mapper.CompanyMapper;
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;
@@ -34,6 +33,8 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -125,6 +126,37 @@
    @Autowired
    private ArticleMapper articleMapper;

    @Autowired
    private CompanyMapper companyMapper;

    @Test
    public void testCompanyId(){
        String website = "127.0.0.1";
        Long companyIdFromWebsite = getCompanyIdFromWebsite(website);
        System.out.print(companyIdFromWebsite);
    }

    private Long getCompanyIdFromWebsite(String website){
        List<CompanyEntity> companyEntities = companyMapper.selectList(new QueryWrapper<>());
        Long companyId = 0L;
        if(CollUtil.isNotEmpty(companyEntities)){
            for(CompanyEntity companyEntity : companyEntities){
                boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
                if(contains){
                    companyId = companyEntity.getId();
                }
            }
        }
        return companyId;
    }

    public static void main(String[] args) {
        for(int i=0;i<10;i++){
            BigDecimal partnerIncomeNum = RandomUtil.randomBigDecimal(new BigDecimal("5000.001"), new BigDecimal("10000.0001")).setScale(6, RoundingMode.HALF_DOWN);
            System.out.println(partnerIncomeNum);
        }
    }

    @Test
    public void articleTest(){
        WebArticleInPageDto webArticleInPageDto = new WebArticleInPageDto();