From 03123e40dfda2aca60201e026b40503a5c3ac892 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 11:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java | 9 +++++++++
src/main/resources/mapper/ArticleMapper.xml | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 4 ++++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 6 ++++++
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java | 3 +++
13 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
index fcfa446..e0637fe 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
@@ -65,4 +65,7 @@
@ApiModelProperty(value = "外部链接地址")
private String articleUrl;
+
+ @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
+ private Integer contentType;
}
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/AdminArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java
index a479fb2..26f26ab 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminArticleDto.java
@@ -11,6 +11,9 @@
@ApiModelProperty(value = "标题", example = "文章")
private String title;
+ @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频", example = "1")
+ private Integer contentType;
+
@ApiModelProperty(value = "所属栏目ID", example = "2")
private Long columnId;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
index e7daf51..31ac9bc 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
@@ -67,4 +67,7 @@
@ApiModelProperty(value = "外部链接地址")
private String articleUrl;
+
+ @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
+ private Integer contentType;
}
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/ArticleEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
index 349877d..8d7bab7 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
@@ -81,6 +81,9 @@
private String articleUrl;
+ //内容类型 1：文章 2：图片 3：文件 4：音频"
+ private Integer contentType;
+
@TableField(exist = false)
private String columnCode;
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/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index 8ff8743..a50d269 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -59,6 +59,10 @@
if(StrUtil.isNotEmpty(title)){
articleEntity.setTitle(title);
}
+ Integer contentType = adminArticleDto.getContentType() == null ? 0 : adminArticleDto.getContentType();
+ if(contentType != 0){
+ articleEntity.setContentType(adminArticleDto.getContentType());
+ }
if(UserEntity.USER_BELONG_TOP != companyId){
articleEntity.setCompanyId(companyId);
}
@@ -108,6 +112,7 @@
articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
articleEntity.setType(adminAddArticleDto.getType());
+ articleEntity.setContentType(adminAddArticleDto.getContentType());
this.baseMapper.insert(articleEntity);
return Result.ok("添加成功");
}
@@ -179,6 +184,7 @@
articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
articleEntity.setType(adminUpdateArticleDto.getType());
+ articleEntity.setContentType(adminUpdateArticleDto.getContentType());
this.baseMapper.updateById(articleEntity);
return Result.ok("更新成功");
}
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..f09992a 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("更新成功");
}
@@ -242,6 +245,7 @@
child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
+ child.setContentType(columnEntityChild.getContentType());
adminColumnVoChilds.add(child);
}
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
index a2bdd44..7473c95 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java
@@ -26,6 +26,9 @@
@ApiModelProperty(value = "图片")
private String pic;
+ @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
+ private Integer contentType;
+
@ApiModelProperty(value = "子菜单")
private List<AdminColumnVo> child;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java
index 0ecc8a6..e50b377 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeArticleInfoVo.java
@@ -54,4 +54,13 @@
@ApiModelProperty(value = "附件")
private String uploadFile;
+
+ @ApiModelProperty(value = "1-站内 2-外部链接")
+ private Integer type;
+
+ @ApiModelProperty(value = "外部链接地址")
+ private String articleUrl;
+
+ @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
+ private Integer contentType;
}
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;
+
}
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index acc3a78..5629f5e 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -21,6 +21,9 @@
<if test="record.title!=null">
and a.title like concat ('%',#{record.title},'%')
</if>
+ <if test="record.contentType != null">
+ and a.content_type = #{record.contentType}
+ </if>
</if>
</where>
order by a.is_top desc,a.create_time desc
--
Gitblit v1.9.1