政府端：选中草稿编辑，获取草稿属性

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

@@ -13,8 +13,23 @@ import java.io.Serializable;
 @Data
 public class CoverImgDTO implements Serializable {
     private static final long serialVersionUID = -6735712590479867385L;
+    /**
+     * 封面Id
+     */
     private String coverId;
+
+    /**
+     * 封面url
+     */
     private String url;
+
+    /**
+     * 审核状态
+     */
     private String auditStatus;
+
+    /**
+     * 审核理由
+     */
     private String auditReason;
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,17 +17,63 @@ import java.util.List;
 @Data
 public class DraftAttrResultDTO implements Serializable {
     private static final long serialVersionUID = 6999941497971286747L;
+
+    /**
+     * 草稿Id
+     */
     private String draftId;
+
+    /**
+     * 封面图片
+     */
     private CoverImgDTO coverImg;
-    private List<String> tagNameList;
+
+    /**
+     * 标签名称数组， 竖杠分割的标签名称
+     */
+    private String[] tagNameList;
+
+    /**
+     * 是否置顶 1是；0 否
+     */
     private Integer isTop;
+
+    /**
+     * 网格Id数组
+     */
     private List<String> gridIdList;
+
+    /**
+     * 发布单位Id
+     */
     private String publisher;
+
+    /**
+     * 发布单位名称
+     */
     private String publisherName;
-    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+
+    /**
+     * 发布日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date publishDate;
+
+    /**
+     * 标题
+     */
     private String title;
+
+    /**
+     * 发布范围拼接的字符串，顿号隔开
+     */
     private String publishRangeDesc;
-    private String tags;
+
+    /**
+     * 机关:agency；部门：department；网格：grid
+     */
     private String publisherType;
+
+    @JsonIgnore
+    private String tags;
 }

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

@@ -170,7 +170,7 @@ public class ArticleController {
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT)
     public Result<DraftContentResultDTO> getContent(@RequestBody DraftDetailFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
-        DraftContentResultDTO draftContent=draftService.queryDraftContent(formDTO.getDraftId());
+        DraftContentResultDTO draftContent=draftService.queryDraftContent(formDTO);
         return new Result<DraftContentResultDTO>().ok(draftContent);
     }
 
@@ -185,7 +185,7 @@ public class ArticleController {
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT)
     public Result<DraftAttrResultDTO> getAttr(@RequestBody DraftDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
-        DraftAttrResultDTO draftAttrResultDTO=new DraftAttrResultDTO();
+        DraftAttrResultDTO draftAttrResultDTO=draftService.getDraftAttr(formDTO);
         return new Result<DraftAttrResultDTO>().ok(draftAttrResultDTO);
     }
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java

@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.CoverImgDTO;
+import com.epmet.dto.result.DraftAttrResultDTO;
 import com.epmet.dto.result.DraftContentDetailDTO;
 import com.epmet.dto.result.DraftContentResultDTO;
 import com.epmet.entity.DraftEntity;
@@ -48,4 +50,28 @@ public interface DraftDao extends BaseDao<DraftEntity> {
      *            草稿id
      */
     List<DraftContentDetailDTO> selectDraftContentDetail(String draftId);
+
+    /**
+     * 政府端：选中草稿编辑，获取草稿属性
+     *
+     * @param draftId
+     *            草稿id
+     */
+    DraftAttrResultDTO selectDraftAttr(String draftId);
+
+    /**
+     * 政府端：选中草稿编辑，获取草稿属性-封面信息
+     *
+     * @param draftId
+     *            草稿id
+     */
+    CoverImgDTO selectDraftCoverImg(String draftId);
+
+    /**
+     * 政府端：选中草稿编辑，获取草稿属性-已选择发布网格
+     *
+     * @param draftId
+     *            草稿id
+     */
+    List<String> selectDraftGrids(String draftId);
 }

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

@@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.DraftDTO;
 import com.epmet.dto.form.DeleteDraftFormDTO;
+import com.epmet.dto.form.DraftDetailFormDTO;
+import com.epmet.dto.result.DraftAttrResultDTO;
 import com.epmet.dto.result.DraftContentResultDTO;
 import com.epmet.entity.DraftEntity;
 
@@ -107,10 +109,20 @@ public interface DraftService extends BaseService<DraftEntity> {
     /**
      *  政府端：选中草稿编辑，获取草稿内容
      *
-     * @param draftId
+     * @param formDTO
+     * @return com.epmet.dto.result.DraftContentResultDTO
+     * @author yinzuomei@elink-cn.com
+     * @date 2020-06-03
+     */
+    DraftContentResultDTO queryDraftContent(DraftDetailFormDTO formDTO);
+
+    /**
+     *  政府端：选中草稿编辑，获取草稿属性
+     *
+     * @param formDTO
      * @return com.epmet.dto.result.DraftContentResultDTO
      * @author yinzuomei@elink-cn.com
      * @date 2020-06-03
      */
-    DraftContentResultDTO queryDraftContent(String draftId);
+    DraftAttrResultDTO getDraftAttr(DraftDetailFormDTO formDTO);
 }

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

@@ -20,14 +20,17 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.DraftConstant;
 import com.epmet.dao.DraftDao;
 import com.epmet.dto.DraftDTO;
 import com.epmet.dto.form.DeleteDraftFormDTO;
+import com.epmet.dto.form.DraftDetailFormDTO;
+import com.epmet.dto.result.CoverImgDTO;
+import com.epmet.dto.result.DraftAttrResultDTO;
 import com.epmet.dto.result.DraftContentResultDTO;
 import com.epmet.entity.DraftEntity;
 import com.epmet.redis.DraftRedis;
@@ -120,9 +123,27 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
     }
 
     @Override
