Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

src/main/java/com/sooka/sponest/data/digitalenvironment/controller/EnvironmentBigDataController.java

@@ -167,8 +167,8 @@ public class EnvironmentBigDataController extends BaseController {
     */
     @ApiOperation(value = "大数据查询秸秆离田" , notes = "大数据查询秸秆离田")
     @GetMapping("/leaveField")
-    public AjaxResult leaveField(EnvironmentBigDataVo environmentBigDataVo) throws IOException {
-        return AjaxResult.success(environmentBigDataService.leaveField(environmentBigDataVo));
+    public R leaveField(EnvironmentBigDataVo environmentBigDataVo) {
+        return R.ok(environmentBigDataService.leaveField(environmentBigDataVo));
     }
     
     /*

src/main/java/com/sooka/sponest/data/digitalenvironment/service/IEnvironmentBigDataService.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalenvironment.service;
 
+import com.ruoyi.common.core.domain.R;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTEnvironmentKeyEnterprise;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTEnvironmentProhibitionArea;
@@ -92,7 +93,7 @@ public interface IEnvironmentBigDataService {
     * @author 韩福成
     * @date 2023/10/27 11:16
     */
-    List<Map<String,Object>> leaveField(EnvironmentBigDataVo environmentBigDataVo) throws IOException;
+    R leaveField(EnvironmentBigDataVo environmentBigDataVo);
 
     /*
     * 大数据按类型和分类统计排污口

src/main/java/com/sooka/sponest/data/digitalenvironment/service/impl/EnvironmentBigDataServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.digitalenvironment.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
@@ -169,7 +170,7 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String,Object>> leaveField(EnvironmentBigDataVo environmentBigDataVo) throws IOException {
+    public R leaveField(EnvironmentBigDataVo environmentBigDataVo) {
         setSookaDataBase(environmentBigDataVo);
         List<Map<String,Object>> list = centerdataTEnvironmentBigDataMapper.leaveField(environmentBigDataVo);
         return deptLevelUtil.getDeptLevel(list);

src/main/java/com/sooka/sponest/data/utils/DeptLevelUtil.java

@@ -1,13 +1,13 @@
 package com.sooka.sponest.data.utils;
 
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteDeptService;
 import com.ruoyi.system.api.domain.SysDept;
-import net.bytebuddy.implementation.bytecode.Throw;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -19,13 +19,16 @@ public class DeptLevelUtil {
     @Autowired
     private RemoteDeptService remoteDeptService;
 
-    public List<Map<String, Object>> getDeptLevel(List<Map<String,Object>> list) throws IOException {
-        List<Map<String,Object>> mapList = new ArrayList<>();
-        if (list.isEmpty()||!list.get(0).containsKey("ancestors")){
-            throw new IOException("入参为空或入参没有key：'ancestors'");
-        }
+    public R getDeptLevel(List<Map<String,Object>> list) {
         String deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId().toString();
         List<SysDept> sysDeptList = remoteDeptService.selectChildrenCountyOrVillagesDeptListByDeptId(deptId).getData();
+        if (StringUtils.isEmpty(list)&&list==null){
+            return R.ok(sysDeptList);
+        }
+        if (!list.get(0).containsKey("ancestors")||!list.get(0).containsKey("deptId")){
+            return R.fail("入参没有key：'ancestors'或没有key：'deptId'");
+        }
+        List<Map<String,Object>> mapList = new ArrayList<>();
         for (SysDept sysDept : sysDeptList){//部门
             Map<String,Object> map = new HashMap<>();
             //map中增加key
@@ -47,6 +50,6 @@ public class DeptLevelUtil {
             map.put("deptName",sysDept.getDeptName());
             mapList.add(map);
         }
-        return mapList;
+        return R.ok(mapList);
     }
 }