diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java index ef1a6f66..cf8fe227 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java @@ -164,8 +164,8 @@ public class CimDashboardOverviewDataSumController { * */ @GetMapping("/getTrendAreaMonthDataSumMap") - public R> getTrendAreaMonthDataSumMap() { - return R.ok(cimDashboardOverviewDataSumService.getTrendAreaMonthDataSumMap()); + public R> getTrendAreaMonthDataSumMap(CimDashboardOverviewQueryBo bo) { + return R.ok(cimDashboardOverviewDataSumService.getTrendAreaMonthDataSumMap(bo)); } /** @@ -185,8 +185,8 @@ public class CimDashboardOverviewDataSumController { * */ @GetMapping("/getTrendFieldMonthDataSumMap") - public R> getTrendFieldMonthDataSumMap() { - return R.ok(cimDashboardOverviewDataSumService.getTrendFieldMonthDataSumMap()); + public R> getTrendFieldMonthDataSumMap(CimDashboardOverviewQueryBo bo) { + return R.ok(cimDashboardOverviewDataSumService.getTrendFieldMonthDataSumMap(bo)); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java index 651035ac..09cef0d9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java @@ -142,7 +142,7 @@ public interface ICimDashboardOverviewDataSumService { * Cim大屏-查询态势感知-趋势行为分析-区域月度数据 * @return */ - Map getTrendAreaMonthDataSumMap(); + Map getTrendAreaMonthDataSumMap(CimDashboardOverviewQueryBo bo); /** @@ -163,7 +163,7 @@ public interface ICimDashboardOverviewDataSumService { * Cim大屏-查询态势感知-趋势行为分析-领域月度数据 * @return */ - Map getTrendFieldMonthDataSumMap(); + Map getTrendFieldMonthDataSumMap(CimDashboardOverviewQueryBo bo); /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index 758e2cb1..9df7a93a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -1187,7 +1187,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve * @return */ @Override - public Map getTrendAreaMonthDataSumMap() { + public Map getTrendAreaMonthDataSumMap(CimDashboardOverviewQueryBo bo) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardTrendStatArea::getIsDelete, "0"); @@ -1240,6 +1240,10 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve map.put("highAreas", highAreas); // 低频区域:每季度最低各1条,共4条 map.put("lowAreas", lowAreas); + + // 查询街道 + List streetList= cimDashboardOverviewMapper.getAreaQuarterlyRegionList(bo); + map.put("streetList", streetList); return map; } @@ -1336,7 +1340,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve * @return */ @Override - public Map getTrendFieldMonthDataSumMap() { + public Map getTrendFieldMonthDataSumMap(CimDashboardOverviewQueryBo bo) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardTrendStatDomain::getIsDelete, "0"); @@ -1388,6 +1392,9 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve map.put("highDomains", highDomains); // 低频领域:每季度最低各1条,共4条 map.put("lowDomains", lowDomains); + + List areaDomainList=cimDashboardOverviewMapper.getAreaDomainQuarterList(bo); + map.put("areaDomainList",areaDomainList); return map; }