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 b41eb01..59d16cb 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 @@ -9,10 +9,7 @@ import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeV import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -300,4 +297,18 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.issueProgress(formDto); } + + /** + * 网格治理-项目列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/23 19:02 + */ + @GetMapping("gridGovernance/mapItemList") + public Result> itemList(EpdcScreenItemListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.itemList(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 4e4cba4..b2e69f7 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 @@ -11,6 +11,7 @@ import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -246,4 +247,15 @@ public interface AnalysisFeignClient { */ @GetMapping(value = "analysis/screen/gridGovernance/issueProgress",consumes = MediaType.APPLICATION_JSON_VALUE) Result> issueProgress(EpdcScreenIssueProgressFormDTO formDto); + + /** + * 网格治理-项目列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/23 19:02 + */ + @GetMapping("analysis/screen/gridGovernance/mapItemList") + Result> itemList(EpdcScreenItemListFormDTO 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 e066550..ff8bdab 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 @@ -130,4 +130,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"issueProgress",formDto); } + @Override + public Result> itemList(EpdcScreenItemListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"itemList",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 1aea65e..f1224dd 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 @@ -213,4 +213,14 @@ public interface EpdcScreenService { */ Result> issueProgress(EpdcScreenIssueProgressFormDTO formDto); + /** + * 网格治理-项目列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author lc + * @since 2021/8/23 19:02 + */ + Result> itemList(EpdcScreenItemListFormDTO 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 172cacc..d3f8b54 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 @@ -131,4 +131,9 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.issueProgress(formDto); } + @Override + public Result> itemList(EpdcScreenItemListFormDTO formDto) { + return analysisFeignClient.itemList(formDto); + } + } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index c660ca3..33ef195 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit c660ca360356218f48dbdb987f4fba70f7642435 +Subproject commit 33ef1954fba06d5c5d3b7b348a7453344268960d