数字中台-数字农业接口(添加deptId)

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/bo/AgricultureBigDataBO.java

@@ -17,6 +17,8 @@ import lombok.Data;
 @ApiModel(value = "AgricultureBigDataBO对象" , description = "AgricultureBigDataBO对象")
 public class AgricultureBigDataBO extends BaseBusinessEntity {
 
+    @ApiModelProperty(value = "deptId")
+    private Long deptId;
     @ApiModelProperty(value = "value")
     private double value;
     @ApiModelProperty(value = "zong")

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

@@ -191,7 +191,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stockNum", 0);
             list.add(objectObjectHashMap);
         }
-        return deptLevelUtil.getDeptLevel(list);
+        return deptLevelUtil.getDeptLevel(list,String.valueOf(agricultureBigDataBO.getDeptId()));
 
     }
 
@@ -215,7 +215,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stockNum", 0);
             seedStockByType.add(objectObjectHashMap);
         }
-        return deptLevelUtil.getDeptLevel(seedStockByType);
+        return deptLevelUtil.getDeptLevel(seedStockByType,String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 
     /**
@@ -238,11 +238,11 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         List<Map<String, Object>> deptLevel;
         // 获取当前年份的数据
         List<Map<String, Object>> currentYearStatistics = getStatisticsByYear(agricultureBigDataBO, String.valueOf(currentYear));
-        deptLevel = deptLevelUtil.getDeptLevel(currentYearStatistics);
+        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));
-            deptLevel.addAll(deptLevelUtil.getDeptLevel(statisticsByYear));
+            deptLevel.addAll(deptLevelUtil.getDeptLevel(statisticsByYear,String.valueOf(agricultureBigDataBO.getDeptId())));
         }
         return deptLevel;
     }
@@ -286,7 +286,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("breedMoneyNum", 0);
             agriculturalSubsidy.add(objectObjectHashMap);
         }
-        return deptLevelUtil.getDeptLevel(agriculturalSubsidy);
+        return deptLevelUtil.getDeptLevel(agriculturalSubsidy,String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 
     /**
@@ -307,19 +307,19 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             for (int i = 1; i <= 3; i++) {
                 String label = DictUtil.getLabel("farm_subsidy_type", String.valueOf(i));
                 maps = getAgriculturalSubsidyBySubclass(agricultureBigDataBO, i, label);
-                agriculturalSubsidyBySubclass.addAll(deptLevelUtil.getDeptLevel(maps));
+                agriculturalSubsidyBySubclass.addAll(deptLevelUtil.getDeptLevel(maps,String.valueOf(agricultureBigDataBO.getDeptId())));
             }
         } else if ("farm_mac_type".equals(agricultureBigDataBO.getDictValue())) {
             for (int i = 1; i <= 14; i++) {
                 String label = DictUtil.getLabel("farm_mac_type", String.valueOf(i));
                 maps = getAgriculturalSubsidyBySubclass(agricultureBigDataBO, i, label);
-                agriculturalSubsidyBySubclass.addAll(deptLevelUtil.getDeptLevel(maps));
+                agriculturalSubsidyBySubclass.addAll(deptLevelUtil.getDeptLevel(maps,String.valueOf(agricultureBigDataBO.getDeptId())));
             }
         } else if ("farm_breed_type".equals(agricultureBigDataBO.getDictValue())) {
             for (int i = 1; i <= 4; i++) {
                 String label = DictUtil.getLabel("farm_breed_type", String.valueOf(i));
                 maps = getAgriculturalSubsidyBySubclass(agricultureBigDataBO, i, label);
-                agriculturalSubsidyBySubclass.addAll(deptLevelUtil.getDeptLevel(maps));
+                agriculturalSubsidyBySubclass.addAll(deptLevelUtil.getDeptLevel(maps,String.valueOf(agricultureBigDataBO.getDeptId())));
             }
         }
 
@@ -382,7 +382,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
                 objectObjectHashMap.put("areaNum", 0);
                 maps.add(objectObjectHashMap);
             }
-            farmlandStatistics.addAll(deptLevelUtil.getDeptLevel(maps));
+            farmlandStatistics.addAll(deptLevelUtil.getDeptLevel(maps,String.valueOf(agricultureBigDataBO.getDeptId())));
         }
         return farmlandStatistics;
     }
@@ -400,19 +400,19 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         // 示范级别
         List<Map<String, Object>> statisticsByLeaseTerm = agricultureBigDataMapper.getCooperativesStatisticsByLeaseTerm(agricultureBigDataBO);
         int leaseTermSum = getStatisticsSum(statisticsByLeaseTerm);
-        List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(statisticsByLeaseTerm));
+        List<Map<String, Object>> cooperativesStatistics = new ArrayList<>(deptLevelUtil.getDeptLevel(statisticsByLeaseTerm,String.valueOf(agricultureBigDataBO.getDeptId())));
         // 成员出资额
         List<Map<String, Object>> statisticsByRegisterCapital = agricultureBigDataMapper.getCooperativesStatisticsByRegisterCapital(agricultureBigDataBO);
         int registerCapitalSum = getStatisticsSum(statisticsByRegisterCapital);
-        cooperativesStatistics.addAll(deptLevelUtil.getDeptLevel(statisticsByRegisterCapital));
+        cooperativesStatistics.addAll(deptLevelUtil.getDeptLevel(statisticsByRegisterCapital,String.valueOf(agricultureBigDataBO.getDeptId())));
         // 入社人员
         List<Map<String, Object>> statisticsByMembersNum = agricultureBigDataMapper.getCooperativesStatisticsByMembersNum(agricultureBigDataBO);
         int membersNumSum = getStatisticsSum(statisticsByMembersNum);
-        cooperativesStatistics.addAll(deptLevelUtil.getDeptLevel(statisticsByMembersNum));
+        cooperativesStatistics.addAll(deptLevelUtil.getDeptLevel(statisticsByMembersNum,String.valueOf(agricultureBigDataBO.getDeptId())));
         // 带动农户
         List<Map<String, Object>> statisticsByDrivenFarmersNum = agricultureBigDataMapper.getCooperativesStatisticsByDrivenFarmersNum(agricultureBigDataBO);
         int drivenFarmersNumSum = getStatisticsSum(statisticsByDrivenFarmersNum);
-        cooperativesStatistics.addAll(deptLevelUtil.getDeptLevel(statisticsByDrivenFarmersNum));
+        cooperativesStatistics.addAll(deptLevelUtil.getDeptLevel(statisticsByDrivenFarmersNum,String.valueOf(agricultureBigDataBO.getDeptId())));
 
         Map<String, Object> registerCapitalSumMap = new HashMap<>();
         registerCapitalSumMap.put("name", "成员出资额总额");
@@ -494,6 +494,6 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
             objectObjectHashMap.put("stillAreaNum", 0);
             strawTurnover.add(objectObjectHashMap);
         }
-        return deptLevelUtil.getDeptLevel(strawTurnover);
+        return deptLevelUtil.getDeptLevel(strawTurnover,String.valueOf(agricultureBigDataBO.getDeptId()));
     }
 }