From ae598818de6b81906bc30a911aadfb084f477ded Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 13 Sep 2021 17:29:48 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=A0=8F=E7=9B=AE=E5=88=97=E8=A1=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6bd4f861 --- .../modules/news/controller/ApiNewsController.java | 13 ------------- .../epdc/modules/news/feign/NewsFeignClient.java | 10 ---------- .../feign/callback/NewsFeignClientFallback.java | 7 +------ .../esua/epdc/modules/news/service/NewsService.java | 10 ---------- .../modules/news/service/impl/NewsServiceImpl.java | 6 ------ 5 files changed, 1 insertion(+), 45 deletions(-) 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 40cbb4e..9036988 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,7 +5,6 @@ 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; @@ -280,16 +279,4 @@ 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 c15532f..886bdf5 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,7 +2,6 @@ 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.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; @@ -202,13 +201,4 @@ 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 4db3908..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 @@ -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,9 +98,4 @@ 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 7dddbc4..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 @@ -3,7 +3,6 @@ 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.*; @@ -182,13 +181,4 @@ 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 0501cb5..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 @@ -3,7 +3,6 @@ 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; @@ -126,9 +125,4 @@ public class NewsServiceImpl implements NewsService { public Result getContentDetailById(String id) { return newsFeignClient.getContentDetailById(id); } - - @Override - public Result getModuleList(ModuleListFormDTO dto) { - return newsFeignClient.getModuleList(dto); - } }