From 81f350f103456e1e6ec22a274db0f02dde90f52e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 1 Jul 2022 16:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/DraftPcListResultDTO.java | 24 +++++++++++++++++-- .../dto/result/PublishedListResultDTO.java | 24 +++++++++++++++++-- .../service/impl/ArticleServiceImpl.java | 9 +++---- .../epmet/service/impl/DraftServiceImpl.java | 2 +- .../src/main/resources/mapper/ArticleDao.xml | 2 +- .../src/main/resources/mapper/DraftDao.xml | 2 +- 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java index 8ab389eb8f..273f8fe9ba 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java @@ -34,7 +34,7 @@ public class DraftPcListResultDTO implements Serializable { /** * 发布单位ID */ - private String publisherId; + private String publisher; /** * 发布单位 */ @@ -95,6 +95,26 @@ public class DraftPcListResultDTO implements Serializable { /** * 文章内容 */ - private List contentList; + private List contentList; + + @Data + public static class Content { + /** + * 内容 + */ + private String content; + /** + * 内容类型 图片：img；文字：text；文件：file；视频：video；富文本：rich_text + */ + private String contentType; + /** + * 文件名称 + */ + private String fileName; + /** + * 内容顺序 从1开始 + */ + private Integer orderNum; + } } diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java index fd0ece2918..55317885a1 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java @@ -36,7 +36,7 @@ public class PublishedListResultDTO implements Serializable { /** * 发布单位ID */ - private String publisherId; + private String publisher; /** * 发布单位 */ @@ -97,5 +97,25 @@ public class PublishedListResultDTO implements Serializable { /** * 文章内容 */ - private List contentList; + private List contentList; + + @Data + public static class Content { + /** + * 内容 + */ + private String content; + /** + * 内容类型 图片：img；文字：text；文件：file；视频：video；富文本：rich_text + */ + private String contentType; + /** + * 文件名称 + */ + private String fileName; + /** + * 内容顺序 从1开始 + */ + private Integer orderNum; + } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 4d9549075d..828982ac8b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -48,10 +48,7 @@ import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.*; import com.epmet.dao.*; -import com.epmet.dto.ArticleVisitRecordDTO; -import com.epmet.dto.CustomerStaffDTO; -import com.epmet.dto.DraftCoverDTO; -import com.epmet.dto.DraftDTO; +import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; @@ -1735,8 +1732,8 @@ public class ArticleServiceImpl extends BaseServiceImpl contentEntityList = articleContentDao.selectList(tWrapper1); - if (!CollectionUtils.isEmpty(entityList)) { - List contentList = contentEntityList.stream().map(ArticleContentEntity::getContent).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(contentEntityList)) { + List contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class); resultDTO.setContentList(contentList); } 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 e44014d13c..5d786be693 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 @@ -270,7 +270,7 @@ public class DraftServiceImpl extends BaseServiceImpl imp tWrapper1.orderByDesc(DraftContentEntity::getOrderNum); List contentEntityList = draftContentDao.selectList(tWrapper1); if (!CollectionUtils.isEmpty(contentEntityList)) { - List contentList = contentEntityList.stream().map(DraftContentEntity::getContent).collect(Collectors.toList()); + List contentList = ConvertUtils.sourceToTarget(contentEntityList, DraftPcListResultDTO.Content.class); resultDTO.setContentList(contentList); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index b650f3094c..4c471430a3 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -432,7 +432,7 @@ a.title AS "title", IFNULL(a.preview_content, "") AS "previewContent", a.publish_range_desc AS "publishRangeDesc", - a.publisher_id AS "publisherId", + a.publisher_id AS "publisher", a.publisher_name AS "publisherName", a.publisher_type AS "publisherType", a.publish_date AS "publishDate", 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 1c2e4d36b2..8c94443ac1 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 @@ -184,7 +184,7 @@ a.title AS "title", IFNULL(a.preview_content, "") AS "previewContent", a.publish_range_desc AS "publishRangeDesc", - a.publisher_id AS "publisherId", + a.publisher_id AS "publisher", a.publisher_name AS "publisherName", a.publisher_type AS "publisherType", a.publish_date AS "publishDate",