DTO修改

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -36,7 +36,7 @@ import com.epmet.dto.form.ArticlePageFormDTO;
 import com.epmet.dto.form.CommonArticleListFormDTO;
 import com.epmet.dto.result.ArticleBannerResultDTO;
 import com.epmet.dto.result.ArticleLatestResultDTO;
-import com.epmet.dto.result.ArticleListResultDTO;
+import com.epmet.dto.result.ArticleWithTagsResultDTO;
 import com.epmet.excel.ArticleExcel;
 import com.epmet.service.ArticleOperateRecordService;
 import com.epmet.service.ArticleService;

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java

@@ -23,16 +23,13 @@ import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.dto.result.ArticleBannerResultDTO;
 import com.epmet.dto.result.ArticleDetailResultDTO;
 import com.epmet.dto.result.ArticleLatestResultDTO;
-import com.epmet.dto.result.ArticleListResultDTO;
+import com.epmet.dto.result.ArticleWithTagsResultDTO;
 import com.epmet.entity.ArticleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Set;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 文章表
@@ -126,7 +123,7 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
      * @author wangc
      * @date 2020.06.03 14:19
     **/
-    List<ArticleListResultDTO> selectArticleList(@Param("gridId") String gridId,@Param("tagIdList")List<String> tagIdList);
+    List<ArticleListResultDTO> selectArticleList(@Param("gridId") String gridId, @Param("tagIdList")List<String> tagIdList);
 
     /**
      * @Description 根绝文章Id查询出文章的内容、封面等相关信息，如果居民端传入的网格Id不在该文章的发布范围内，则返回NULL

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

@@ -38,7 +38,6 @@ import com.epmet.constant.RoleKeyConstants;
 import com.epmet.dao.*;
 import com.epmet.dto.ArticleDTO;
 import com.epmet.dto.ArticleVisitRecordDTO;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.feign.GovOrgSelfFeignClient;
 import com.epmet.dto.form.*;

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -226,6 +226,7 @@
         <result property="publishDate" column="publishDate"/>
         <result property="tags" column="tags"/>
         <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="visitRecordCount" column="visitRecordCount" />
         <collection property="articleContentList" ofType="com.epmet.dto.result.ArticleContentResultDTO">
            <result property="content" column="CONTENT" />
             <result property="contentType" column="CONTENT_TYPE" />

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java

@@ -1,34 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * @Description 居民端首页轮播查询接口DTO
- * @ClassName ArticleBannerFormDTO
- * @Auth wangc
- * @Date 2020-06-02 11:20
- */
-@Data
-public class CommonArticleListFormDTO implements Serializable {
-    private static final long serialVersionUID = 5996259506950697451L;
-
-    /**
-     * 内部错误分组
-     * */
-    public interface ArticleBannerInternalGroup{}
-
-    /**
-     * 网格Id
-     * */
-    @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class})
-    private String gridId;
-
-    /**
-     * 客户定制化条数(高级配置里的参数)
-     * */
-    private Integer num;
-
-}

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ArticleBannerResultDTO.java

@@ -1,31 +0,0 @@
-package com.epmet.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Description
- * @ClassName ArticleBannerResultDTO
- * @Auth wangc
- * @Date 2020-06-02 13:55
- */
-@Data
-public class ArticleBannerResultDTO implements Serializable {
-    private static final long serialVersionUID = 7764443348626371305L;
-
-    /**
-     * 文章Id
-     * */
-    private String articleId;
-
-    /**
-     * 封面图url
-     * */
-    private String coverImg;
-
-    /**
-     * 标题
-     * */
-    private String title;
-}

epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/result/ArticleLatestResultDTO.java

