diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java index 51ed6bc69b..5cc2770018 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/GovArticleDetailResultDTO.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; @@ -48,10 +49,16 @@ public class GovArticleDetailResultDTO implements Serializable { private String publishRangeDesc; /** - * 标签字符串 + * 标签字符串-已废弃,不会返给前端 */ + @JsonIgnore private String tags; + /** + * 文章关联标签集合 + */ + private String[] tagNameList; + /** * 发布状态 已发布:published;已下线:offline */ 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 37c457dc52..a9b056a74e 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 @@ -269,6 +269,10 @@ public class ArticleServiceImpl extends BaseServiceImpl articleContentList = baseDao.queryGovArticleContent(articleId); articleDetail.setArticleContentList(articleContentList); + if (StringUtils.isNoneBlank(articleDetail.getTags())) { + String[] tagNames = articleDetail.getTags().split("\\|"); + articleDetail.setTagNameList(tagNames); + } } return articleDetail; }