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 new file mode 100644 index 0000000000..5ec196e1df --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CoverImgDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 政府端:选中草稿编辑,获取草稿属性-封面图片 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/3 14:26 + */ +@Data +public class CoverImgDTO implements Serializable { + private static final long serialVersionUID = -6735712590479867385L; + private String coverId; + 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 new file mode 100644 index 0000000000..a169bfa09f --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftAttrResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 政府端:选中草稿编辑,获取草稿属性 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/3 14:15 + */ +@Data +public class DraftAttrResultDTO implements Serializable { + private static final long serialVersionUID = 6999941497971286747L; + private String draftId; + private CoverImgDTO coverImg; + private List tagNameList; + private Integer isTop; + private List gridIdList; + private String publisher; + private String publisherName; + @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") + private Date publishDate; + private String title; + private String publishRangeDesc; + private String tags; + private String publisherType; +} diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentDetailDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentDetailDTO.java index d10f71c8a2..d468ffb81a 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentDetailDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentDetailDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * 描述一下 + * 政府端:选中草稿编辑,获取草稿内容返参明细 * * @author yinzuomei@elink-cn.com * @date 2020/6/3 13:14 diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentResultDTO.java index 57951c0016..0394760301 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentResultDTO.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.List; /** - * 描述一下 + * 政府端:选中草稿编辑,获取草稿内容返参 * * @author yinzuomei@elink-cn.com * @date 2020/6/3 13:01 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 1ed4be825c..9181c44b61 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 @@ -34,10 +34,7 @@ import com.epmet.dto.form.ArticleOperationFormDTO; import com.epmet.dto.form.DraftContentFromDTO; import com.epmet.dto.form.DraftDetailFormDTO; import com.epmet.dto.form.GovArticleDetailFormDTO; -import com.epmet.dto.result.ArticleGridResultDTO; -import com.epmet.dto.result.ArticleOperationResultDTO; -import com.epmet.dto.result.DraftContentResultDTO; -import com.epmet.dto.result.GovArticleDetailResultDTO; +import com.epmet.dto.result.*; import com.epmet.excel.ArticleExcel; import com.epmet.service.ArticleOperateRecordService; import com.epmet.service.ArticleService; @@ -186,8 +183,9 @@ public class ArticleController { **/ @PostMapping("getattr") @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT) - public Result getAttr(@RequestBody DraftDetailFormDTO formDTO) { + public Result getAttr(@RequestBody DraftDetailFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class); - return new Result(); + DraftAttrResultDTO draftAttrResultDTO=new DraftAttrResultDTO(); + return new Result().ok(draftAttrResultDTO); } } \ No newline at end of file