@@ -1,41 +0,0 @@
-package com.epmet.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Description
- * @ClassName ArticleLatestResultDTO
- * @Auth wangc
- * @Date 2020-06-02 17:11
- */
-@Data
-public class ArticleLatestResultDTO implements Serializable {
-    private static final long serialVersionUID = 6953266228209247094L;
-
-    /**
-     * 文章Id
-     * */
-    private String articleId;
-
-    /**
-     * 文章封面图片url
-     * */
-    private String articleCoverImg;
-
-    /**
-     * 文章标题
-     * */
-    private String articleTitle;
-
-    /**
-     * 发布单位名称
-     * */
-    private String publishName;
-
-    /**
-     * 发布时间（天级别） 时间戳
-     * */
-    private String publishDate;
-}

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -1,8 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.annotation.RequirePermission;
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -59,9 +57,9 @@ public class ArticleController {
      * @date 2020.06.03 14:19
      **/
     @PostMapping("articlelist")
-    public Result<List<ArticleListResultDTO>> articleList(@RequestBody ArticlePageFormDTO articlePageFormDTO){
+    public Result<List<ArticleWithTagsResultDTO>> articleList(@RequestBody ArticlePageFormDTO articlePageFormDTO){
         ValidatorUtils.validateEntity(articlePageFormDTO,ArticlePageFormDTO.ArticlePageInternalGroup.class);
-        return govVoiceFeignClient.resiArticleList(articlePageFormDTO);
+        return new Result<List<ArticleWithTagsResultDTO>>().ok(articleService.articleList(articlePageFormDTO));
     }
 
     /**

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/ArticleService.java

@@ -1,8 +1,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.ArticlePageFormDTO;
 import com.epmet.dto.form.ResiTagListFormDTO;
 import com.epmet.dto.form.TagCascadeListFormDTO;
+import com.epmet.dto.result.ArticleWithTagsResultDTO;
 import com.epmet.dto.result.TagInfoResultDTO;
 
 import java.util.List;
@@ -26,4 +28,13 @@ public interface ArticleService {
      * @author zxc
      */
     List<TagInfoResultDTO> tagCascadeList(TokenDto tokenDto, TagCascadeListFormDTO formDto);
+
+    /**
+     * @Description 根据网格Id和标签列表查找文章的相关信息列表 用处:居民端党建声音列表 返回的标签以数组形式
+     * @param articlePageFormDTO
+     * @return List<ArticleWithTagsResultDTO>
+     * @author wangc
+     * @date 2020.06.03 14:19
+     **/
+    List<ArticleWithTagsResultDTO> articleList(ArticlePageFormDTO articlePageFormDTO);
 }

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -1,15 +1,28 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.feign.GovVoiceFeignClient;
+import com.epmet.dto.form.ArticlePageFormDTO;
 import com.epmet.dto.form.ResiTagListFormDTO;
 import com.epmet.dto.form.TagCascadeListFormDTO;
+import com.epmet.dto.result.ArticleListResultDTO;
+import com.epmet.dto.result.ArticleWithTagsResultDTO;
 import com.epmet.dto.result.TagInfoResultDTO;
 import com.epmet.service.ArticleService;
+import com.epmet.utils.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 /**
@@ -44,4 +57,33 @@ public class ArticleServiceImpl implements ArticleService {
 //        formDto.setCustomerId(tokenDto.getCustomerId());
         return govVoiceFeignClient.tagCascadeList(formDto).getData();
     }
+
+    /**
+     * @Description 根据网格Id和标签列表查找文章的相关信息列表 用处:居民端党建声音列表 返回的标签以数组形式
+     * @param articlePageFormDTO
+     * @return List<ArticleWithTagsResultDTO>
+     * @author wangc
+     * @date 2020.06.03 14:19
+     **/
+    @Override
+    public List<ArticleWithTagsResultDTO> articleList(ArticlePageFormDTO articlePageFormDTO) {
+        Result<List<ArticleListResultDTO>> articles = govVoiceFeignClient.resiArticleList(articlePageFormDTO);
+        if(articles.success() && null != articles.getData() && articles.getData().size() > NumConstant.ZERO){
+            return articles.getData().stream().map(article -> {
+                ArticleWithTagsResultDTO artObj = ConvertUtils.sourceToTarget(article,ArticleWithTagsResultDTO.class);
+                artObj.setTagName(new HashSet<>());
+                if(StringUtils.isNotBlank(article.getTagName())){
+                    String[] tagArray = article.getTagName().split(ModuleConstant.VERTICAL_BAR_WITH_ESCAPE_CHARACTER);
+                    if(tagArray.length > NumConstant.ZERO){
+                        artObj.setTagName(new HashSet<>(Arrays.asList(tagArray)));
+                    }
+                }
+                return artObj;
+            }).collect(Collectors.toList());
+
+        }
+
+        throw new RenException(articles.getInternalMsg());
+    }
+
 }

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -0,0 +1,12 @@
+package com.epmet.utils;
+
+/**
+ * 常量类
+ * */
+public interface ModuleConstant {
+
+    /**
+     * 竖线的转义字符表示
+     * */
+    String VERTICAL_BAR_WITH_ESCAPE_CHARACTER = "\\|";
+}