service返回值

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

@@ -42,7 +42,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "河道蓝线（按照类型统计河道蓝线面积）", notes = "河道蓝线（按照类型统计河道蓝线面积）")
     @GetMapping("/selectChannelBlueLine")
     public R selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline) {
-        return waterBigDataService.selectChannelBlueLine(centerdataTHydraulicChannelBlueline);
+        return R.ok(waterBigDataService.selectChannelBlueLine(centerdataTHydraulicChannelBlueline));
     }
     /**
      * 水资源（市级用用户按区县，区县用户按乡镇统计地表水总量，地下河总量）
@@ -51,7 +51,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "水资源（市级用用户按区县，区县用户按乡镇统计地表水总量，地下河总量）", notes = "水资源（市级用用户按区县，区县用户按乡镇统计地表水总量，地下河总量）")
     @GetMapping("/selectHydropowerResources")
     public R selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
-        return waterBigDataService.selectHydropowerResources(centerdataTResourcesHydroenergy);
+        return R.ok(waterBigDataService.selectHydropowerResources(centerdataTResourcesHydroenergy));
     }
     /**
      * 水库统计（按水库名称统计总容量）
@@ -60,7 +60,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "水库统计（按水库名称统计总容量）", notes = "水库统计（按水库名称统计总容量）")
     @GetMapping("/selectReservoirStatistics")
     public R selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir) {
-        return waterBigDataService.selectReservoirStatistics(centerdataTHydraulicReservoir);
+        return R.ok(waterBigDataService.selectReservoirStatistics(centerdataTHydraulicReservoir));
     }
 
     /**
@@ -70,7 +70,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "河流统计（河流名称、河长(公里)、河流面积(平方千米)、流经村数！）", notes = "河流统计（河流名称、河长(公里)、河流面积(平方千米)、流经村数！）")
     @GetMapping("/selectRiverStatistics")
     public R selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver) {
-        return waterBigDataService.selectRiverStatistics(centerdataTHydraulicRiver);
+        return R.ok(waterBigDataService.selectRiverStatistics(centerdataTHydraulicRiver));
     }
 
     /**
@@ -80,7 +80,7 @@ public class WaterBigDataController extends BaseController {
     @ApiOperation(value = "排污统计（按排污属性统计排污口数量）", notes = "排污统计（按排污属性统计排污口数量）")
     @GetMapping("/selectPollutantDischargeStatistics")
     public R selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage) {
-        return waterBigDataService.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage);
+        return R.ok(waterBigDataService.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage));
     }
 
 

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

@@ -1,6 +1,5 @@
 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;
@@ -51,14 +50,14 @@ public interface IWaterBigDataService {
 
 
 
-    R selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline);
+    List<Map<String,Object>> selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline);
 
-    R selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir);
+    List<Map<String,Object>> selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir);
 
-    R selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver);
+    List<Map<String,Object>> selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver);
 
-    R selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage);
+    List<Map<String,Object>> selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage);
 
 
-    R selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException;
+    List<Map<String,Object>> selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException;
 }

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

@@ -121,19 +121,19 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public R selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline) {
+    public List<Map<String,Object>> selectChannelBlueLine(CenterdataTHydraulicChannelBlueline centerdataTHydraulicChannelBlueline) {
         setSookaDataBase(centerdataTHydraulicChannelBlueline);
-        return R.ok(waterBigDataMapper.selectChannelBlueLine(centerdataTHydraulicChannelBlueline));
+        return waterBigDataMapper.selectChannelBlueLine(centerdataTHydraulicChannelBlueline);
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public R selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir) {
+    public List<Map<String,Object>> selectReservoirStatistics(CenterdataTHydraulicReservoir centerdataTHydraulicReservoir) {
         setSookaDataBase(centerdataTHydraulicReservoir);
-        return R.ok(waterBigDataMapper.selectReservoirStatistics(centerdataTHydraulicReservoir));
+        return waterBigDataMapper.selectReservoirStatistics(centerdataTHydraulicReservoir);
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public R selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver) {
+    public List<Map<String,Object>> selectRiverStatistics(CenterdataTHydraulicRiver centerdataTHydraulicRiver) {
         setSookaDataBase(centerdataTHydraulicRiver);
         List<Map<String,Object>> list = waterBigDataMapper.selectCenterdataTHydraulicRiverList(centerdataTHydraulicRiver);
         for (Map<String, Object> map : list) {
@@ -141,19 +141,19 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
                 map.put("num",MapUtils.getString(map,"hamlet").split(",").length);
             }
         }
-        return R.ok(list);
+        return list;
     }
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public R selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage) {
+    public List<Map<String,Object>> selectPollutantDischargeStatistics(CenterdataTHydraulicOutletSewage centerdataTHydraulicOutletSewage) {
 
         setSookaDataBase(centerdataTHydraulicOutletSewage);
-        return R.ok(waterBigDataMapper.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage));
+        return waterBigDataMapper.selectPollutantDischargeStatistics(centerdataTHydraulicOutletSewage);
     }
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public R selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
+    public List<Map<String,Object>> selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
         setSookaDataBase(centerdataTResourcesHydroenergy);
         List<Map<String,Object>> list = waterBigDataMapper.selectCenterdataTResourcesHydroenergyList(centerdataTResourcesHydroenergy);
         return deptLevelUtil.getDeptLevel(list);