-    public DraftContentResultDTO queryDraftContent(String draftId) {
-        DraftContentResultDTO draftContentResultDTO=baseDao.selectDraftContent(draftId);
+    public DraftContentResultDTO queryDraftContent(DraftDetailFormDTO formDTO) {
+        DraftContentResultDTO draftContentResultDTO = baseDao.selectDraftContent(formDTO.getDraftId());
         return draftContentResultDTO;
     }
 
+    @Override
+    public DraftAttrResultDTO getDraftAttr(DraftDetailFormDTO formDTO) {
+        DraftAttrResultDTO draftAttrResultDTO = baseDao.selectDraftAttr(formDTO.getDraftId());
+        if (null != draftAttrResultDTO) {
+            CoverImgDTO coverImgDTO = baseDao.selectDraftCoverImg(formDTO.getDraftId());
+            List<String> gridIdList = baseDao.selectDraftGrids(formDTO.getDraftId());
+            draftAttrResultDTO.setCoverImg(coverImgDTO);
+            draftAttrResultDTO.setGridIdList(gridIdList);
+            if (StringUtils.isNoneBlank(draftAttrResultDTO.getTags())) {
+                String[] tagNames = draftAttrResultDTO.getTags().split("\\|");
+                draftAttrResultDTO.setTagNameList(tagNames);
+            }
+        } else {
+            logger.error(String.format("查询草稿属性失败,草稿id=%s", formDTO.getDraftId()));
+        }
+        return draftAttrResultDTO;
+    }
+
 }

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

@@ -12,7 +12,7 @@
     <!-- 政府端查询草稿内容详情 -->
     <select id="selectDraftContent" parameterType="java.lang.String" resultMap="DraftContentResultDTOMap">
         SELECT
-            id,
+            ID,
             TITLE
         FROM
             draft
@@ -25,7 +25,7 @@
     <!--   政府端查询草稿内容详情  -->
     <select id="selectDraftContentDetail" parameterType="java.lang.String" resultType="com.epmet.dto.result.DraftContentDetailDTO">
         SELECT
-            dc.id,
+            dc.ID,
             dc.CONTENT,
             dc.CONTENT_TYPE,
             dc.ORDER_NUM,
@@ -39,4 +39,49 @@
         ORDER BY
             dc.ORDER_NUM ASC
     </select>
+
+    <!-- 政府端：选中草稿编辑，获取草稿属性   -->
+    <select id="selectDraftAttr" parameterType="java.lang.String" resultType="com.epmet.dto.result.DraftAttrResultDTO">
+        SELECT
+            id AS DRAFT_ID,
+            IS_TOP,
+            PUBLISHER_ID AS PUBLISHER,
+            PUBLISHER_NAME,
+            PUBLISH_DATE,
+            TITLE,
+            PUBLISH_RANGE_DESC,
+            PUBLISHER_TYPE
+        FROM
+            draft
+        WHERE
+            DEL_FLAG = '0'
+            and STATUS_FLAG!='published'
+            and id=#{draftId}
+    </select>
+
+    <!--  政府端：选中草稿编辑，获取草稿属性-封面信息  -->
+    <select id="selectDraftCoverImg" parameterType="java.lang.String" resultType="com.epmet.dto.result.CoverImgDTO">
+        SELECT
+            dc.id AS COVER_ID,
+            dc.IMG_URL AS URL,
+            dc.AUDIT_STATUS,
+            dc.AUDIT_REASON
+        FROM
+            draft_cover dc
+        WHERE
+            dc.DEL_FLAG = '0'
+            AND dc.DRAFT_ID = #{draftId}
+    </select>
+
+    <!--  政府端：选中草稿编辑，获取草稿属性-已选择发布网格  -->
+    <select id="selectDraftGrids" parameterType="java.lang.String" resultType="java.util.List">
+        SELECT
+            GRID_ID
+        FROM
+            draft_publish_range dpr
+        WHERE
+            dpr.DEL_FLAG = '0'
+            AND dpr.PUBLISH_STATUS != 'published'
+            AND dpr.DRAFT_ID = #{draftId}
+    </select>
 </mapper>