大数据中台，永久基本农田,日常巡护加入deptID参数

src/main/java/com/sooka/sponest/data/digitalresource/controller/ResourceBigDataController.java

@@ -135,8 +135,7 @@ public class ResourceBigDataController extends BaseController {
      */
     @ApiOperation(value = "查询永久基本农田按耕地属性统计面积", notes = "查询永久基本农田按耕地属性统计面积")
     @PostMapping("/selectFarmBasicFarmlandCount")
-    public R selectFarmBasicFarmlandCount() {
-        CenterdataTFarmBasicFarmland centerdataTFarmBasicFarmland = new CenterdataTFarmBasicFarmland();
+    public R selectFarmBasicFarmlandCount(@RequestBody CenterdataTFarmBasicFarmland centerdataTFarmBasicFarmland) {
         return R.ok(resourceBigDataService.selectFarmBasicFarmlandCount(centerdataTFarmBasicFarmland));
     }
 

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/ResourceBigDataServiceImpl.java

@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IResourceBigDataService {
@@ -158,7 +159,11 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         Map<String, Object> map = new HashMap<>();
         map.put("centerdataTFarmBasicFarmland",centerdataTFarmBasicFarmland);
         map.put("dictList",DictUtils.getDictCache("farm_field_attribute"));
-        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map));
+        String deptId="";
+        if (!Objects.isNull(centerdataTFarmBasicFarmland.getDeptId())){
+            deptId=String.valueOf(centerdataTFarmBasicFarmland.getDeptId());
+        }
+        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),deptId);
     }
     /**
      * 地质灾害易发区
@@ -184,7 +189,11 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         for (Map<String, Object> stringObjectMap : hydraulicPatrolTask) {
             stringObjectMap.put("patrolTrajectory",getPlanLength(MapUtils.getString(stringObjectMap,"patrolTrajectory")));
         }
-        return deptLevelUtil.getDeptLevel(hydraulicPatrolTask);
+        String deptId="";
+        if (!Objects.isNull(centerdataTHydraulicPatrolTask.getDeptId())){
+            deptId=String.valueOf(centerdataTHydraulicPatrolTask.getDeptId());
+        }
+        return deptLevelUtil.getDeptLevel(hydraulicPatrolTask,deptId);
 
     }
     private String getPlanLength(String patrolTrajectory) {