Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article

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

@@ -12,12 +12,31 @@ import java.io.Serializable;
 @Data
 public class DraftListFormDTO implements Serializable {
 	private static final long serialVersionUID = 7957826609741967502L;
+
+	/**
+	 * 文章标题
+	 */
+	private String title;
+	/**
+	 * 开始日期 yyyy-MM-dd HH:mm:ss
+	 */
+	private String startDate;
+	/**
+	 * 结束日期 yyyy-MM-dd HH:mm:ss
+	 */
+	private String endDate;
 	/**
 	 * 页码
 	 */
-	private Integer pageNo;
+	private Integer pageNo = 1;
 	/**
 	 * 每页显示数量
 	 */
-	private Integer pageSize;
+	private Integer pageSize = 20;
+
+	private Boolean isPage = true;
+	private String draftId;
+	private String customerId;
+	private String agencyId;
+	private String staffId;
 }

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

@@ -0,0 +1,101 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author sun
+ */
+@NoArgsConstructor
+@Data
+public class DraftPcListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = -8525181219822398750L;
+	/**
+	 * 文章草稿ID
+	 */
+	private String draftId;
+	/**
+	 * 文章标题
+	 */
+	private String title;
+	/**
+	 * 是否置顶 1是；0否；
+	 */
+	private String isTop;
+	/**
+	 * 是否置顶 1是；0否；
+	 */
+	private String isTopName;
+	/**
+	 * 发布单位ID
+	 */
+	private String publisherId;
+	/**
+	 * 发布单位
+	 */
+	private String publisherName;
+	/**
+	 * 发布单位类型 机关:agency；部门：department；网格：grid
+	 */
+	private String publisherType;
+	/**
+	 * 发布时间
+	 */
+	private String publishDate;
+	/**
+	 * 文章标签串
+	 */
+	@JsonIgnore
+	private String tags;
+	/**
+	 * 文章标签名列表
+	 */
+	private List<String> tagNameList;
+	/**
+	 * 文章标签Id列表
+	 */
+	private List<String> tagIdList;
+	/**
+	 * 概要内容
+	 */
+	private String previewContent;
+	/**
+	 * 上下线状态，上线：published，下线：offline
+	 */
+	private String statusFlag;
+	/**
+	 * 是不是我发布
+	 */
+	private Boolean isMePublished;
+	/**
+	 * 发布范围
+	 */
+	private String publishRangeDesc;
+	/**
+	 * 1：是否富文本类型【】富文本；0：不是】
+	 */
+	private String richTextFlag;
+	/**
+	 * 文章创建人
+	 */
+	private String createdBy;
+	/**
+	 * 封面图片url
+	 */
+	private String imgUrl;
+	/**
+	 * 发布范围网格Id集合
+	 */
+	private List<String> gridIdList;
+	/**
+	 * 文章内容
+	 */
+	private LinkedList<String> contentList;
+
+}

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

@@ -20,15 +20,15 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DeleteDraftFormDTO;
-import com.epmet.dto.form.DraftDetailFormDTO;
-import com.epmet.dto.form.DraftListFormDTO;
-import com.epmet.dto.form.GovArticleDetailFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.DraftDetailResultDTO;
 import com.epmet.dto.result.DraftListResultDTO;
+import com.epmet.dto.result.DraftPcListResultDTO;
+import com.epmet.dto.result.PublishedListResultDTO;
 import com.epmet.service.DraftService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -86,4 +86,30 @@ public class DraftController {
         DraftDetailResultDTO draftDetailResultDTO = draftService.queryDraftDetail(formDTO);
         return new Result<DraftDetailResultDTO>().ok(draftDetailResultDTO);
     }
+
+    /**
+     * @param tokenDTO
+     * @return
+     * @Author sun
+     * @Description 数字平台-党建声音-草稿列表
+     **/
+    @PostMapping("draftListV2")
+    public Result<PageData<DraftPcListResultDTO>> draftListV2(@LoginUser TokenDto tokenDTO, @RequestBody DraftListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
+        formDTO.setStaffId(tokenDTO.getUserId());
+        return new Result<PageData<DraftPcListResultDTO>>().ok(draftService.draftListV2(formDTO));
+    }
+
+    /**
+     * @param tokenDTO
+     * @return
+     * @Author sun
+     * @Description 数字平台-党建声音-草稿详情
+     **/
+    @PostMapping("detailV2")
+    public Result<DraftPcListResultDTO> detailV2(@LoginUser TokenDto tokenDTO, @RequestBody DraftListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
+        return new Result<DraftPcListResultDTO>().ok(draftService.detailV2(formDTO));
+    }
+
 }

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

@@ -27,6 +27,7 @@ import com.epmet.dto.form.DraftListFormDTO;
 import com.epmet.dto.result.DraftAttrResultDTO;
 import com.epmet.dto.result.DraftContentResultDTO;
 import com.epmet.dto.result.DraftDetailResultDTO;
+import com.epmet.dto.result.DraftPcListResultDTO;
 import com.epmet.entity.DraftEntity;
 
 import java.util.List;
@@ -148,4 +149,8 @@ public interface DraftService extends BaseService<DraftEntity> {
      * @date 2020-06-03
      */
     DraftDetailResultDTO queryDraftDetail(DraftDetailFormDTO formDTO);
+
+    PageData<DraftPcListResultDTO> draftListV2(DraftListFormDTO formDTO);
+
+    DraftPcListResultDTO detailV2(DraftListFormDTO formDTO);
 }

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

@@ -201,4 +201,14 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
         return draftDetailResultDTO;
     }
 
+    @Override
+    public PageData<DraftPcListResultDTO> draftListV2(DraftListFormDTO formDTO) {
+        return null;
+    }
+
+    @Override
+    public DraftPcListResultDTO detailV2(DraftListFormDTO formDTO) {
+        return null;
+    }
+
 }

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

@@ -431,6 +431,7 @@
             a.id AS "articleId",
             a.title AS "title",
             IFNULL(a.preview_content, "") AS "previewContent",
+            a.publish_range_desc AS "publishRangeDesc",
             a.publisher_id AS "publisherId",
             a.publisher_name AS "publisherName",
             a.publisher_type AS "publisherType",