From f49e0c52b4fe3b233469fc39e6bb86013d2ea2e5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 16 Jul 2021 15:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-=E7=83=AD?= =?UTF-8?q?=E9=97=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/PreviewResultDTO.java | 19 ++++++++++ .../controller/SpecialSubjectController.java | 18 +++++++-- .../main/java/com/epmet/dao/ArticleDao.java | 2 + .../java/com/epmet/dao/SpecialSubjectDao.java | 3 ++ .../epmet/entity/SpecialSubjectEntity.java | 2 +- .../com/epmet/service/ArticleService.java | 11 ++++++ .../epmet/service/SpecialSubjectService.java | 15 ++++++-- .../service/impl/ArticleServiceImpl.java | 15 ++++++++ .../impl/SpecialSubjectServiceImpl.java | 38 +++++++++++++++---- .../src/main/resources/mapper/ArticleDao.xml | 29 ++++++++++++++ .../resources/mapper/SpecialSubjectDao.xml | 11 ++++++ 11 files changed, 147 insertions(+), 16 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PreviewResultDTO.java diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PreviewResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PreviewResultDTO.java new file mode 100644 index 0000000000..16681096c8 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PreviewResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2021/7/16 14:26 + */ +@Data +public class PreviewResultDTO implements Serializable { + private static final long serialVersionUID = 4801322472642418941L; + private String specialSubjectId; + private String tagName; + private List articleList; +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java index 32d54beb1d..315a0e54cf 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java @@ -21,11 +21,9 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.AddSpecialSubjectFormDTO; -import com.epmet.dto.form.DelSpecialSubjectFormDTO; -import com.epmet.dto.form.HotSubjectTagFormDTO; -import com.epmet.dto.form.QuerySpecialSubFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.AddSpecialSubjectResultDTO; +import com.epmet.dto.result.PreviewResultDTO; import com.epmet.dto.result.TagInfoResultDTO; import com.epmet.dto.result.WorkSpecialSubjectResultDTO; import com.epmet.service.SpecialSubjectService; @@ -108,4 +106,16 @@ public class SpecialSubjectController { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(specialSubjectService.hotSubjectTagList(formDTO)); } + + /** + * 效果预览 + * @author zhaoqifeng + * @date 2021/7/16 15:54 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("preview") + public Result> preview(@RequestBody PreviewFormDTO formDTO) { + return new Result>().ok(specialSubjectService.preview(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java index 82d269b257..1650ee5fb2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java @@ -131,6 +131,8 @@ public interface ArticleDao extends BaseDao { **/ List selectArticleList(@Param("gridId") String gridId, @Param("tagIdList") List tagIdList); + List selectArticleListByTag(@Param("tagId") String tagId, @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize); + /** * @param gridId * @param articleId diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java index fe2da402c6..0ada844144 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/SpecialSubjectDao.java @@ -37,4 +37,7 @@ public interface SpecialSubjectDao extends BaseDao { int delSpecialSubject(@Param("id") String id, @Param("userId") String userId); List queryExistedList(@Param("orgId") String orgId,@Param("notList")List notList); + + SpecialSubjectEntity getInfo(@Param("tagId") String tagId); + } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java index 6f0f61ed9a..315224b46f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java @@ -44,7 +44,7 @@ public class SpecialSubjectEntity extends BaseEpmetEntity { * 标签id */ private String tagId; - + private String tagName; /** * 新增此专题的用户id */ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 96da85b8b9..db03b3a0c5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -232,4 +232,15 @@ public interface ArticleService extends BaseService { * @date 2021/7/15 5:22 下午 */ List subjectList(SubjectListFormDTO formDTO); + + /** + * 根据tag查找文章列表 + * @author zhaoqifeng + * @date 2021/7/16 14:50 + * @param tagId + * @param pageNo + * @param pageSize + * @return java.util.List + */ + List getArticleListByTag(String tagId, Integer pageNo, Integer pageSize); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java index 42b1831117..8fa6bd1aa7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/SpecialSubjectService.java @@ -20,11 +20,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.SpecialSubjectDTO; -import com.epmet.dto.form.HotSubjectTagFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.PreviewResultDTO; import com.epmet.dto.result.TagInfoResultDTO; -import com.epmet.dto.form.AddSpecialSubjectFormDTO; -import com.epmet.dto.form.DelSpecialSubjectFormDTO; -import com.epmet.dto.form.QuerySpecialSubFormDTO; import com.epmet.dto.result.AddSpecialSubjectResultDTO; import com.epmet.dto.result.WorkSpecialSubjectResultDTO; import com.epmet.entity.SpecialSubjectEntity; @@ -138,4 +136,13 @@ public interface SpecialSubjectService extends BaseService * @date 2021-07-15 */ List queryExistedList(QuerySpecialSubFormDTO formDTO); + + /** + * 效果预览 + * @author zhaoqifeng + * @date 2021/7/16 14:28 + * @param formDTO + * @return java.util.List + */ + List preview(PreviewFormDTO formDTO); } \ No newline at end of file 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 01855ac3a7..d4bacc8197 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 @@ -1419,4 +1419,19 @@ public class ArticleServiceImpl extends BaseServiceImpl(); } + + /** + * 根据tag查找文章列表 + * + * @param tagId + * @param pageNo + * @param pageSize + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/16 14:47 + */ + @Override + public List getArticleListByTag(String tagId, Integer pageNo, Integer pageSize) { + return baseDao.selectArticleListByTag(tagId, pageNo, pageSize); + } } 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 a4cff4251e..7228c102f8 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 @@ -33,13 +33,11 @@ import com.epmet.dao.SpecialSubjectDao; import com.epmet.dto.SpecialSubjectDTO; import com.epmet.dto.TagCustomerDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.AddSpecialSubjectResultDTO; -import com.epmet.dto.result.MineResultDTO; -import com.epmet.dto.result.TagInfoResultDTO; -import com.epmet.dto.result.WorkSpecialSubjectResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.SpecialSubjectEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.redis.TagRedis; +import com.epmet.service.ArticleService; import com.epmet.service.SpecialSubjectService; import com.epmet.service.TagCustomerService; import lombok.extern.slf4j.Slf4j; @@ -68,9 +66,12 @@ import java.util.stream.Stream; public class SpecialSubjectServiceImpl extends BaseServiceImpl implements SpecialSubjectService { @Autowired private TagCustomerService tagCustomerService; - @Resource private TagRedis tagRedis; + @Autowired + private GovOrgOpenFeignClient govOrgOpenFeignClient; + @Resource + private ArticleService articleService; @Override public PageData page(Map params) { @@ -123,8 +124,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl + * @author zhaoqifeng + * @date 2021/7/16 14:28 + */ + @Override + public List preview(PreviewFormDTO formDTO) { + List result = new ArrayList<>(); + formDTO.getTagIdList().forEach(tagId -> { + PreviewResultDTO previewResultDTO = new PreviewResultDTO(); + SpecialSubjectEntity subjectEntity = baseDao.getInfo(tagId); + previewResultDTO.setSpecialSubjectId(subjectEntity.getId()); + previewResultDTO.setTagName(subjectEntity.getTagName()); + previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo(), formDTO.getPageSize())); + result.add(previewResultDTO); + }); + return result; + + } + } \ No newline at end of file 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 dd57d15464..103a6d7135 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 @@ -388,5 +388,34 @@ #{pid} + diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml index d78a75baea..706460004d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml @@ -27,4 +27,15 @@ order by ss.CREATED_TIME desc + \ No newline at end of file