数据中心工具类重引

src/main/java/com/sooka/sponest/data/digitalagriculture/service/impl/AgricultureBigDataServiceImpl.java

@@ -1,8 +1,11 @@
 package com.sooka.sponest.data.digitalagriculture.service.impl;
 
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDictData;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalagriculture.domain.CenterdataTFarmAgriculturalCooperatives;
 import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureBigDataBO;
@@ -12,6 +15,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -21,7 +25,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
     @Autowired
     private AgricultureBigDataMapper agricultureBigDataMapper;
 
-    @Autowired
+    @Resource
     private DeptLevelUtil deptLevelUtil;
 
     @Override
@@ -219,6 +223,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stockNum", 0);
             list.add(objectObjectHashMap);
         }
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 
@@ -242,10 +249,16 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         int currentYear = calendar.get(Calendar.YEAR);
         // 获取当前年份的数据
         List<Map<String, Object>> currentYearStatistics = getStatisticsByYear(agricultureBigDataBO, String.valueOf(currentYear));
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         List<Map<String, Object>> deptLevel = deptLevelUtil.getDeptLevel(currentYearStatistics,String.valueOf(agricultureBigDataBO.getDeptId()));
         // 获取过去五年的数据
         for (int i = currentYear - 1; i >= currentYear - 4; i--) {
             List<Map<String, Object>> statisticsByYear = getStatisticsByYear(agricultureBigDataBO, String.valueOf(i));
+            if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+                agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+            }
             deptLevel.addAll(deptLevelUtil.getDeptLevel(statisticsByYear,String.valueOf(agricultureBigDataBO.getDeptId())));
         }
         // 根据name（年份）进行分组
