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 9036988..40cbb4e 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 @@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.ModuleListFormDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.modules.news.service.NewsService; @@ -279,4 +280,16 @@ public class ApiNewsController { return newsService.getContentDetailById(id); } + /** + * @describe: 获取栏目列表 + * @author wangtong + * @date 2021/9/13 17:03 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getModuleList") + public Result getModuleList(ModuleListFormDTO dto) { + return newsService.getModuleList(dto); + } + } 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 a5367b1..6bcec4c 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,13 +2,16 @@ 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.ModuleListFormDTO; 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; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -199,4 +202,14 @@ public interface NewsFeignClient { @GetMapping(value ="news/epdc-app/notice/contentDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getContentDetailById(@PathVariable("id") String id); + /** + * @describe: 获取栏目列表 + * @author wangtong + * @date 2021/9/13 17:03 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value ="news/moduletype/getModuleList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getModuleList(ModuleListFormDTO dto); + } 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 7e11160..4db3908 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 @@ -3,11 +3,11 @@ package com.elink.esua.epdc.modules.news.feign.callback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ModuleListFormDTO; 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; @@ -98,4 +98,9 @@ public class NewsFeignClientFallback implements NewsFeignClient { public Result getContentDetailById(String id) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getContentDetailById", id); } + + @Override + public Result getModuleList(ModuleListFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getModuleList", dto); + } } 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 08ddb08..7dddbc4 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 @@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.news.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ModuleListFormDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; @@ -181,4 +182,13 @@ public interface NewsService { * @since 2021/8/28 21:25 */ Result getContentDetailById(String id); + + /** + * @describe: 获取栏目列表 + * @author wangtong + * @date 2021/9/13 17:03 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getModuleList(ModuleListFormDTO dto); } 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 917d0e2..0501cb5 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 @@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.news.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ModuleListFormDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.enums.ArticleSectionEnum; @@ -125,4 +126,9 @@ public class NewsServiceImpl implements NewsService { public Result getContentDetailById(String id) { return newsFeignClient.getContentDetailById(id); } + + @Override + public Result getModuleList(ModuleListFormDTO dto) { + return newsFeignClient.getModuleList(dto); + } }