From c7baee6f298c136263b022c7fddef5054489da76 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 3 Jun 2020 15:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF=EF=BC=9A=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E8=8D=89=E7=A8=BF=E7=BC=96=E8=BE=91=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=8D=89=E7=A8=BF=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CoverImgDTO.java | 15 ++++++ .../epmet/dto/result/DraftAttrResultDTO.java | 53 +++++++++++++++++-- .../epmet/controller/ArticleController.java | 4 +- .../src/main/java/com/epmet/dao/DraftDao.java | 26 +++++++++ .../java/com/epmet/service/DraftService.java | 16 +++++- .../epmet/service/impl/DraftServiceImpl.java | 27 ++++++++-- .../src/main/resources/mapper/DraftDao.xml | 49 ++++++++++++++++- 7 files changed, 178 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CoverImgDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CoverImgDTO.java index 5ec196e1df..d0e8f0f393 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CoverImgDTO.java +++ b/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; } diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftAttrResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftAttrResultDTO.java index a169bfa09f..3a4e3ab481 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftAttrResultDTO.java +++ b/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 tagNameList; + + /** + * 标签名称数组， 竖杠分割的标签名称 + */ + private String[] tagNameList; + + /** + * 是否置顶 1是；0 否 + */ private Integer isTop; + + /** + * 网格Id数组 + */ private List 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; } 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 9181c44b61..83c11a43be 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 @@ -170,7 +170,7 @@ public class ArticleController { @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT) public Result getContent(@RequestBody DraftDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class); - DraftContentResultDTO draftContent=draftService.queryDraftContent(formDTO.getDraftId()); + DraftContentResultDTO draftContent=draftService.queryDraftContent(formDTO); return new Result().ok(draftContent); } @@ -185,7 +185,7 @@ public class ArticleController { @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT) public Result getAttr(@RequestBody DraftDetailFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class); - DraftAttrResultDTO draftAttrResultDTO=new DraftAttrResultDTO(); + DraftAttrResultDTO draftAttrResultDTO=draftService.getDraftAttr(formDTO); return new Result().ok(draftAttrResultDTO); } } \ 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 f2b4309256..b076f274e1 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 @@ -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 { * 草稿id */ List selectDraftContentDetail(String draftId); + + /** + * 政府端：选中草稿编辑，获取草稿属性 + * + * @param draftId + * 草稿id + */ + DraftAttrResultDTO selectDraftAttr(String draftId); + + /** + * 政府端：选中草稿编辑，获取草稿属性-封面信息 + * + * @param draftId + * 草稿id + */ + CoverImgDTO selectDraftCoverImg(String draftId); + + /** + * 政府端：选中草稿编辑，获取草稿属性-已选择发布网格 + * + * @param draftId + * 草稿id + */ + List selectDraftGrids(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 de1944c3db..704d532cc8 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 @@ -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 { /** * 政府端：选中草稿编辑，获取草稿内容 * - * @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); } \ 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 6220d111d9..80b8e4fa21 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 @@ -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 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 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; + } + } \ 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 46f3b12971..e992fe31b1 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 @@ -12,7 +12,7 @@ SELECT - dc.id, + dc.ID, dc.CONTENT, dc.CONTENT_TYPE, dc.ORDER_NUM, @@ -39,4 +39,49 @@ ORDER BY dc.ORDER_NUM ASC + + + + + + + + + \ No newline at end of file