From 4808ccf83f214ba61547d09f06448b6664b63b6e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 Jun 2020 16:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E3=80=81=E5=B7=B2?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E6=96=B0?= =?UTF-8?q?=E5=A2=9EtagNameList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/GovArticleDetailResultDTO.java | 9 ++++++++- .../java/com/epmet/service/impl/ArticleServiceImpl.java | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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; }