@@ -291,6 +304,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("breedMoneyNum", 0);
             agriculturalSubsidy.add(objectObjectHashMap);
         }
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(agriculturalSubsidy,String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 
@@ -382,6 +398,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         Map<String, Object> map = new HashMap<>();
         map.put("agricultureBigDataBO",agricultureBigDataBO);
         map.put("dictList", DictUtils.getDictCache("farm_field_attribute"));
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(agricultureBigDataMapper.getFarmlandStatistics(map),String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 
@@ -398,21 +417,36 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         Map<String,List<Map<String, Object>>> hashMap = new HashMap<>();
         // 合作社数量
         List<Map<String, Object>> cooperativesStatisticsByCooperatives = agricultureBigDataMapper.getCooperativesStatisticsByCooperatives(agricultureBigDataBO);
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(cooperativesStatisticsByCooperatives,String.valueOf(agricultureBigDataBO.getDeptId())));
         // 示范级别
         List<Map<String, Object>> statisticsByLeaseTerm = agricultureBigDataMapper.getCooperativesStatisticsByLeaseTerm(agricultureBigDataBO);
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         List<Map<String, Object>> statisticsByLeaseTermList = deptLevelUtil.getDeptLevel(statisticsByLeaseTerm, String.valueOf(agricultureBigDataBO.getDeptId()));
         // 成员出资额
         List<Map<String, Object>> statisticsByRegisterCapital = agricultureBigDataMapper.getCooperativesStatisticsByRegisterCapital(agricultureBigDataBO);
         int registerCapitalSum = getStatisticsSum(statisticsByRegisterCapital);
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         List<Map<String, Object>> statisticsByRegisterCapitalList = deptLevelUtil.getDeptLevel(statisticsByRegisterCapital, String.valueOf(agricultureBigDataBO.getDeptId()));
         // 入社人员
         List<Map<String, Object>> statisticsByMembersNum = agricultureBigDataMapper.getCooperativesStatisticsByMembersNum(agricultureBigDataBO);
         int membersNumSum = getStatisticsSum(statisticsByMembersNum);
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         List<Map<String, Object>> statisticsByMembersNumList = deptLevelUtil.getDeptLevel(statisticsByMembersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
         // 带动农户
         List<Map<String, Object>> statisticsByDrivenFarmersNum = agricultureBigDataMapper.getCooperativesStatisticsByDrivenFarmersNum(agricultureBigDataBO);
         int drivenFarmersNumSum = getStatisticsSum(statisticsByDrivenFarmersNum);
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         List<Map<String, Object>> statisticsByDrivenFarmersNumList = deptLevelUtil.getDeptLevel(statisticsByDrivenFarmersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
 
         // 数据分组
@@ -506,6 +540,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stillAreaNum", 0);
             strawTurnover.add(objectObjectHashMap);
         }
+        if (StringUtils.isEmpty(agricultureBigDataBO.getDeptId().toString())){
+            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(strawTurnover,String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 }

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalenvironment.domain.CenterdataTEnvironmentKeyEnterprise;
@@ -23,6 +25,7 @@ import com.sooka.sponest.data.utils.DataConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,7 +38,7 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
     @Autowired
     private CenterdataTEnvironmentBigDataMapper centerdataTEnvironmentBigDataMapper;
 
-    @Autowired
+    @Resource
     private DeptLevelUtil deptLevelUtil;
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -170,6 +173,9 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
     public List<Map<String,Object>> leaveField(EnvironmentBigDataVo environmentBigDataVo) {
         setSookaDataBase(environmentBigDataVo);
         List<Map<String,Object>> list = centerdataTEnvironmentBigDataMapper.leaveField(environmentBigDataVo);
+        if (StringUtils.isEmpty(environmentBigDataVo.getDeptId())){
+            environmentBigDataVo.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
+        }
         return deptLevelUtil.getDeptLevel(list,environmentBigDataVo.getDeptId());
     }
 

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

@@ -1,7 +1,10 @@
 package com.sooka.sponest.data.digitalfirecontrol.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestFirehydrant;
@@ -19,6 +22,7 @@ import com.sooka.sponest.data.generalbusiness.domain.vo.CenterdataTForestWeather
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +37,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
 
     @Autowired
     private FireControlBigDataMapper fireControlBigDataMapper;
-    @Autowired
+    @Resource
     private DeptLevelUtil deptLevelUtil;
 
     /**
@@ -116,6 +120,9 @@ 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);
+        if (StringUtils.isEmpty(centerdataTFirecontrolFoamLiquid.getDeptId().toString())){
+            centerdataTFirecontrolFoamLiquid.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()));
     }
 
@@ -124,6 +131,9 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
     public List getbasiclinkageforeList(CenterdataTFirecontrolBasicLinkageForce centerdataTFirecontrolBasicLinkageForce) {
         setSookaDataBase(centerdataTFirecontrolBasicLinkageForce);
         List<Map<String,Object>> mapList = fireControlBigDataMapper.getbasiclinkageforeList(centerdataTFirecontrolBasicLinkageForce);
+        if (StringUtils.isEmpty(centerdataTFirecontrolBasicLinkageForce.getDeptId().toString())){
+            centerdataTFirecontrolBasicLinkageForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolBasicLinkageForce.getDeptId()));
     }
 
@@ -155,6 +165,9 @@ 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);
+        if (StringUtils.isEmpty(centerdataTFirecontrolFireForce.getDeptId().toString())){
+            centerdataTFirecontrolFireForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTFirecontrolFireForce.getDeptId()));
     }
 
@@ -166,6 +179,9 @@ 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);
+        if (StringUtils.isEmpty(visuForestCloudMapVO.getDeptId().toString())){
+            visuForestCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(visuForestCloudMapVO.getDeptId()));
     }
 
@@ -180,6 +196,9 @@ 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);
+        if (StringUtils.isEmpty(dataVisuFireCloudMapVO.getDeptId().toString())){
+            dataVisuFireCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(dataVisuFireCloudMapVO.getDeptId()));
     }
 

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/ForestBigDataServiceImpl.java

@@ -1,7 +1,10 @@
 package com.sooka.sponest.data.digitalforest.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.basicdata.domain.CenterdataTForestCar;
@@ -18,6 +21,7 @@ import com.sooka.sponest.data.generalbusiness.domain.vo.CenterdataTForestWeather
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
 
@@ -32,8 +36,9 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     @Autowired
     private ForestBigDataMapper forestBigDataMapper;
 
-    @Autowired
+    @Resource
     private DeptLevelUtil deptLevelUtil;
+
     @DataScopeMutiDept(deptAlias = "d")
     @Override
     public List<VisuForestCloudEventTypeBO> selectBigDataFarmDeptCount(CenterdataTForestFarm centerdataTForestFarm) {
@@ -173,6 +178,9 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String, Object>> selectCenterdataTForestPlanHz(CenterdataTAfforestationTask centerdataTAfforestationTask) {
         setSookaDataBase(centerdataTAfforestationTask);
         List<Map<String,Object>> list = forestBigDataMapper.queryTaskArea(centerdataTAfforestationTask);
+        if (StringUtils.isEmpty(centerdataTAfforestationTask.getDeptId().toString())){
+            centerdataTAfforestationTask.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTAfforestationTask.getDeptId()));
     }
 
@@ -188,6 +196,9 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     public List<Map<String, Object>> focusOnFire(CenterdataTForestKeyFireproofPlots centerdataTForestKeyFireproofPlots) {
         setSookaDataBase(centerdataTForestKeyFireproofPlots);
         List<Map<String,Object>> list = forestBigDataMapper.focusOnFire(centerdataTForestKeyFireproofPlots);
+        if (StringUtils.isEmpty(centerdataTForestKeyFireproofPlots.getDeptId().toString())){
+            centerdataTForestKeyFireproofPlots.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestKeyFireproofPlots.getDeptId()));
     }
 
@@ -196,6 +207,9 @@ 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);
+        if (StringUtils.isEmpty(centerdataTForestResources.getDeptId().toString())){
+            centerdataTForestResources.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestResources.getDeptId()));
     }
 
@@ -204,6 +218,9 @@ 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);
+        if (StringUtils.isEmpty(centerdataTForestGridLevel.getDeptId().toString())){
+            centerdataTForestGridLevel.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestGridLevel.getDeptId()));
     }
 
@@ -212,6 +229,9 @@ 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);
+        if (StringUtils.isEmpty(centerdataTForestTrees.getDeptId().toString())){
+            centerdataTForestTrees.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestTrees.getDeptId()));
     }
 

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

@@ -1,8 +1,11 @@
 package com.sooka.sponest.data.digitalresource.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestGrid;
@@ -17,6 +20,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +32,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
     @Autowired
     private DigitalResourcesBigDataMapper digitalResourcesBigDataMapper;
 
-    @Autowired
+    @Resource
     private DeptLevelUtil deptLevelUtil;
 
     private static final String VALUE = "value";
@@ -158,6 +162,9 @@ 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"));
+        if (StringUtils.isEmpty(centerdataTFarmBasicFarmland.getDeptId().toString())){
+            centerdataTFarmBasicFarmland.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),String.valueOf(centerdataTFarmBasicFarmland.getDeptId()));
     }
     /**

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

@@ -2,6 +2,8 @@ package com.sooka.sponest.data.digitalwater.service.impl;
 
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.utils.DeptLevelUtil;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestGrid;
@@ -14,6 +16,8 @@ import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -30,7 +34,7 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
     @Autowired
     private WaterBigDataMapper waterBigDataMapper;
 
-    @Autowired
+    @Resource
     private DeptLevelUtil deptLevelUtil;
     @DataScopeMutiDept(deptAlias = "d")
     @Override
@@ -156,8 +160,7 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
     public List<Map<String,Object>> selectHydropowerResources(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) throws IOException {
         setSookaDataBase(centerdataTResourcesHydroenergy);
         List<Map<String,Object>> list = waterBigDataMapper.selectCenterdataTResourcesHydroenergyList(centerdataTResourcesHydroenergy);
-
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTResourcesHydroenergy.getDeptId()));
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(SecurityUtils.getLoginUser().getSysUser().getDeptId()));
     }