diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java index 3bbc14112f..888d2f16eb 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/GovVoiceOpenFeignClient.java @@ -80,5 +80,22 @@ public interface GovVoiceOpenFeignClient { @PostMapping("/gov/voice/article/resiarticledetail") Result resiArticleDetail(@RequestBody ResiArticleDetailFormDTO articleDetailFormDTO); + /** + * @Description 专题文章列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:26 下午 + */ + @PostMapping("/gov/voice/article/subjectarticlelist") + Result> subjectArticleList(@RequestBody SubjectArticleListFormDTO formDTO); + + /** + * @Description 专题列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:26 下午 + */ + @PostMapping("/gov/voice/article/subjectlist") + Result> subjectList(@RequestBody SubjectListFormDTO formDTO); } diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java index 9ed332730a..c2d0d3c4cb 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/feign/fallback/GovVoiceOpenFeignClientFallback.java @@ -47,4 +47,14 @@ public class GovVoiceOpenFeignClientFallback implements GovVoiceOpenFeignClient public Result resiArticleDetail(ResiArticleDetailFormDTO articleDetailFormDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "resiArticleDetail", articleDetailFormDTO); } + + @Override + public Result> subjectArticleList(SubjectArticleListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "subjectArticleList", formDTO); + } + + @Override + public Result> subjectList(SubjectListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_VOICE_SERVER, "subjectList", formDTO); + } } diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java index 2a8bbfd988..e4e7d5628e 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -4,13 +4,8 @@ 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.ArticlePageFormDTO; -import com.epmet.dto.form.ResiArticleDetailFormDTO; -import com.epmet.dto.form.ResiTagListFormDTO; -import com.epmet.dto.form.TagCascadeListFormDTO; -import com.epmet.dto.result.ArticleDetailResultDTO; -import com.epmet.dto.result.ArticleWithTagsResultDTO; -import com.epmet.dto.result.TagInfoResultDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; import com.epmet.feign.GovVoiceOpenFeignClient; import com.epmet.service.ArticleService; import org.springframework.beans.factory.annotation.Autowired; @@ -79,4 +74,28 @@ public class ArticleController { return govVoiceOpenFeignClient.resiArticleDetail(articleDetailFormDTO); } + /** + * @Description 专题文章列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:30 下午 + */ + @PostMapping("subjectarticlelist") + public Result> subjectArticleList(@RequestBody SubjectArticleListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,SubjectArticleListFormDTO.SubjectArticleListForm.class); + return new Result>().ok(articleService.subjectArticleList(formDTO)); + } + + /** + * @Description 专题列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:30 下午 + */ + @PostMapping("subjectlist") + public Result> subjectList(@RequestBody SubjectListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, SubjectListFormDTO.SubjectListForm.class); + return new Result>().ok(articleService.subjectList(formDTO)); + } + } diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/ArticleService.java index d84c9fb966..ff95816e96 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -1,10 +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.form.*; import com.epmet.dto.result.ArticleWithTagsResultDTO; +import com.epmet.dto.result.SubjectArticleListResultDTO; +import com.epmet.dto.result.SubjectListResultDTO; import com.epmet.dto.result.TagInfoResultDTO; import java.util.List; @@ -37,4 +37,20 @@ public interface ArticleService { * @date 2020.06.03 14:19 **/ List articleList(ArticlePageFormDTO articlePageFormDTO); + + /** + * @Description 专题文章列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:31 下午 + */ + List subjectArticleList(SubjectArticleListFormDTO formDTO); + + /** + * @Description 专题列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:31 下午 + */ + List subjectList(SubjectListFormDTO formDTO); } diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index 55ad32285d..72b5def2d8 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -5,12 +5,8 @@ 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.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.dto.form.*; +import com.epmet.dto.result.*; import com.epmet.feign.GovVoiceOpenFeignClient; import com.epmet.service.ArticleService; import com.epmet.utils.ModuleConstant; @@ -89,4 +85,34 @@ public class ArticleServiceImpl implements ArticleService { throw new RenException(articles.getInternalMsg()); } + /** + * @Description 专题文章列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:31 下午 + */ + @Override + public List subjectArticleList(SubjectArticleListFormDTO formDTO) { + Result> listResult = govVoiceOpenFeignClient.subjectArticleList(formDTO); + if (!listResult.success()){ + throw new RenException("resi-voice调用gov-voice查询 专题文章列表失败【"+listResult.getMsg()+"】"); + } + return listResult.getData(); + } + + /** + * @Description 专题列表 + * @Param formDTO + * @author zxc + * @date 2021/7/16 1:31 下午 + */ + @Override + public List subjectList(SubjectListFormDTO formDTO) { + Result> listResult = govVoiceOpenFeignClient.subjectList(formDTO); + if (!listResult.success()){ + throw new RenException("resi-voice调用gov-voice查询 专题列表失败【"+listResult.getMsg()+"】"); + } + return listResult.getData(); + } + }