From ce2364225756c8a1db2c39c0fd63a0170b05e625 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 10 Sep 2021 14:50:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E7=96=AB?= =?UTF-8?q?=E6=83=85=E9=98=B2=E6=8E=A7=20-=20=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiScreenController.java | 14 ++++++++++++++ .../elink/esua/epdc/feign/AnalysisFeignClient.java | 11 +++++++++++ .../fallback/AnalysisFeignClientFallback.java | 5 +++++ .../elink/esua/epdc/service/EpdcScreenService.java | 9 +++++++++ .../epdc/service/impl/EpdcScreenServiceImpl.java | 5 +++++ 5 files changed, 44 insertions(+) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index bccd2ae..62ad06c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -389,4 +389,18 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.getMapVolunteerServices(formDto); } + + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + @GetMapping("vaccination/testingPoint") + public Result> testingPoint(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getTestingPointList(formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 937a717..b830966 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -314,4 +314,15 @@ public interface AnalysisFeignClient { */ @GetMapping("analysis/screen/multipleService/mapVolunteerServices") Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + @GetMapping("analysis/screen/vaccination/testingPoint") + Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 4d22494..6e0ead4 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -164,4 +164,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapVolunteerServices",formDto); } + + @Override + public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index bdea4b3..3a04679 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -277,4 +277,13 @@ public interface EpdcScreenService { */ Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java index c123ab0..7164a0d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -165,4 +165,9 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { return analysisFeignClient.getMapVolunteerServices(formDto); } + + @Override + public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getTestingPointList(formDto); + } } From 6bd4f86181d367760ebc0b10e805eb487d182025 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 13 Sep 2021 17:28:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=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 --- .../news/controller/ApiNewsController.java | 13 +++++++++++++ .../epdc/modules/news/feign/NewsFeignClient.java | 16 ++++++++++++++-- .../feign/callback/NewsFeignClientFallback.java | 7 ++++++- .../epdc/modules/news/service/NewsService.java | 10 ++++++++++ .../news/service/impl/NewsServiceImpl.java | 6 ++++++ 5 files changed, 49 insertions(+), 3 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 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..c15532f 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,13 @@ 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); + } } From ae598818de6b81906bc30a911aadfb084f477ded Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 13 Sep 2021 17:29:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"=E6=A0=8F=E7=9B=AE=E5=88=97?= =?UTF-8?q?=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); - } } From 5003152561245649595ea77be51d2207b0ae6c24 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 14 Sep 2021 15:40:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=A4=9A=E5=85=83=E6=9C=8D=E5=8A=A1-=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=E5=BC=80?= =?UTF-8?q?=E5=8F=91=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiScreenController.java | 24 +++++++++++++++++++ .../esua/epdc/feign/AnalysisFeignClient.java | 20 ++++++++++++++++ .../fallback/AnalysisFeignClientFallback.java | 10 ++++++++ .../esua/epdc/service/EpdcScreenService.java | 18 ++++++++++++++ .../service/impl/EpdcScreenServiceImpl.java | 10 ++++++++ 5 files changed, 82 insertions(+) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index 62ad06c..916264f 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -390,6 +390,30 @@ public class ApiScreenController { return epdcScreenService.getMapVolunteerServices(formDto); } + /** + * @Author zhangfenghe + * @Description 多元服务-物业服务列表 + * @Date 15:17 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("multipleService/propertyListServices") + public Result> propertyListServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getPropertyListServices(formDto); + } + + /** + * @Author zhangfenghe + * @Description 多元服务-地图-物业服务列表 + * @Date 15:21 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + public Result> mapPropertyServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapPropertyServices(formDto); + } /** * 疫情防控 - 监测点列表 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index b830966..0546b31 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -315,6 +315,26 @@ public interface AnalysisFeignClient { @GetMapping("analysis/screen/multipleService/mapVolunteerServices") Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + /** + * @Author zhangfenghe + * @Description 多元服务-物业服务列表 + * @Date 15:31 2021/9/14 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("analysis/screen/multipleService/propertyListServices") + Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDTO); + + /** + * @Author zhangfenghe + * @Description 多元服务-地图-物业服务 + * @Date 15:33 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("analysis/screen/multipleService/mapPropertyServices") + Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto); + /** * 疫情防控 - 监测点列表 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 6e0ead4..044cf05 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -165,6 +165,16 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapVolunteerServices",formDto); } + @Override + public Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getPropertyListServices",formDto); + } + + @Override + public Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapPropertyServices",formDto); + } + @Override public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",formDto); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index 3a04679..1ebbd5d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -276,6 +276,24 @@ public interface EpdcScreenService { * @since 2021/9/2 15:30 */ Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * @Author zhangfenghe + * @Description 多元服务-物业服务列表 + * @Date 15:26 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto); + + /** + * @Author zhangfenghe + * @Description 多元服务-地图-物业服务 + * @Date 15:36 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto); /** * 疫情防控 - 监测点列表 diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java index 7164a0d..37cbb4a 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -166,6 +166,16 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.getMapVolunteerServices(formDto); } + @Override + public Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getPropertyListServices(formDto); + } + + @Override + public Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getMapPropertyServices(formDto); + } + @Override public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { return analysisFeignClient.getTestingPointList(formDto); From 4ab2f6c65332d4bffc3df0b5b97800bcc5404c5a Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 15 Sep 2021 08:58:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=A4=9A=E5=85=83=E6=9C=8D=E5=8A=A1-=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=E5=BC=80?= =?UTF-8?q?=E5=8F=91=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/controller/ApiScreenController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index 916264f..2198294 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -410,6 +410,7 @@ public class ApiScreenController { * @Param [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ + @GetMapping("multipleService/mapPropertyServices") public Result> mapPropertyServices(EpdcScreenBasePageFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return epdcScreenService.getMapPropertyServices(formDto);