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

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/FireControlBigDataServiceImpl.java

@@ -117,7 +117,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataFirecontrolFoamLiquidDeptCount(CenterdataTFirecontrolFoamLiquid centerdataTFirecontrolFoamLiquid) {
         setSookaDataBase(centerdataTFirecontrolFoamLiquid);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.selectBigDataFirecontrolFoamLiquidDeptCount(centerdataTFirecontrolFoamLiquid);
-        return deptLevelUtil.getDeptLevel(mapList,centerdataTFirecontrolFoamLiquid.getDeptId().toString());
+        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()));
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -125,7 +125,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
         setSookaDataBase(centerdataTFirecontrolBasicLinkageForce);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
-        return deptLevelUtil.getDeptLevel(mapList,centerdataTFirecontrolBasicLinkageForce.getDeptId().toString());
+        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolBasicLinkageForce.getDeptId()));
     }
 
     /**
@@ -156,7 +156,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataFireforceDeptCount(CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
         setSookaDataBase(centerdataTFirecontrolFireForce);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataFireforceDeptCount(centerdataTFirecontrolFireForce);
-        return deptLevelUtil.getDeptLevel(list,centerdataTFirecontrolFireForce.getDeptId().toString());
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTFirecontrolFireForce.getDeptId()));
     }
 
     /**
@@ -167,7 +167,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectBigDataNumWithDeptCount(VisuForestCloudMapVO visuForestCloudMapVO) {
         setSookaDataBase(visuForestCloudMapVO);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectBigDataNumWithDeptCount(visuForestCloudMapVO);
-        return deptLevelUtil.getDeptLevel(list,visuForestCloudMapVO.getDeptId().toString());
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(visuForestCloudMapVO.getDeptId()));
     }
 
     /**
@@ -181,6 +181,6 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List<Map<String,Object>> selectKeyLocations(DataVisuFireCloudMapVO dataVisuFireCloudMapVO) {
         setSookaDataBase(dataVisuFireCloudMapVO);
         List<Map<String,Object>> list = fireControlBigDataMapper.selectKeyLocations(dataVisuFireCloudMapVO);
-        return deptLevelUtil.getDeptLevel(list,dataVisuFireCloudMapVO.getDeptId().toString());
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(dataVisuFireCloudMapVO.getDeptId()));
     }
 }

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

@@ -22,7 +22,6 @@ 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 {
@@ -159,11 +158,7 @@ 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"));
-        String deptId="";
-        if (!Objects.isNull(centerdataTFarmBasicFarmland.getDeptId())){
-            deptId=String.valueOf(centerdataTFarmBasicFarmland.getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),deptId);
+        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),String.valueOf(centerdataTFarmBasicFarmland.getDeptId()));
     }
     /**
      * 地质灾害易发区
@@ -189,11 +184,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         for (Map<String, Object> stringObjectMap : hydraulicPatrolTask) {
             stringObjectMap.put("patrolTrajectory",getPlanLength(MapUtils.getString(stringObjectMap,"patrolTrajectory")));
         }
-        String deptId="";
-        if (!Objects.isNull(centerdataTHydraulicPatrolTask.getDeptId())){
-            deptId=String.valueOf(centerdataTHydraulicPatrolTask.getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(hydraulicPatrolTask,deptId);
+        return deptLevelUtil.getDeptLevel(hydraulicPatrolTask,String.valueOf(centerdataTHydraulicPatrolTask.getDeptId()));
 
     }
     private String getPlanLength(String patrolTrajectory) {