20220606

xiaoyong931011

2022-07-05 57e9491896ed7d3f706fdde54471bb55e1dd79b5

20220606

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

@@ -42,6 +42,9 @@
    @ApiModelProperty(value = "若栏目类型为标题类型 1-链接到内容 2-链接到栏目 3-外部地址")
    private Integer targetType;

    @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
    private Integer contentType;

    @ApiModelProperty(value = "目标地址")
    private String targetUrl;


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

@@ -49,4 +49,7 @@

    @ApiModelProperty(value = "是否为导航 1-是 2-否")
    private Integer isNav;

    @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
    private Integer contentType;
}

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

@@ -43,6 +43,9 @@
    // 目标类型 1-链接到文章 2-链接到栏目 3-外部链接
    private Integer targetType;

    // 内容类型 1：文章 2：图片 3：文件 4：音频
    private Integer contentType;

    // 目标地址 (外部地址http/https开头 文章ID/栏目ID)
    private String targetUrl;


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

@@ -116,6 +116,7 @@
        columnEntity.setTargetType(adminAddColumnDto.getTargetType());
        columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
        columnEntity.setIsNav(adminAddColumnDto.getIsNav());
        columnEntity.setContentType(adminAddColumnDto.getContentType());
        this.baseMapper.insert(columnEntity);
        return Result.ok("添加成功");
    }
@@ -156,6 +157,7 @@
        adminSeeColumnInfoVo.setIsNav(columnEntity.getIsNav());
        adminSeeColumnInfoVo.setType(columnEntity.getType());
        adminSeeColumnInfoVo.setTargetType(columnEntity.getTargetType());
        adminSeeColumnInfoVo.setContentType(columnEntity.getContentType());
        if (columnEntity.getType() == 2) {
            if (columnEntity.getTargetType() == 1) {
                ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
@@ -216,6 +218,7 @@
        columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
        columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
        columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
        columnEntity.setContentType(adminUpdateColumnDto.getContentType());
        this.baseMapper.updateById(columnEntity);
        return Result.ok("更新成功");
    }

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

@@ -49,4 +49,7 @@
    @ApiModelProperty(value = "是否为导航 1-是 2-否")
    private Integer isNav;

    @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
    private Integer contentType;

}