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

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

@@ -42,6 +42,11 @@ public class DraftAttrFromDTO implements Serializable {
 	@NotBlank(message = "草稿ID不能为空")
 	private String draftId;
 
+	/**
+	 * 栏目
+	 */
+	private String category;
+
 	/**
 	 * 封面图片地址
 	 */

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

@@ -43,6 +43,11 @@ public class DraftContentFromDTO implements Serializable {
 	 */
 	private String draftId;
 
+	/**
+	 * 栏目
+	 */
+	private String category;
+
 	/**
 	 * 文章标题
 	 */

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

@@ -19,6 +19,10 @@ public class DraftListResultDTO implements Serializable {
 	 * 文章ID
 	 */
 	private String draftId;
+	/**
+	 * 栏目
+	 */
+	private String category;
 	/**
 	 * 文章标题
 	 */

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

@@ -21,7 +21,10 @@ public class GovArticleDetailResultDTO implements Serializable {
      * 文章id
      */
     private String articleId;
-
+    /**
+     * 栏目
+     */
+    private String category;
     /**
      * 标题
      */

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

@@ -19,6 +19,11 @@ public class OfflineListResultDTO implements Serializable {
 	 * 文章ID
 	 */
 	private String articleId;
+
+	/**
+	 * 栏目
+	 */
+	private String category;
 	/**
 	 * 文章标题
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java

@@ -68,7 +68,7 @@ public class DraftController {
     }
 
     @PostMapping("draftlist")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_LIST)
+    // @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_LIST)
     public Result<List<DraftListResultDTO>> draftList(@LoginUser TokenDto tokenDto, @RequestBody DraftListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<DraftListResultDTO>>().ok(draftService.draftList(tokenDto, formDTO).getList());

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

@@ -187,6 +187,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		List<DraftContentEntity> draftContentList = null;
 		if (StringUtils.isNotBlank(fromDTO.getDraftId())) {
 			draftEntity = this.checkDraftStatus(fromDTO.getDraftId());
+			draftEntity.setCategory(fromDTO.getCategory());
 			draftEntity.setTitle(StringUtils.isBlank(fromDTO.getTitle()) ? "" : fromDTO.getTitle());
 			buildPreviewContent(fromDTO, draftEntity);
 			draftDao.updateById(draftEntity);
@@ -212,6 +213,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			draftEntity.setGridId("");
 			draftEntity.setDepartmentId(loginUserDetails.getData().getCustomerId());
 			draftEntity.setDelFlag(NumConstant.ZERO_STR);
+			draftEntity.setCategory(fromDTO.getCategory());
 			buildPreviewContent(fromDTO, draftEntity);
 			draftDao.insert(draftEntity);
 		}
@@ -306,8 +308,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		DraftCoverEntity coverEntity = buildCoverEntity(tokenDto, fromDTO);
 		//发布范围
 		List<DraftPublishRangeEntity> publishRangeEntityList = buildDraftPublishRange(draftEntity, tokenDto, fromDTO);
-
-
+		// 栏目
+		draftEntity.setCategory(fromDTO.getCategory());
 		executeSaveDraftAttr(draftEntity, coverEntity, publishRangeEntityList);
 		return true;
 	}
@@ -933,6 +935,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			article.setId(null);
 			article.setDraftId(draftId);
 			article.setStatusFlag(DraftConstant.PUBLISHED);
+			article.setCategory(draft.getCategory());
 			if (StringUtils.isNotBlank(publishWay)) {
 				article.setPublishWay(publishWay);
 			}

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

@@ -7,6 +7,7 @@
         SELECT
             id AS ARTICLE_ID,
             TITLE,
+            CATEGORY AS "category",
             PUBLISHER_NAME,
             PUBLISH_DATE,
             ( SELECT count( 1 ) FROM article_visit_record avr WHERE avr.DEL_FLAG = '0' AND avr.ARTICLE_ID =#{articleId}) AS VISIT_RECORD_COUNT,
@@ -51,6 +52,7 @@
     <select id="selectArticleListForAgency" resultType="com.epmet.dto.result.PublishedListResultDTO">
         SELECT
             a.ID AS "articleId",
+            a.CATEGORY AS "category",
             a.TITLE AS "title",
             IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
             a.PUBLISHER_NAME AS "publisherName",
@@ -135,6 +137,7 @@
         SELECT DISTINCT
             a.ID AS "articleId",
             a.TITLE AS "title",
+            a.CATEGORY AS "category",
             IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
             a.PUBLISHER_NAME AS "publisherName",
             a.OFF_LINE_TIME AS "publishDate"

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

@@ -135,6 +135,7 @@
         SELECT
             ID AS "draftId",
             TITLE AS "title",
+            CATEGORY AS "category",
             IFNULL(PREVIEW_CONTENT, "") AS "content",
             UNIX_TIMESTAMP(CREATED_TIME) AS "createdTime",
             STATUS_FLAG AS auditStatus