更新deptLevelUtil相关代码

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

@@ -215,18 +215,21 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
      * @return
      */
     private List<Map<String, Object>> getMaps(AgricultureBigDataBO agricultureBigDataBO, List<Map<String, Object>> list) {
-        if (list == null || list.isEmpty()) {
-            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-            objectObjectHashMap.put("ancestors", 0);
-            objectObjectHashMap.put("deptId", 0);
-            objectObjectHashMap.put("salesVolumeNum", 0);
-            objectObjectHashMap.put("stockNum", 0);
-            list.add(objectObjectHashMap);
-        }
+        //if (list == null || list.isEmpty()) {
+        //    HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        //    objectObjectHashMap.put("ancestors", 0);
+        //    objectObjectHashMap.put("deptId", 0);
+        //    objectObjectHashMap.put("salesVolumeNum", 0);
+        //    objectObjectHashMap.put("stockNum", 0);
+        //    list.add(objectObjectHashMap);
+        //}
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("salesVolumeNum");
+        addKeys.add("stockNum");
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(agricultureBigDataBO.getDeptId()));
+        return deptLevelUtil.getDeptLevel(agricultureBigDataBO.getDeptId().toString(), list, addKeys);
     }
 
 
@@ -252,17 +255,21 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        List<Map<String, Object>> deptLevel = deptLevelUtil.getDeptLevel(currentYearStatistics,String.valueOf(agricultureBigDataBO.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("landAreaNum");
+        addKeys.add("estimatedProductionNum");
+        addKeys.add("actualOutputNum");
+        List<Map<String, Object>> deptLevel = deptLevelUtil.getDeptLevel(agricultureBigDataBO.getDeptId().toString(),currentYearStatistics,addKeys);
         // 获取过去五年的数据
         for (int i = currentYear - 1; i >= currentYear - 4; i--) {
             List<Map<String, Object>> statisticsByYear = getStatisticsByYear(agricultureBigDataBO, String.valueOf(i));
             if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
                 agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
             }
-            deptLevel.addAll(deptLevelUtil.getDeptLevel(statisticsByYear,String.valueOf(agricultureBigDataBO.getDeptId())));
+            deptLevel.addAll(deptLevelUtil.getDeptLevel(agricultureBigDataBO.getDeptId().toString(),statisticsByYear,addKeys));
         }
         // 根据name（年份）进行分组
-        return deptLevel.stream().collect(Collectors.groupingBy(map -> (String) map.get("name")));
+        return deptLevel.stream().collect(Collectors.groupingBy(map -> map.get("name").toString()));
     }
 
     /**
@@ -273,12 +280,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         List<Map<String, Object>> statisticsByYear = agricultureBigDataMapper.getCultivationStatisticsByYear(agricultureBigDataBO, year);
         if (statisticsByYear == null || statisticsByYear.isEmpty()) {
             Map<String, Object> objectObjectHashMap = new HashMap<>();
-            objectObjectHashMap.put("ancestors", 0);
-            objectObjectHashMap.put("deptId", 0);
             objectObjectHashMap.put("name", year);
-            objectObjectHashMap.put("landAreaNum", 0);
-            objectObjectHashMap.put("estimatedProductionNum", 0);
-            objectObjectHashMap.put("actualOutputNum", 0);
             statisticsByYear.add(objectObjectHashMap);
         }
         return statisticsByYear;
@@ -295,19 +297,14 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
     public List<Map<String, Object>> getAgriculturalSubsidy(AgricultureBigDataBO agricultureBigDataBO) {
         setSookaDataBase(agricultureBigDataBO);
         List<Map<String, Object>> agriculturalSubsidy = agricultureBigDataMapper.getAgriculturalSubsidy(agricultureBigDataBO);
-        if (agriculturalSubsidy == null || agriculturalSubsidy.isEmpty()) {
-            Map<String, Object> objectObjectHashMap = new HashMap<>();
-            objectObjectHashMap.put("ancestors", 0);
-            objectObjectHashMap.put("deptId", 0);
-            objectObjectHashMap.put("subsidyMoneyNum", 0);
-            objectObjectHashMap.put("farmMacMoneyNum", 0);
-            objectObjectHashMap.put("breedMoneyNum", 0);
-            agriculturalSubsidy.add(objectObjectHashMap);
-        }
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("subsidyMoneyNum");
+        addKeys.add("farmMacMoneyNum");
+        addKeys.add("breedMoneyNum");
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(agriculturalSubsidy,String.valueOf(agricultureBigDataBO.getDeptId()));
+        return deptLevelUtil.getDeptLevel(agricultureBigDataBO.getDeptId().toString(),agriculturalSubsidy,addKeys);
     }
 
     /**
@@ -396,12 +393,13 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
     public List<Map<String, Object>> getFarmlandStatistics(AgricultureBigDataBO agricultureBigDataBO) {
         setSookaDataBase(agricultureBigDataBO);
         Map<String, Object> map = new HashMap<>();
+        List<SysDictData> dictKeys = DictUtils.getDictCache("farm_field_attribute");
         map.put("agricultureBigDataBO",agricultureBigDataBO);
-        map.put("dictList", DictUtils.getDictCache("farm_field_attribute"));
+        map.put("dictList", dictKeys);
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(agricultureBigDataMapper.getFarmlandStatistics(map),String.valueOf(agricultureBigDataBO.getDeptId()));
+        return  deptLevelUtil.getDeptLevel(dictKeys,agricultureBigDataMapper.getFarmlandStatistics(map),agricultureBigDataBO.getDeptId().toString());
     }
 
     /**
@@ -415,39 +413,40 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
     public Map<String,List<Map<String, Object>>> getCooperativesStatistics(AgricultureBigDataBO agricultureBigDataBO) {
         setSookaDataBase(agricultureBigDataBO);
         Map<String,List<Map<String, Object>>> hashMap = new HashMap<>();
+
         // 合作社数量
         List<Map<String, Object>> cooperativesStatisticsByCooperatives = agricultureBigDataMapper.getCooperativesStatisticsByCooperatives(agricultureBigDataBO);
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(cooperativesStatisticsByCooperatives,String.valueOf(agricultureBigDataBO.getDeptId())));
+        List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(String.valueOf(agricultureBigDataBO.getDeptId()),cooperativesStatisticsByCooperatives,"num"));
         // 示范级别
         List<Map<String, Object>> statisticsByLeaseTerm = agricultureBigDataMapper.getCooperativesStatisticsByLeaseTerm(agricultureBigDataBO);
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        List<Map<String, Object>> statisticsByLeaseTermList = deptLevelUtil.getDeptLevel(statisticsByLeaseTerm, String.valueOf(agricultureBigDataBO.getDeptId()));
+        List<Map<String, Object>> statisticsByLeaseTermList = deptLevelUtil.getDeptLevel(String.valueOf(agricultureBigDataBO.getDeptId()),statisticsByLeaseTerm,"num");
         // 成员出资额
         List<Map<String, Object>> statisticsByRegisterCapital = agricultureBigDataMapper.getCooperativesStatisticsByRegisterCapital(agricultureBigDataBO);
         int registerCapitalSum = getStatisticsSum(statisticsByRegisterCapital);
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        List<Map<String, Object>> statisticsByRegisterCapitalList = deptLevelUtil.getDeptLevel(statisticsByRegisterCapital, String.valueOf(agricultureBigDataBO.getDeptId()));
+        List<Map<String, Object>> statisticsByRegisterCapitalList = deptLevelUtil.getDeptLevel(String.valueOf(agricultureBigDataBO.getDeptId()),statisticsByRegisterCapital,"num");
         // 入社人员
         List<Map<String, Object>> statisticsByMembersNum = agricultureBigDataMapper.getCooperativesStatisticsByMembersNum(agricultureBigDataBO);
         int membersNumSum = getStatisticsSum(statisticsByMembersNum);
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        List<Map<String, Object>> statisticsByMembersNumList = deptLevelUtil.getDeptLevel(statisticsByMembersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
+        List<Map<String, Object>> statisticsByMembersNumList = deptLevelUtil.getDeptLevel(String.valueOf(agricultureBigDataBO.getDeptId()),statisticsByMembersNum,"num");
         // 带动农户
         List<Map<String, Object>> statisticsByDrivenFarmersNum = agricultureBigDataMapper.getCooperativesStatisticsByDrivenFarmersNum(agricultureBigDataBO);
         int drivenFarmersNumSum = getStatisticsSum(statisticsByDrivenFarmersNum);
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        List<Map<String, Object>> statisticsByDrivenFarmersNumList = deptLevelUtil.getDeptLevel(statisticsByDrivenFarmersNum, String.valueOf(agricultureBigDataBO.getDeptId()));
+        List<Map<String, Object>> statisticsByDrivenFarmersNumList = deptLevelUtil.getDeptLevel(String.valueOf(agricultureBigDataBO.getDeptId()),statisticsByDrivenFarmersNum, "num");
 
         // 数据分组
         for (int i = 0; i <cooperativesStatistics.size();i++){
@@ -533,16 +532,9 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
     public List<Map<String, Object>> getStrawTurnover(AgricultureBigDataBO agricultureBigDataBO) {
         setSookaDataBase(agricultureBigDataBO);
         List<Map<String, Object>> strawTurnover = agricultureBigDataMapper.getStrawTurnover(agricultureBigDataBO);
-        if (strawTurnover == null || strawTurnover.isEmpty()) {
-            Map<String, Object> objectObjectHashMap = new HashMap<>();
-            objectObjectHashMap.put("ancestors", 0);
-            objectObjectHashMap.put("deptId", 0);
-            objectObjectHashMap.put("stillAreaNum", 0);
-            strawTurnover.add(objectObjectHashMap);
-        }
         if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
             agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(strawTurnover,String.valueOf(agricultureBigDataBO.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(agricultureBigDataBO.getDeptId()),strawTurnover,"stillAreaNum");
     }
 }

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

@@ -176,7 +176,7 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
         if (StringUtils.isBlank(environmentBigDataVo.getDeptId())){
             environmentBigDataVo.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
         }
-        return deptLevelUtil.getDeptLevel(list,environmentBigDataVo.getDeptId());
+        return deptLevelUtil.getDeptLevel(environmentBigDataVo.getDeptId(),list,"num");
     }
 
     @DataScopeMutiDept(deptAlias = "d")

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

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -123,7 +124,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
         if (StringUtils.isNull(centerdataTFirecontrolFoamLiquid.getDeptId())){
             centerdataTFirecontrolFoamLiquid.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolFoamLiquid.getDeptId()),mapList,"reserves");
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -134,7 +135,11 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
         if (StringUtils.isNull(centerdataTFirecontrolBasicLinkageForce.getDeptId())){
             centerdataTFirecontrolBasicLinkageForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTFirecontrolBasicLinkageForce.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("forkliftNum");
+        addKeys.add("fightingNum");
+        addKeys.add("ton");
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolBasicLinkageForce.getDeptId()),mapList,addKeys);
     }
 
     /**
@@ -168,7 +173,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
         if (StringUtils.isNull(centerdataTFirecontrolFireForce.getDeptId())){
             centerdataTFirecontrolFireForce.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTFirecontrolFireForce.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTFirecontrolFireForce.getDeptId()),list,"value");
     }
 
     /**
@@ -182,7 +187,11 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
         if (StringUtils.isNull(visuForestCloudMapVO.getDeptId())){
             visuForestCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(visuForestCloudMapVO.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("fireHydrant");
+        addKeys.add("waterIntake");
+        addKeys.add("waterCranes");
+        return deptLevelUtil.getDeptLevel(String.valueOf(visuForestCloudMapVO.getDeptId()),list,addKeys);
     }
 
     /**
@@ -199,7 +208,7 @@ public class FireControlBigDataServiceImpl extends BaseServiceImpl implements IF
         if (StringUtils.isNull(dataVisuFireCloudMapVO.getDeptId())){
             dataVisuFireCloudMapVO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(dataVisuFireCloudMapVO.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(dataVisuFireCloudMapVO.getDeptId()),list,"num");
     }
 
 }

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

@@ -181,7 +181,11 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
         if (StringUtils.isNull(centerdataTAfforestationTask.getDeptId())){
             centerdataTAfforestationTask.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTAfforestationTask.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("begin");
+        addKeys.add("notbegin");
+        addKeys.add("success");
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTAfforestationTask.getDeptId()),list,addKeys);
     }
 
     @Override
@@ -199,7 +203,10 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
         if (StringUtils.isNull(centerdataTForestKeyFireproofPlots.getDeptId())){
             centerdataTForestKeyFireproofPlots.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestKeyFireproofPlots.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("area");
+        addKeys.add("species");
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTForestKeyFireproofPlots.getDeptId()),list,addKeys);
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -210,7 +217,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
         if (StringUtils.isNull(centerdataTForestResources.getDeptId())){
             centerdataTForestResources.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestResources.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTForestResources.getDeptId()),list,"areaTotal");
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -221,7 +228,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
         if (StringUtils.isNull(centerdataTForestGridLevel.getDeptId())){
             centerdataTForestGridLevel.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestGridLevel.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTForestGridLevel.getDeptId()),list,"gridTotal");
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -232,7 +239,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
         if (StringUtils.isNull(centerdataTForestTrees.getDeptId())){
             centerdataTForestTrees.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTForestTrees.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTForestTrees.getDeptId()),list,"treeTotal");
     }
 
 }

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

@@ -5,6 +5,7 @@ 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.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,7 +53,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         if (StringUtils.isNull(centerdataTResourcesDeposit.getDeptId())){
             centerdataTResourcesDeposit.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTResourcesDeposit.getDeptId()));
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTResourcesDeposit.getDeptId()),mapList,"value");
     }
 
     /**
@@ -163,12 +165,13 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
     public List<Map<String, Object>> selectFarmBasicFarmlandCount(CenterdataTFarmBasicFarmland centerdataTFarmBasicFarmland) {
         setSookaDataBase(centerdataTFarmBasicFarmland);
         Map<String, Object> map = new HashMap<>();
+        List<SysDictData> dictKeys = DictUtils.getDictCache("farm_field_attribute");
         map.put("centerdataTFarmBasicFarmland",centerdataTFarmBasicFarmland);
-        map.put("dictList",DictUtils.getDictCache("farm_field_attribute"));
+        map.put("dictList",dictKeys);
         if (StringUtils.isNull(centerdataTFarmBasicFarmland.getDeptId())){
             centerdataTFarmBasicFarmland.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),String.valueOf(centerdataTFarmBasicFarmland.getDeptId()));
+        return deptLevelUtil.getDeptLevel(dictKeys,digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map),String.valueOf(centerdataTFarmBasicFarmland.getDeptId()));
     }
     /**
      * 地质灾害易发区
@@ -197,7 +200,10 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
         if (StringUtils.isNull(centerdataTHydraulicPatrolTask.getDeptId())){
             centerdataTHydraulicPatrolTask.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(hydraulicPatrolTask,String.valueOf(centerdataTHydraulicPatrolTask.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("realLength");
+        addKeys.add("patrolTrajectory");
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTHydraulicPatrolTask.getDeptId()),hydraulicPatrolTask,addKeys);
 
     }
     private String getPlanLength(String patrolTrajectory) {

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

@@ -16,9 +16,9 @@ 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.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -163,7 +163,10 @@ public class WaterBigDataServiceImpl extends BaseServiceImpl implements IWaterBi
         if (StringUtils.isNull(centerdataTResourcesHydroenergy.getDeptId())){
             centerdataTResourcesHydroenergy.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
         }
-        return deptLevelUtil.getDeptLevel(list,String.valueOf(centerdataTResourcesHydroenergy.getDeptId()));
+        List<String> addKeys = new ArrayList<>();
+        addKeys.add("riverTotal");
+        addKeys.add("waterVolume");
+        return deptLevelUtil.getDeptLevel(String.valueOf(centerdataTResourcesHydroenergy.getDeptId()),list,addKeys);
     }
 
 

src/main/resources/mapper/digitalagriculture/AgricultureBigDataMapper.xml

@@ -607,16 +607,14 @@
         select
         a.dept_id deptId,d.ancestors,
         <foreach item="item" collection="map.dictList" open="" separator="," close="">
-            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS area${item.dictValue}
+            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS A${item.dictValue}
         </foreach>
         FROM
         centerdata_t_farm_land_info a
         LEFT JOIN ${map.agricultureBigDataBO.database_system}.sys_dept d ON a.dept_id = d.dept_id
-        LEFT JOIN ${map.agricultureBigDataBO.database_system}.sys_dict_data dict ON a.attribute = dict.dict_value
         <where>
-            dict.dict_type = 'farm_field_attribute'
+            1=1 ${map.agricultureBigDataBO.params.dataScope}
         </where>
-        GROUP BY a.id
     </select>
 
     <select id="getCooperativesStatisticsByCooperatives" resultType="map">

src/main/resources/mapper/digitalresource/DigitalResourcesBigDataMapper.xml

@@ -273,14 +273,13 @@
         select
         a.dept_id deptId,d.ancestors,
         <foreach item="item" collection="map.dictList" open="" separator="," close="">
-            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS #{item.dictLabel}
+            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS A${item.dictValue}
         </foreach>
         FROM
         centerdata_t_farm_basic_farmland a
         LEFT JOIN ${map.centerdataTFarmBasicFarmland.database_system}.sys_dept d ON a.dept_id = d.dept_id
-        LEFT JOIN ${map.centerdataTFarmBasicFarmland.database_system}.sys_dict_data dict ON a.attribute = dict.dict_value
         WHERE
-        dict.dict_type = 'farm_field_attribute'
+            1=1
         ${map.centerdataTFarmBasicFarmland.params.dataScope}
         GROUP BY a.id
    </select>