Merge remote-tracking branch 'origin/dev_special_subject' into dev_special_subject

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;
 }

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 = "";
+    }
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -287,9 +287,9 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
         if (CollectionUtils.isNotEmpty(formDTO.getTagIdList())) {
             formDTO.getTagIdList().forEach(tagId -> {
                 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);
             });

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'
@@ -394,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'