From 353cf1f3d5a984af1b20bac3d9965dfe0adb6f7c Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 28 Aug 2021 21:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20init=201=E3=80=81=E7=A4=BE=E5=8C=BA=E8=B5=84=E8=AE=AF-?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E5=88=97=E8=A1=A8=201=E3=80=81=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E8=B5=84=E8=AE=AF-=E8=B5=84=E8=AE=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=201=E3=80=81=E7=A4=BE=E5=8C=BA=E8=B5=84=E8=AE=AF-?= =?UTF-8?q?=E8=B5=84=E8=AE=AF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../news/controller/ApiNewsController.java | 39 +++++++++++++++++++ .../modules/news/feign/NewsFeignClient.java | 33 ++++++++++++++++ .../callback/NewsFeignClientFallback.java | 16 ++++++++ .../modules/news/service/NewsService.java | 29 ++++++++++++++ .../news/service/impl/NewsServiceImpl.java | 15 +++++++ epdc-cloud-client-yushan | 2 +- 6 files changed, 133 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java index a0d54b1..c10ded0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/controller/ApiNewsController.java @@ -239,4 +239,43 @@ public class ApiNewsController { return newsService.listCategoryBySection(sectionCode); } + /** + * 社区资讯-栏目列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/28 21:15 + */ + @GetMapping("contentModuleList") + public Result> listContentModules() { + return newsService.listContentModules(); + } + + /** + * 社区资讯-资讯列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/28 21:22 + */ + @GetMapping("contentList") + public Result> listContents(EpdcContentListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return newsService.listContents(formDto); + } + + /** + * 社区资讯-资讯详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/8/28 21:24 + */ + @GetMapping("contentDetail/{id}") + public Result getContentDetailById(@PathVariable("id") String id) { + return newsService.getContentDetailById(id); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java index f36b302..f94c98b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.news.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.modules.news.feign.callback.NewsFeignClientFallback; @@ -166,4 +167,36 @@ public interface NewsFeignClient { @GetMapping("news/epdc-app/newscategory/listCategoryBySection/{sectionCode}") Result> listCategoryCodeBySection(@PathVariable("sectionCode") String sectionCode); + /** + * 社区资讯-栏目列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/28 21:15 + */ + @GetMapping("contentModuleList") + Result> listContentModules(); + + /** + * 社区资讯-资讯列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/28 21:22 + */ + @GetMapping("contentList") + Result> listContents(EpdcContentListFormDTO formDto); + + /** + * 社区资讯-资讯详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/8/28 21:24 + */ + @GetMapping("contentDetail/{id}") + Result getContentDetailById(@PathVariable("id") String id); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java index 9df8b1a..7e11160 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/callback/NewsFeignClientFallback.java @@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.modules.news.feign.NewsFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -82,4 +83,19 @@ public class NewsFeignClientFallback implements NewsFeignClient { public Result> listCategoryCodeBySection(String sectionCode) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listCategoryCodeBySection", sectionCode); } + + @Override + public Result> listContentModules() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listContentModules"); + } + + @Override + public Result> listContents(EpdcContentListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listContents", formDto); + } + + @Override + public Result getContentDetailById(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getContentDetailById", id); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java index 398c13c..08ddb08 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/NewsService.java @@ -152,4 +152,33 @@ public interface NewsService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO); + + /** + * 社区资讯-栏目列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/28 21:18 + */ + Result> listContentModules(); + + /** + * 社区资讯-资讯列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/28 21:25 + */ + Result> listContents(EpdcContentListFormDTO formDto); + + /** + * 社区资讯-资讯详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/8/28 21:25 + */ + Result getContentDetailById(String id); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java index f154626..917d0e2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/service/impl/NewsServiceImpl.java @@ -110,4 +110,19 @@ public class NewsServiceImpl implements NewsService { } return new Result(); } + + @Override + public Result> listContentModules() { + return newsFeignClient.listContentModules(); + } + + @Override + public Result> listContents(EpdcContentListFormDTO formDto) { + return newsFeignClient.listContents(formDto); + } + + @Override + public Result getContentDetailById(String id) { + return newsFeignClient.getContentDetailById(id); + } } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 1b9f0fa..7c93eb1 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 1b9f0fa7529fc1601f10d50dde8d5e5cbcf004f7 +Subproject commit 7c93eb1622946c99e4476b6d586628a04c344f7d