From 57e9491896ed7d3f706fdde54471bb55e1dd79b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 10:21:17 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java | 3 +++
5 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java
index dfb63c4..d52d363 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java
+++ b/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;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
index fae7fb3..d8e1f4d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
+++ b/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;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
index 09ce945..554ff32 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java
+++ b/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;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
index 684a206..c0a499a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
+++ b/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("更新成功");
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java
index ad8660c..c75d84a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java
+++ b/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;
+
}
--
Gitblit v1.9.1