diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 86bd95d..11ce830 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -2,8 +2,10 @@ package com.elink.esua.epdc.modules.screen.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.modules.screen.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -39,4 +41,56 @@ public class EpdcScreenController { 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(@RequestBody 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(@RequestBody EpdcScreenGridGovernanceRankingFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.governanceRanking(formDto); + } } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 8cbb0e9..9a40baa 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -1,8 +1,11 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +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 org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -23,4 +26,42 @@ public interface EpdcScreenDao extends BaseDao gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto); + + /** + * 网格治理-事件总览-项目类别统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:46 + */ + List itemCategoryStatistics(); + + /** + * 网格治理-事件总览-项目状态统计列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:47 + */ + List itemStatusStatistics(); + + /** + * 网格治理-难点堵点 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:49 + */ + List difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto); + + /** + * 网格治理-治理情况排行 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 9:52 + */ + List governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 80b493d..55c3ff1 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,8 +1,10 @@ package com.elink.esua.epdc.modules.screen.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,42 @@ 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-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index 34301b2..bd130c6 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -3,8 +3,10 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; 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.modules.screen.dao.EpdcScreenDao; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; import org.springframework.stereotype.Service; @@ -27,4 +29,32 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl data = baseDao.gridGovernanceItemList(formDto); return new Result>().ok(data); } + + @Override + public Result> itemCategoryStatistics() { + List data = baseDao.itemCategoryStatistics(); + return new Result>().ok(data); + } + + @Override + public Result> itemStatusStatistics() { + List data = baseDao.itemStatusStatistics(); + return new Result>().ok(data); + } + + @Override + public Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.difficultItemList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.governanceRanking(formDto); + return new Result>().ok(data); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index 2827ac3..ddcca01 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -24,4 +24,103 @@ LIMIT #{pageIndex}, #{pageSize} + + + + + + + +