【灵山街道】1.文章和草稿的新增、列表、修改接口，增加栏目字段

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddOrSaveDraftFormDTO.java

@@ -31,6 +31,9 @@ public class AddOrSaveDraftFormDTO implements Serializable {
     @Length(max = 50, message = "标题最长为50个字")
     private String title;
 
+    @NotBlank(message = "栏目分类不能为空",groups = {AddArticleForm.class})
+    private String category;
+
     /**
      * 发布范围IDs
      */

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java

@@ -28,6 +28,9 @@ public class UpdateArticleFormDTO {
     @NotBlank(message = "articleId不能为空", groups = {AddUserInternalGroup.class})
     private String articleId;
 
+    @NotBlank(message = "栏目不能为空", groups = {AddUserInternalGroup.class})
+    private String category;
+
     @NotBlank(message = "文章标题不能为空", groups = {AddUserShowGroup.class})
     @Length(max = 50, message = "文章标题最长为50个字")
     private String title;

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java

@@ -19,6 +19,11 @@ public class DraftPcListResultDTO implements Serializable {
 	 * 文章草稿ID
 	 */
 	private String draftId;
+
+	/**
+	 * 栏目
+	 */
+	private String category;
 	/**
 	 * 组织Id
 	 */

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java

@@ -21,6 +21,11 @@ public class PublishedListResultDTO implements Serializable {
 	 * 文章ID
 	 */
 	private String articleId;
+
+	/**
+	 * 分类
+	 */
+	private String category;
 	/**
 	 * 组织Id
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java

@@ -42,6 +42,15 @@ public class ArticleEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * @description: 分类
+	 * @param null:
+	 * @return
+	 * @author: WangXianZhang
+	 * @date: 2023/4/12 4:39 PM
+	 */
+	private String category;
+
 	/**
 	 * 草稿ID
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java

@@ -47,6 +47,15 @@ public class DraftEntity extends BaseEpmetEntity {
 	 */
 	private String title;
 
+	/**
+	 * @description: 分类
+	 * @param null:
+	 * @return
+	 * @author: WangXianZhang
+	 * @date: 2023/4/12 2:09 PM
+	 */
+	private String category;
+
 	/**
 	 * 标题审核状态
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -1538,6 +1538,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			if (formDTO.getPublisherType().equals(DraftConstant.GRID)){
 				article.setGridId(formDTO.getPublisher());
 			}
+			article.setCategory(formDTO.getCategory());
 			article.setPreviewContent(getPreviewContent(formDTO.getContent()).length() > DraftConstant.PREVIEW_CONTENT_MAX_LENGTH ? getPreviewContent(formDTO.getContent()).substring(NumConstant.ZERO,DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) : getPreviewContent(formDTO.getContent()));
 			article.setPublishDate(DateUtils.stringToDate(formDTO.getPublishDate(),DateUtils.DATE_PATTERN));
 			article.setPublisherId(formDTO.getPublisher());
@@ -1617,6 +1618,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			// 1.草稿
 			DraftEntity draft = ConvertUtils.sourceToTarget(formDTO, DraftEntity.class);
 			draft.setDepartmentId(customerId);
+			draft.setCategory(formDTO.getCategory());
 			draft.setPreviewContent(StringUtils.isBlank(formDTO.getContent()) ? "" : getPreviewContent(formDTO.getContent()).length() > DraftConstant.PREVIEW_CONTENT_MAX_LENGTH ? getPreviewContent(formDTO.getContent()).substring(NumConstant.ZERO,DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) : getPreviewContent(formDTO.getContent()));
 			draft.setPublisherId(StringUtils.isBlank(formDTO.getPublisher()) ? "" : formDTO.getPublisher());
 			draft.setPublishDate(StringUtils.isBlank(formDTO.getPublishDate()) ? null : DateUtils.stringToDate(formDTO.getPublishDate(),DateUtils.DATE_PATTERN));
@@ -1841,6 +1843,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		if (formDTO.getPublisherType().equals(DraftConstant.GRID)){
 			articleEntity.setGridId(formDTO.getPublisher());
 		}
+		articleEntity.setCategory(formDTO.getCategory());
 		articleEntity.setPreviewContent(getPreviewContent(formDTO.getContent()).length() > DraftConstant.PREVIEW_CONTENT_MAX_LENGTH ? getPreviewContent(formDTO.getContent()).substring(NumConstant.ZERO,DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) : getPreviewContent(formDTO.getContent()));
 		articleEntity.setPublishDate(DateUtils.stringToDate(formDTO.getPublishDate(),DateUtils.DATE_PATTERN));
 		articleEntity.setPublisherId(formDTO.getPublisher());

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -433,6 +433,7 @@
             a.id AS "articleId",
             a.org_id AS "agencyId",
             a.title AS "title",
+            a.category AS "category",
             IFNULL(a.preview_content, "") AS "previewContent",
             a.publish_range_desc AS "publishRangeDesc",
             a.publisher_id AS "publisher",

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@@ -183,6 +183,7 @@
             a.id AS "draftId",
             a.org_id AS "agencyId",
             a.title AS "title",
+            a.CATEGORY AS "category",
             IFNULL(a.preview_content, "") AS "previewContent",
             a.publish_range_desc AS "publishRangeDesc",
             a.publisher_id AS "publisher",