From e909dc0c8bda991895dac5811a01ffe526c28eb0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 15:00:42 +0800
Subject: [PATCH] fix column add and update
---
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddColumnDto.java | 14 ++++++++++++++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 12 ++++++++++++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java | 14 ++++++++++++++
src/main/java/com/xcong/farmer/cms/modules/system/entity/ColumnEntity.java | 9 +++++++++
4 files changed, 49 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 05219dd..b09fe80 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
@@ -30,4 +30,18 @@
@ApiModelProperty(value = "上级类目ID")
private Long parentId;
+ @ApiModelProperty(value = "列表页模板")
+ private String listTemplate;
+
+ @ApiModelProperty(value = "文章页模板")
+ private String articleTemplate;
+
+ @ApiModelProperty(value = "栏目类型 1-普通栏目 2-标题栏目")
+ private Integer type;
+
+ @ApiModelProperty(value = "若栏目类型为标题类型 1-链接到内容 2-链接到栏目 3-外部地址")
+ private Integer targetType;
+
+ @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 c7382d1..3b42f27 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
@@ -32,4 +32,18 @@
@ApiModelProperty(value = "上级类目ID")
private Long parentId;
+ @ApiModelProperty(value = "列表页模板")
+ private String listTemplate;
+
+ @ApiModelProperty(value = "文章页模板")
+ private String articleTemplate;
+
+ @ApiModelProperty(value = "栏目类型 1-普通栏目 2-标题栏目")
+ private Integer type;
+
+ @ApiModelProperty(value = "若栏目类型为标题类型 1-链接到内容 2-链接到栏目 3-外部地址")
+ private Integer targetType;
+
+ @ApiModelProperty(value = "目标地址")
+ private String targetUrl;
}
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 99d1b6b..ffa5c12 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
@@ -35,4 +35,13 @@
// 文章页模板
private String articleTemplate;
+
+ // 栏目类型 1-普通栏目 2-标题栏目
+ private Integer type;
+
+ // 目标类型 1-链接到文章 2-链接到栏目 3-外部链接
+ private Integer targetType;
+
+ // 目标地址 (外部地址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 d9a5c29..aad9116 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
@@ -102,6 +102,12 @@
}else{
columnEntity.setParentId(parentId);
}
+
+ columnEntity.setListTemplate(adminAddColumnDto.getListTemplate());
+ columnEntity.setArticleTemplate(adminAddColumnDto.getArticleTemplate());
+ columnEntity.setType(adminAddColumnDto.getType());
+ columnEntity.setTargetType(adminAddColumnDto.getTargetType());
+ columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
this.baseMapper.insert(columnEntity);
return Result.ok("添加成功");
}
@@ -180,6 +186,12 @@
}else{
columnEntity.setParentId(parentId);
}
+
+ columnEntity.setListTemplate(adminUpdateColumnDto.getListTemplate());
+ columnEntity.setArticleTemplate(adminUpdateColumnDto.getArticleTemplate());
+ columnEntity.setType(adminUpdateColumnDto.getType());
+ columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
+ columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
--
Gitblit v1.9.1