农业耕种统计

src/main/java/com/sooka/sponest/data/digitalagriculture/service/IAgricultureBigDataService.java

@@ -56,7 +56,7 @@ public interface IAgricultureBigDataService {
 
     List<Map<String,Object>> getSeedStockByType(AgricultureBigDataBO agricultureBigDataBO);
 
-    Map<String, List<Map<String, Object>>> getCultivationStatistics(AgricultureBigDataBO agricultureBigDataBO);
+    List<Map<String,Object>> getCultivationStatistics(AgricultureBigDataBO agricultureBigDataBO);
 
     List<Map<String,Object>> getAgriculturalSubsidy(AgricultureBigDataBO agricultureBigDataBO);
 

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

@@ -233,7 +233,7 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
      */
     @Override
     @DataScopeMutiDept(deptAlias = "d")
-    public Map<String, List<Map<String, Object>>> getCultivationStatistics(AgricultureBigDataBO agricultureBigDataBO) {
+    public List<Map<String,Object>> getCultivationStatistics(AgricultureBigDataBO agricultureBigDataBO) {
         setSookaDataBase(agricultureBigDataBO);
         // 获取当前时间
         Date currentTime = new Date();
@@ -242,26 +242,25 @@ public class AgricultureBigDataServiceImpl extends BaseServiceImpl implements IA
         calendar.setTime(currentTime);
         // 获取当前年份
         int currentYear = calendar.get(Calendar.YEAR);
-        // 获取当前年份的数据
-        List<Map<String, Object>> currentYearStatistics = getStatisticsByYear(agricultureBigDataBO, String.valueOf(currentYear));
-        if (StringUtils.isNull(agricultureBigDataBO.getDeptId())){
-            agricultureBigDataBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().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>> mapList = new ArrayList<>();
+        for (int i = currentYear; i >= currentYear - 4; i--) {
+            Map<String, Object> map = new HashMap<>();
             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(agricultureBigDataBO.getDeptId().toString(),statisticsByYear,addKeys));
+            List<Map<String, Object>> deptLevel=deptLevelUtil.getDeptLevel(agricultureBigDataBO.getDeptId().toString(),statisticsByYear,addKeys);
+            map.put("year",i);
+            map.put("value",deptLevel);
+            mapList.add(map);
         }
         // 根据name（年份）进行分组
-        return deptLevel.stream().collect(Collectors.groupingBy(map -> map.get("name").toString()));
+        return mapList;
     }
 
     /**