From 9386346d6e848900bdc52c80db9b53b7a7ff11c1 Mon Sep 17 00:00:00 2001 From: otto <731554297@qq.com> Date: Wed, 5 Jul 2023 13:38:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E7=AB=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E4=BB=A3=E7=A0=81=E4=BB=93=E5=BA=93=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0):=20=E3=80=90=E4=B8=93=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91=E6=96=87=E7=AB=A0=E7=BC=96=E8=BE=91=E9=9C=80=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=94=AF=E6=8C=81=E5=AF=8C=E6=96=87=E6=9C=AC=E4=B8=8E?= =?UTF-8?q?Markdown=E7=BC=96=E8=BE=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/cms/doc/domain/CmsDoc.java | 5 ++++ .../ruoyi/cms/doc/domain/CmsDocBaseDto.java | 16 ++++------ .../ruoyi/cms/doc/domain/CmsDocDetailDto.java | 2 -- .../ruoyi/cms/doc/domain/CmsDocInputDto.java | 29 +++++++++++++++---- .../doc/service/impl/CmsDocServiceImpl.java | 11 +------ .../resources/mapper/cms/CmsDocMapper.xml | 5 ++++ sql/update/2023-07-05-001.sql | 25 ++++++++++++++++ 7 files changed, 65 insertions(+), 28 deletions(-) create mode 100644 sql/update/2023-07-05-001.sql diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDoc.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDoc.java index 109e3ae2d..0dc15c8e2 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDoc.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDoc.java @@ -117,6 +117,10 @@ public class CmsDoc extends BaseSortEntity { * 是否首页展示（0代表不展示 1代表展示） */ private String isHomepage; + /** + * 文本编辑器类型 + */ + private String editorType; public CmsDir copyToCmsDir() { CmsDir cmsDir = new CmsDir(); @@ -157,6 +161,7 @@ public class CmsDoc extends BaseSortEntity { cmsDocDto.setHeadImg(headImg); cmsDocDto.setIsHomepage(isHomepage); cmsDocDto.setSummary(summary); + cmsDocDto.setEditorType(editorType); if (visits == null) { cmsDocDto.setVisits(0L); diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocBaseDto.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocBaseDto.java index dd7211f2d..db641a745 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocBaseDto.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocBaseDto.java @@ -1,6 +1,5 @@ package com.ruoyi.cms.doc.domain; -import com.ruoyi.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,32 +16,27 @@ public class CmsDocBaseDto { /** * 文章标识 */ - @Excel(name = "文章标识") @ApiModelProperty("文章标识") private Long id; /** * 文章名称 */ - @Excel(name = "文章名称") @ApiModelProperty("文章名称") private String name; /** * 文章头图 */ - @Excel(name = "文章头图") @ApiModelProperty("文章头图") private String headImg; /** * 文章概要 */ - @Excel(name = "文章概要") @ApiModelProperty("文章概要") private String summary; /** * 发布时间 */ - @Excel(name = "发布时间") @ApiModelProperty("发布时间") private String publishTime; /** @@ -66,9 +60,13 @@ public class CmsDocBaseDto { /** * 浏览量 */ - @Excel(name = "浏览量") @ApiModelProperty("浏览量") private Long visits; + /** + * 文本编辑器类型 + */ + @ApiModelProperty("文本编辑器类型") + private String editorType; /** * 是否首页展示（0代表不展示 1代表展示） */ @@ -81,8 +79,4 @@ public class CmsDocBaseDto { this.publishTime = simpleDateFormat.format(publishTime); } } - - public void setPublishTime(String publishTime) { - this.publishTime = publishTime; - } } diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDetailDto.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDetailDto.java index 1e65312e3..4e3c66ac6 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDetailDto.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDetailDto.java @@ -1,6 +1,5 @@ package com.ruoyi.cms.doc.domain; -import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.exception.ServiceException; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -19,7 +18,6 @@ public class CmsDocDetailDto extends CmsDocBaseDto { /** * 文章内容 */ - @Excel(name = "文章内容") @ApiModelProperty("文章内容") private String content; diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocInputDto.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocInputDto.java index 21f41f778..86d309475 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocInputDto.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocInputDto.java @@ -1,7 +1,6 @@ package com.ruoyi.cms.doc.domain; import com.ruoyi.cms.utils.CmsConstants; -import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.exception.ServiceException; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -19,29 +18,34 @@ public class CmsDocInputDto { /** * 文章名称 */ - @Excel(name = "文章名称") + @ApiModelProperty(value = "文章名称", required = true) private String name; /** * 文章内容 */ - @Excel(name = "文章内容") + @ApiModelProperty(value = "文章内容", required = true) private String content; /** * 文章头图 */ - @Excel(name = "文章头图") + @ApiModelProperty(value = "文章头图") private String headImg; /** * 文章概要 */ - @Excel(name = "文章概要") @ApiModelProperty("文章概要") private String summary; + /** + * 文本编辑器类型 + */ + @ApiModelProperty("文本编辑器类型") + private String editorType; + public String getContent() { String base64decodedString; try { @@ -61,4 +65,19 @@ public class CmsDocInputDto { } return name; } + + public CmsDoc toCmsDoc(CmsDoc dirDoc) { + CmsDoc cmsDoc = new CmsDoc(); + cmsDoc.setName(this.getName()); + String fileName = this.getName() + CmsConstants.MARKDOWN_SUFFIX; + cmsDoc.setFileName(fileName); + cmsDoc.setFilePath(dirDoc.getName() + CmsConstants.DIR_SEPARATOR + fileName); + cmsDoc.setSummary(this.getSummary()); + cmsDoc.setDirName(dirDoc.getName()); + cmsDoc.setIsDir(false); + cmsDoc.setHeadImg(this.getHeadImg()); + cmsDoc.setDeptId(dirDoc.getDeptId()); + cmsDoc.setEditorType(this.editorType); + return cmsDoc; + } } diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocServiceImpl.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocServiceImpl.java index 41e038153..b85f25bcd 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocServiceImpl.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocServiceImpl.java @@ -230,16 +230,7 @@ public class CmsDocServiceImpl implements ICmsDocService { throw new ServiceException("该栏目不存在(栏目Id[" + dirId + "])"); } - CmsDoc cmsDoc = new CmsDoc(); - cmsDoc.setName(cmsDocInputDto.getName()); - String fileName = cmsDocInputDto.getName() + CmsConstants.MARKDOWN_SUFFIX; - cmsDoc.setFileName(fileName); - cmsDoc.setFilePath(dirDoc.getName() + CmsConstants.DIR_SEPARATOR + fileName); - cmsDoc.setSummary(cmsDocInputDto.getSummary()); - cmsDoc.setDirName(dirDoc.getName()); - cmsDoc.setIsDir(false); - cmsDoc.setHeadImg(cmsDocInputDto.getHeadImg()); - cmsDoc.setDeptId(dirDoc.getDeptId()); + CmsDoc cmsDoc = cmsDocInputDto.toCmsDoc(dirDoc); return insertCommonCmsDoc(cmsDoc, "创建文章：" + cmsDoc.getName(), cmsDocInputDto.getContent()); } diff --git a/ruoyi-modules/ruoyi-cms/src/main/resources/mapper/cms/CmsDocMapper.xml b/ruoyi-modules/ruoyi-cms/src/main/resources/mapper/cms/CmsDocMapper.xml index afd5d498b..2a2862fe8 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/resources/mapper/cms/CmsDocMapper.xml +++ b/ruoyi-modules/ruoyi-cms/src/main/resources/mapper/cms/CmsDocMapper.xml @@ -30,6 +30,7 @@ + @@ -57,6 +58,7 @@ dir_name, dept_id, is_homepage, + editor_type, is_dir from cms_doc @@ -86,6 +88,7 @@ cd.dir_name, cd.dept_id, cd.is_homepage, + cd.editor_type, cd.is_dir from cms_doc cd @@ -254,6 +257,7 @@ dir_name, dept_id, is_homepage, + editor_type, #{createBy}, @@ -280,6 +284,7 @@ #{dirName}, #{deptId}, #{isHomepage}, + #{editorType}, diff --git a/sql/update/2023-07-05-001.sql b/sql/update/2023-07-05-001.sql new file mode 100644 index 000000000..86c7d3ade --- /dev/null +++ b/sql/update/2023-07-05-001.sql @@ -0,0 +1,25 @@ +SET FOREIGN_KEY_CHECKS = 0; + +ALTER TABLE `ruoyi-gitlink`.`cms_doc` + ADD COLUMN `editor_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'markdown_editor' COMMENT '编辑器类型'; + +INSERT INTO `ruoyi-gitlink`.`sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES ('文本编辑器类型', 'editor_type', '0', 'admin', '2023-07-05 10:42:31', '', NULL, NULL); + +INSERT INTO `ruoyi-gitlink`.`sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, + `list_class`, `is_default`, `status`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (0, '富文本编辑器', 'rich_editor', 'editor_type', NULL, NULL, 'N', '0', 'admin', '2023-07-05 10:46:11', '', NULL, + NULL); +INSERT INTO `ruoyi-gitlink`.`sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, + `list_class`, `is_default`, `status`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (0, 'Markdown编辑器', 'markdown_editor', 'editor_type', NULL, NULL, 'N', '0', 'admin', '2023-07-05 10:46:31', '', + NULL, NULL); + +update `ruoyi-gitlink`.cms_doc +set editor_type='markdown_editor' +where is_dir = 0; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file