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..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
@@ -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);
@@ -224,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/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..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
@@ -45,6 +45,11 @@ public class CmsDocInputDto {
*/
@ApiModelProperty("文本编辑器类型")
private String editorType;
+ /**
+ * 关键词
+ */
+ @ApiModelProperty("关键词")
+ private String keywords;
public String getContent() {
String base64decodedString;
@@ -78,6 +83,7 @@ public class CmsDocInputDto {
cmsDoc.setHeadImg(this.getHeadImg());
cmsDoc.setDeptId(dirDoc.getDeptId());
cmsDoc.setEditorType(this.editorType);
+ cmsDoc.setKeywords(this.keywords);
return cmsDoc;
}
}
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