From 073d3667b5d4a5c03c3c5be6125f4b6e2ed5b7ea Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Thu, 27 Jun 2024 10:49:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E4=B8=93=E5=8C=BA=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=85=B3=E9=94=AE=E8=AF=8D=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/cms/doc/domain/CmsDoc.java | 5 +++++ .../main/java/com/ruoyi/cms/doc/domain/CmsDocBaseDto.java | 5 +++++ .../src/main/java/com/ruoyi/cms/doc/domain/CmsDocDto.java | 5 +++++ .../main/java/com/ruoyi/cms/doc/domain/CmsDocInputDto.java | 5 +++++ .../main/java/com/ruoyi/cms/doc/domain/CmsDocSearchVo.java | 5 +++++ .../src/main/resources/mapper/cms/CmsDocMapper.xml | 7 +++++++ .../20240627090118_zone_alert_cmd_doc_add_keywords.sql | 3 +++ 7 files changed, 35 insertions(+) create mode 100644 sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.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 58bd26d21..42bc8e043 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 @@ -157,6 +157,11 @@ public class CmsDoc extends BaseSortEntity { */ private String auditEditableStatus; + /** + * 关键词 + */ + private String keywords; + public CmsDir copyToCmsDir() { CmsDir cmsDir = new CmsDir(); cmsDir.setId(id); 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 8a1c189bd..af1b90f75 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 @@ -96,6 +96,11 @@ public class CmsDocBaseDto { @ApiModelProperty("文章创建者") private String createBy; + /** + * 关键词 + */ + @ApiModelProperty("关键词") + private String keywords; public void setPublishTime(Date publishTime) { if (publishTime != null) { diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDto.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDto.java index d1b351663..5d31133b8 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDto.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocDto.java @@ -65,6 +65,11 @@ public class CmsDocDto { @ApiModelProperty("是否在栏目下修改") private boolean isChangeOnDir; + /** + * 关键词 + */ + @ApiModelProperty("关键词") + private String keywords; public String getName() { if (name != null) { 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 86d309475..33fce7557 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 @@ -45,6 +45,11 @@ public class CmsDocInputDto { */ @ApiModelProperty("文本编辑器类型") private String editorType; + /** + * 关键词 + */ + @ApiModelProperty("关键词") + private String keywords; public String getContent() { String base64decodedString; diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocSearchVo.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocSearchVo.java index 8c7a46350..161b11f4e 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocSearchVo.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDocSearchVo.java @@ -78,4 +78,9 @@ public class CmsDocSearchVo { */ @ApiModelProperty(value = "创建者", hidden = true) private String createBy; + /** + * 关键词 + */ + @ApiModelProperty("关键词") + private String keywords; } 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 dcc2057dc..b0449c144 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 @@ -36,6 +36,7 @@ + @@ -69,6 +70,7 @@ audit_status, audit_type, audit_tmp_branch_name, + keywords, audit_pr_number from cms_doc @@ -100,6 +102,7 @@ cd.issue_id, cd.is_homepage, cd.editor_type, + cd.keywords, cd.is_dir from cms_doc cd @@ -162,6 +165,7 @@ and name like concat('%', #{name}, '%') + and keywords like concat('%', #{keywords}, '%') and file_name like concat('%', #{fileName}, '%') and file_path = #{filePath} and publish_time = #{publishTime} @@ -307,6 +311,7 @@ audit_type, audit_tmp_branch_name, audit_pr_number, + keywords, #{createBy}, @@ -339,6 +344,7 @@ #{auditType}, #{auditTmpBranchName}, #{auditPrNumber}, + #{keywords}, @@ -374,6 +380,7 @@ audit_type = #{auditType}, audit_tmp_branch_name = #{auditTmpBranchName}, audit_pr_number = #{auditPrNumber}, + keywords = #{keywords}, where id = #{id} diff --git a/sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql b/sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql new file mode 100644 index 000000000..b61f67dbb --- /dev/null +++ b/sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql @@ -0,0 +1,3 @@ +-- 专区文章表增加Keywords关键字 +alter table cms_doc + add keywords varchar(255) null comment '关键词'; \ No newline at end of file From 562ddae3c9f0db84bf143845f71c5c538baa54ca Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Thu, 27 Jun 2024 13:49:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E4=B8=93=E5=8C=BA=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=85=B3=E9=94=AE=E8=AF=8D=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-cms/src/main/java/com/ruoyi/cms/doc/domain/CmsDoc.java | 1 + .../src/main/java/com/ruoyi/cms/doc/domain/CmsDocInputDto.java | 1 + 2 files changed, 2 insertions(+) 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 42bc8e043..f1c36d320 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 @@ -229,6 +229,7 @@ public class CmsDoc extends BaseSortEntity { cmsDocDto.setAuditStatus(auditStatus); cmsDocDto.setAuditType(auditType); cmsDocDto.setCreateBy(createBy); + cmsDocDto.setKeywords(keywords); return cmsDocDto; } 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 33fce7557..97acf5cf8 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 @@ -83,6 +83,7 @@ public class CmsDocInputDto { cmsDoc.setHeadImg(this.getHeadImg()); cmsDoc.setDeptId(dirDoc.getDeptId()); cmsDoc.setEditorType(this.editorType); + cmsDoc.setKeywords(this.keywords); return cmsDoc; } }