diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java new file mode 100644 index 0000000000..ccd0e9918e --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java @@ -0,0 +1,62 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 政府端：文章预览接口返参DTO + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/5 10:56 + */ +@Data +public class DraftDetailResultDTO implements Serializable { + + private static final long serialVersionUID = 6156947260878857897L; + /** + * 草稿Id + */ + private String draftId; + + /** + * 标题 + */ + private String title; + + /** + * 发布单位名称 + */ + private String publisherName; + + /** + * 发布日期 + */ + @JsonFormat(pattern="yyyy-MM-dd") + private Date publishDate; + + /** + * 访问量 + */ + private Integer visitRecordCount; + + /** + * 标签字符串 已废弃 + */ + @JsonIgnore + private String tags; + + /** + * 内容列表 + */ + private List articleContentList; + + /** + * 标签名称数组 + */ + private String[] tagNameList; +} diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovDraftContentDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovDraftContentDTO.java new file mode 100644 index 0000000000..1b0530e3e4 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovDraftContentDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 政府端：文章预览接口返参DTO-内容列表 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/5 12:10 + */ +@Data +public class GovDraftContentDTO implements Serializable { + private static final long serialVersionUID = 5653062658148122552L; + + /** + * 内容类型，图片：img；文字：text + */ + private String contentType; + + /** + * 内容 + */ + private String content; + +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index bb1013913f..fbd76b780f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -347,4 +347,18 @@ public class ArticleController { ValidatorUtils.validateEntity(articleDetailFormDTO,ResiArticleDetailFormDTO.ResiArticleDetailInternalGroup.class); return new Result().ok(articleService.getArticleDetail(articleDetailFormDTO)); } + + /** + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei@elink-cn.com + * @description 政府端：文章预览 + * @date 2020/6/5 10:56 + **/ + @PostMapping("draftdetail") + public Result queryDraftDetail(@RequestBody DraftDetailFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class); + DraftDetailResultDTO draftDetailResultDTO = draftService.queryDraftDetail(formDTO); + return new Result().ok(draftDetailResultDTO); + } } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java index 4daa493ba0..39b47a54f9 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java @@ -36,40 +36,40 @@ public interface DraftDao extends BaseDao { /** * 政府端查询草稿内容详情 * - * @param draftId - * 草稿id + * @param draftId 草稿id + * @author yinzuomei */ DraftContentResultDTO selectDraftContent(String draftId); /** * 政府端查询草稿内容详情 * - * @param draftId - * 草稿id + * @param draftId 草稿id + * @author yinzuomei */ List selectDraftContentDetail(String draftId); /** * 政府端：选中草稿编辑，获取草稿属性 * - * @param draftId - * 草稿id + * @param draftId 草稿id + * @author yinzuomei */ DraftAttrResultDTO selectDraftAttr(String draftId); /** * 政府端：选中草稿编辑，获取草稿属性-封面信息 * - * @param draftId - * 草稿id + * @param draftId 草稿id + * @author yinzuomei */ CoverImgDTO selectDraftCoverImg(String draftId); /** * 政府端：选中草稿编辑，获取草稿属性-已选择发布网格 * - * @param draftId - * 草稿id + * @param draftId 草稿id + * @author yinzuomei */ List selectDraftGrids(String draftId); @@ -81,4 +81,22 @@ public interface DraftDao extends BaseDao { * @return java.util.List */ List selectDraftList(@Param("userId") String userId); + + /** + * @param draftId + * @return com.epmet.dto.result.DraftDetailResultDTO + * @author yinzuomei@elink-cn.com + * @description 文章预览-获取文章基本属性 + * @date 2020/6/5 12:23 + **/ + DraftDetailResultDTO selectDraftDetail(String draftId); + + /** + * @param draftId + * @return java.util.List + * @author yinzuomei@elink-cn.com + * @description 文章预览-获取文章内容列表 + * @date 2020/6/5 12:23 + **/ + List selectDraftContentList(String draftId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java index ad56f053a9..a11c1361a3 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java @@ -26,6 +26,7 @@ import com.epmet.dto.form.DraftDetailFormDTO; 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.entity.DraftEntity; import java.util.List; @@ -137,4 +138,14 @@ public interface DraftService extends BaseService { * @return java.util.List */ PageData draftList(TokenDto tokenDto, DraftListFormDTO formDTO); + + /** + * 政府端：文章预览 + * + * @param formDTO + * @return com.epmet.dto.result.DraftContentResultDTO + * @author yinzuomei@elink-cn.com + * @date 2020-06-03 + */ + DraftDetailResultDTO queryDraftDetail(DraftDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java index 709da69d32..1cd8271353 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java @@ -31,10 +31,7 @@ import com.epmet.dto.DraftDTO; import com.epmet.dto.form.DeleteDraftFormDTO; import com.epmet.dto.form.DraftDetailFormDTO; import com.epmet.dto.form.DraftListFormDTO; -import com.epmet.dto.result.CoverImgDTO; -import com.epmet.dto.result.DraftAttrResultDTO; -import com.epmet.dto.result.DraftContentResultDTO; -import com.epmet.dto.result.DraftListResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.DraftEntity; import com.epmet.redis.DraftRedis; import com.epmet.service.DraftService; @@ -159,4 +156,18 @@ public class DraftServiceImpl extends BaseServiceImpl imp return new PageData<>(resultList, pageInfo.getTotal()); } + @Override + public DraftDetailResultDTO queryDraftDetail(DraftDetailFormDTO formDTO) { + DraftDetailResultDTO draftDetailResultDTO=baseDao.selectDraftDetail(formDTO.getDraftId()); + if(null!=draftDetailResultDTO){ + List articleContentList=baseDao.selectDraftContentList(formDTO.getDraftId()); + draftDetailResultDTO.setArticleContentList(articleContentList); + if (StringUtils.isNoneBlank(draftDetailResultDTO.getTags())) { + String[] tagNames = draftDetailResultDTO.getTags().split("\\|"); + draftDetailResultDTO.setTagNameList(tagNames); + } + } + return draftDetailResultDTO; + } + } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml index a74713fd55..0c1f84593f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml @@ -96,4 +96,33 @@ AND (STATUS_FLAG = 'unpublish' OR STATUS_FLAG = 'auditfail') AND CREATED_BY = #{userId} + + + + \ No newline at end of file