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/digitalforest/service/impl/ForestBigDataServiceImpl.java

@@ -208,11 +208,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String,Object>> selectResourcesAreaCount(CenterdataTForestResources centerdataTForestResources) throws IOException {
         setSookaDataBase(centerdataTForestResources);
         List<Map<String,Object>> list = forestBigDataMapper.selectResourcesAreaCount(centerdataTForestResources);
-        String deptId = "";
-        if (!StringUtils.isNull(centerdataTForestResources.getDeptId())){
-            deptId = String.valueOf(centerdataTForestResources.getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(list,deptId);
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestResources.getDeptId()));
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -220,11 +216,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String,Object>> selectForestGridCount(CenterdataTForestGridLevelVo centerdataTForestGridLevel) throws IOException {
         setSookaDataBase(centerdataTForestGridLevel);
         List<Map<String,Object>> list = forestBigDataMapper.selectForestGridCount(centerdataTForestGridLevel);
-        String deptId = "";
-        if (!StringUtils.isNull(centerdataTForestGridLevel.getDeptId())){
-            deptId = String.valueOf(centerdataTForestGridLevel.getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(list,deptId);
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestGridLevel.getDeptId()));
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -232,11 +224,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String,Object>> selectTreeCount(CenterdataTForestTrees centerdataTForestTrees) {
         setSookaDataBase(centerdataTForestTrees);
         List<Map<String,Object>> list = forestBigDataMapper.selectTreeCount(centerdataTForestTrees);
-        String deptId = "";
-        if (!StringUtils.isNull(centerdataTForestTrees.getDeptId())){
-            deptId = String.valueOf(centerdataTForestTrees.getDeptId());
-        }
-        return deptLevelUtil.getDeptLevel(list,deptId);
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestTrees.getDeptId()));
     }
 
 }