返回值变成R

src/main/java/com/sooka/sponest/data/digitalwater/controller/WaterBigDataController.java

@@ -51,7 +51,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "水资源（市级用用户按区县，区县用户按乡镇统计地表水总量，地下河总量）", notes = "水资源（市级用用户按区县，区县用户按乡镇统计地表水总量，地下河总量）")
     @GetMapping("/selectHydropowerResources")
     public R selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
-        return R.ok(waterBigDataService.selectHydropowerResources(centerdataTResourcesHydroenergy));
+        return waterBigDataService.selectHydropowerResources(centerdataTResourcesHydroenergy);
     }
     /**
      * 水库统计（按水库名称统计总容量）
@@ -80,7 +80,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "排污统计（按排污属性统计排污口数量）", notes = "排污统计（按排污属性统计排污口数量）")
     @GetMapping("/selectPollutantDischargeStatistics")
     public R selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage) {
-        return R.ok(waterBigDataService.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage));
+        return waterBigDataService.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage);
     }
 
 

src/main/java/com/sooka/sponest/data/digitalwater/service/IWaterBigDataService.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalwater.service;
 
+import com.ruoyi.common.core.domain.R;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestGrid;
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
@@ -50,14 +51,14 @@ public interface IWaterBigDataService {
 
 
 
-    List<Map<String,Object>> selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline);
+    R selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline);
 
-    List<Map<String,Object>> selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir);
+    R selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir);
 
-    List<Map<String,Object>> selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver);
+    R selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver);
 
-    List<Map<String,Object>> selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage);
+    R selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage);
 
 
-    List<Map<String, Object>> selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException;
+    R selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException;
 }

src/main/java/com/sooka/sponest/data/digitalwater/service/impl/WaterBigDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalwater.service.impl;
 
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
@@ -120,19 +121,19 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String,Object>> selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline) {
+    public R selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline) {
         setSookaDataBase(centerdataTHydraulicChannelBlueline);
-        return waterBigDataMapper.selectChannelBlueLine(centerdataTHydraulicChannelBlueline);
+        return R.ok(waterBigDataMapper.selectChannelBlueLine(centerdataTHydraulicChannelBlueline));
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String, Object>> selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir) {
+    public R selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir) {
         setSookaDataBase(centerdataTHydraulicReservoir);
-        return waterBigDataMapper.selectReservoirStatistics(centerdataTHydraulicReservoir);
+        return R.ok(waterBigDataMapper.selectReservoirStatistics(centerdataTHydraulicReservoir));
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String,Object>> selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver) {
+    public R selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver) {
         setSookaDataBase(centerdataTHydraulicRiver);
         List<Map<String,Object>> list = waterBigDataMapper.selectCenterdataTHydraulicRiverList(centerdataTHydraulicRiver);
         for (Map<String, Object> map : list) {
@@ -140,19 +141,19 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
                 map.put("num",MapUtils.getString(map,"hamlet").split(",").length);
             }
         }
-        return list;
+        return R.ok(list);
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String, Object>> selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage) {
+    public R selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage) {
 
         setSookaDataBase(centerdataTHydraulicOutletSewage);
-        return waterBigDataMapper.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage);
+        return R.ok(waterBigDataMapper.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage));
     }
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String, Object>> selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
+    public R selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
         setSookaDataBase(centerdataTResourcesHydroenergy);
         List<Map<String,Object>> list = waterBigDataMapper.selectCenterdataTResourcesHydroenergyList(centerdataTResourcesHydroenergy);
         return deptLevelUtil.getDeptLevel(list);