cim-接口修改

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java

@@ -43,10 +43,10 @@ public class CimDashboardOverviewDataSumController {
      * @return
      */
     @GetMapping("/getDashboardOverviewMonthDataSum")
-    public R<List<CimDashboardOverviewVo>> getDashboardOverviewMonthDataSum() {
+    public R<Map<String,Object>> getDashboardOverviewMonthDataSum(CimDashboardOverviewQueryBo bo) {
         //查询大屏总览数据（月度）
-        List<CimDashboardOverviewVo> vo= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum();
+        Map<String,Object> map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum(bo);
-        return R.ok(vo);
+        return R.ok(map);
     }
 
     /**
@@ -54,10 +54,10 @@ public class CimDashboardOverviewDataSumController {
      * @return
      */
     @GetMapping("/getDashboardOverviewMonthDataEntSum")
-    public R<List<CimDashboardOverviewVo>> getDashboardOverviewMonthDataEntSum() {
+    public R<Map<String,Object>> getDashboardOverviewMonthDataEntSum(CimDashboardOverviewQueryBo bo) {
         //查询大屏总览数据（月度）
-        List<CimDashboardOverviewVo> vo= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum();
+        Map<String,Object> map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum(bo);
-        return R.ok(vo);
+        return R.ok(map);
     }
 
     /**
@@ -65,10 +65,10 @@ public class CimDashboardOverviewDataSumController {
      * @return
      */
     @GetMapping("/getDashboardOverviewMonthDataPenUnitSum")
-    public R<List<CimDashboardOverviewVo>> getDashboardOverviewMonthDataPenUnitSum() {
+    public R<Map<String,Object>> getDashboardOverviewMonthDataPenUnitSum(CimDashboardOverviewQueryBo bo) {
         //查询大屏总览数据（月度）
-        List<CimDashboardOverviewVo> vo= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum();
+        Map<String,Object> map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSum(bo);
-        return R.ok(vo);
+        return R.ok(map);
     }
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java

@@ -33,7 +33,7 @@ public interface ICimDashboardOverviewDataSumService {
      * Cim大屏-查询大屏总览汇总月度数据
      * @return
      */
-    List<CimDashboardOverviewVo> getDashboardOverviewMonthDataSum();
+    Map<String,Object> getDashboardOverviewMonthDataSum(CimDashboardOverviewQueryBo bo);
 
     /**
      * Cim大屏-按区域条件查询月度数据

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java

@@ -200,13 +200,16 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
      * @return
      */
     @Override
-    public List<CimDashboardOverviewVo> getDashboardOverviewMonthDataSum() {
+    public Map<String ,Object> getDashboardOverviewMonthDataSum(CimDashboardOverviewQueryBo bo) {
-
+        Map<String ,Object> map=new HashMap<>();
         LambdaQueryWrapper<DashboardOverview> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DashboardOverview::getIsDelete, "0");
         queryWrapper.eq(DashboardOverview::getYear, getDateTime().getYear());
         queryWrapper.eq(DashboardOverview::getMonth, getDateTime().getMonth());
-        return cimDashboardOverviewMapper.selectVoList(queryWrapper);
+
+        map.put("monthData",cimDashboardOverviewMapper.selectVoList(queryWrapper));
+        map.put("areaMonthData",getDashboardOverviewAreaMonthDataSum(bo));
+        return map;
     }
 
     /**