From b7408416c6a720e72f202deb11cc0d7e274719ea Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 20 Jul 2021 17:02:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/SubjectArticleListResultDTO.java | 14 ++++++++++++++ .../src/main/resources/mapper/ArticleDao.xml | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/SubjectArticleListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/SubjectArticleListResultDTO.java index d280126528..dc26eb1fbe 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/SubjectArticleListResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/SubjectArticleListResultDTO.java @@ -44,4 +44,18 @@ public class SubjectArticleListResultDTO implements Serializable { */ private String tagNames; + /** + * 文章封面 + */ + private String articleCoverImg; + + public SubjectArticleListResultDTO() { + this.articleTitle = ""; + this.articleContent = ""; + this.articleId = ""; + this.publisherName = ""; + this.publishDate = ""; + this.tagNames = ""; + this.articleCoverImg = ""; + } } 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 c46370b357..e646bd8616 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 @@ -355,11 +355,13 @@ art.PUBLISHER_NAME AS publisherName, art.PUBLISH_DATE AS publishDate, IFNULL( art.PREVIEW_CONTENT, '' ) AS articleContent, - IFNULL( art.TAGS, '' ) AS tagNames + IFNULL( art.TAGS, '' ) AS tagNames, + IFNULL(ac.IMG_URL,'') AS articleCoverImg FROM ARTICLE art LEFT JOIN ARTICLE_PUBLISH_RANGE prange ON (art.ID = prange.ARTICLE_ID AND prange.DEL_FLAG = '0' AND prange.PUBLISH_STATUS = 'published' AND prange.GRID_ID = #{gridId} ) LEFT JOIN article_tags ats ON (ats.ARTICLE_ID = art.ID) + LEFT JOIN article_cover ac ON (ac.ARTICLE_ID = art.ID AND ac.DEL_FLAG = 0) WHERE art.DEL_FLAG = '0' AND art.STATUS_FLAG = 'published' From f08dfc9d2f942bba2277f774a21a7807a922b525 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 17:20:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E9=A2=84=E8=A7=88=E5=B0=81=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/ArticleListResultDTO.java | 4 ++++ .../gov-voice-server/src/main/resources/mapper/ArticleDao.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/ArticleListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/ArticleListResultDTO.java index 04d4f14a27..5d420de782 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/ArticleListResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/ArticleListResultDTO.java @@ -43,4 +43,8 @@ public class ArticleListResultDTO implements Serializable { * */ private String tagName; + /** + * 文章封面 + * */ + private String articleCoverImg; } 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 e646bd8616..03351836b9 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 @@ -396,17 +396,20 @@ art.ID AS articleId, art.TITLE AS articleTitle, art.PUBLISHER_NAME AS publishName, + ac.IMG_URL AS articleCoverImg, date_format(art.PUBLISH_DATE,'%Y-%m-%d') AS publishDate, IFNULL(art.PREVIEW_CONTENT,'') AS articleContent, IFNULL(art.TAGS,'') AS tagName FROM ARTICLE art + INNER JOIN article_cover ac ON art.ID = ac.ARTICLE_ID INNER JOIN ARTICLE_PUBLISH_RANGE prange ON art.ID = prange.ARTICLE_ID AND prange.DEL_FLAG = '0' AND prange.PUBLISH_STATUS = 'published' + WHERE art.DEL_FLAG = '0' AND art.STATUS_FLAG = 'published' From 0232b16fbfd459d65459d5de5970cbfd055915eb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Jul 2021 17:30:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E9=A2=84=E8=A7=88=E5=B0=81=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/SpecialSubjectServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index c8acefc253..eca2ec488a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -285,9 +285,9 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl { PreviewResultDTO previewResultDTO = new PreviewResultDTO(); - SpecialSubjectDTO subject = baseDao.getInfo(tagId); - previewResultDTO.setSpecialSubjectId(subject.getId()); - previewResultDTO.setTagName(subject.getTagName()); +// SpecialSubjectDTO subject = baseDao.getInfo(tagId); +// previewResultDTO.setSpecialSubjectId(subject.getId()); +// previewResultDTO.setTagName(subject.getTagName()); previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); result.add(previewResultDTO); });