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 7eb51e2..3902f10 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 @@ -2,8 +2,10 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +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; @@ -38,4 +40,57 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.gridGovernanceItemList(formDto); } + + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + @GetMapping("gridGovernance/itemCategoryStatistics") + public Result> itemCategoryStatistics() { + return epdcScreenService.itemCategoryStatistics(); + } + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + @GetMapping("gridGovernance/itemStatusStatistics") + public Result> itemStatusStatistics() { + return epdcScreenService.itemStatusStatistics(); + } + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + @GetMapping("gridGovernance/difficultItemList") + public Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.difficultItemList(formDto); + } + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + @GetMapping("gridGovernance/governanceRanking") + public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.governanceRanking(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 a6b5364..6302dbd 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 @@ -2,8 +2,10 @@ package com.elink.esua.epdc.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.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -41,4 +43,46 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/screen/gridGovernance/itemList", consumes = MediaType.APPLICATION_JSON_VALUE) Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + @GetMapping(value = "analysis/screen/gridGovernance/itemCategoryStatistics", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> itemCategoryStatistics(); + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + @GetMapping(value = "analysis/screen/gridGovernance/itemStatusStatistics", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> itemStatusStatistics(); + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + @GetMapping(value = "analysis/screen/gridGovernance/difficultItemList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto); + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + @GetMapping(value = "analysis/screen/gridGovernance/governanceRanking", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO 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 6e28662..71a51db 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 @@ -3,8 +3,10 @@ package com.elink.esua.epdc.feign.fallback; 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.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; @@ -26,4 +28,25 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridGovernanceItemList", formDto); } + + @Override + public Result> itemCategoryStatistics() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "itemCategoryStatistics"); + } + + @Override + public Result> itemStatusStatistics() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "itemStatusStatistics"); + } + + @Override + public Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "difficultItemList", formDto); + } + + @Override + public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "governanceRanking", 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 50f2bb9..7e4f0f6 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 @@ -1,8 +1,10 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import java.util.List; @@ -23,4 +25,43 @@ public interface EpdcScreenService { * @since 2021/8/10 13:49 */ Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); + + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + Result> itemCategoryStatistics(); + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + Result> itemStatusStatistics(); + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto); + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO 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 e45bae9..e72979b 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 @@ -1,8 +1,10 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; @@ -26,4 +28,24 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) { return analysisFeignClient.gridGovernanceItemList(formDto); } + + @Override + public Result> itemCategoryStatistics() { + return analysisFeignClient.itemCategoryStatistics(); + } + + @Override + public Result> itemStatusStatistics() { + return analysisFeignClient.itemStatusStatistics(); + } + + @Override + public Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto) { + return analysisFeignClient.difficultItemList(formDto); + } + + @Override + public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) { + return analysisFeignClient.governanceRanking(formDto); + } }