diff --git a/aurora-springboot/sql/aurora.sql b/aurora-springboot/sql/aurora.sql index 573998b..2a50724 100644 --- a/aurora-springboot/sql/aurora.sql +++ b/aurora-springboot/sql/aurora.sql @@ -28,6 +28,7 @@ CREATE TABLE `t_article` ( `category_id` int NULL DEFAULT NULL COMMENT '文章分类', `article_cover` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '文章缩略图', `article_title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '标题', + `article_abstract` varchar(500) DEFAULT NULL COMMENT '文章摘要,如果该字段为空,默认取文章的前500个字符作为摘要', `article_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '内容', `is_top` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否置顶 0否 1是', `is_featured` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是', diff --git a/aurora-springboot/src/main/java/com/aurora/entity/Article.java b/aurora-springboot/src/main/java/com/aurora/entity/Article.java index 0080fde..b096cf8 100644 --- a/aurora-springboot/src/main/java/com/aurora/entity/Article.java +++ b/aurora-springboot/src/main/java/com/aurora/entity/Article.java @@ -26,6 +26,8 @@ public class Article { private String articleTitle; + private String articleAbstract; + private String articleContent; private Integer isTop; diff --git a/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java b/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java index dcae436..a13b973 100644 --- a/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java +++ b/aurora-springboot/src/main/java/com/aurora/model/dto/ArticleAdminViewDTO.java @@ -22,6 +22,8 @@ public class ArticleAdminViewDTO { private String articleTitle; + private String articleAbstract; + private String articleContent; private String articleCover; diff --git a/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java b/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java index b650d96..1a18c63 100644 --- a/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java +++ b/aurora-springboot/src/main/java/com/aurora/model/vo/ArticleVO.java @@ -26,6 +26,9 @@ public class ArticleVO { @ApiModelProperty(name = "articleContent", value = "文章内容", required = true, dataType = "String") private String articleContent; + @ApiModelProperty(name = "articleAbstract", value = "文章摘要", dataType = "String") + private String articleAbstract; + @ApiModelProperty(name = "articleCover", value = "文章缩略图", dataType = "String") private String articleCover; diff --git a/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml b/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml index 81de718..28c61fd 100644 --- a/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml +++ b/aurora-springboot/src/main/resources/mapper/ArticleMapper.xml @@ -63,7 +63,7 @@ category_id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -79,6 +79,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -100,7 +101,7 @@ SELECT a.id AS id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -115,6 +116,7 @@ user_id, category_id, article_cover, + article_abstract, article_title, article_content, is_top, @@ -138,7 +140,7 @@ SELECT a.id AS id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -154,6 +156,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -194,6 +197,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -217,7 +221,7 @@ SELECT a.id AS id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -233,6 +237,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -256,7 +261,7 @@ SELECT a.id AS id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -272,6 +277,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -295,7 +301,7 @@ SELECT a.id AS id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -311,6 +317,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -333,7 +340,7 @@ SELECT a.id AS id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -349,6 +356,7 @@ category_id, article_cover, article_title, + article_abstract, article_content, is_top, is_featured, @@ -372,7 +380,7 @@ category_id, article_cover, article_title, - SUBSTR(article_content, 1, 500) AS article_content, + if(article_abstract is null or article_abstract = '', SUBSTR(article_content, 1, 500), article_abstract) AS article_content, is_top, is_featured, status, @@ -397,7 +405,7 @@