From 4a75ef42a9417267ae35516aa49d7b3e4ace9fdc Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 13 Oct 2023 17:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E6=94=B9=E4=B8=BA=E6=98=9F?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/dashboard/handle/CockpitStatsHandler.java    | 18 ++++++++++++++----
 .../scheduler/task/CockpitStatsStatisticsTask.java     |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java
index 4ab1a74..0b78a43 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/handle/CockpitStatsHandler.java
@@ -6,6 +6,7 @@ import com.ningdatech.pmapi.common.constant.RegionConst;
 import com.ningdatech.pmapi.common.helper.RegionCacheHelper;
 import com.ningdatech.pmapi.dashboard.model.entity.CockpitStats;
 import com.ningdatech.pmapi.dashboard.model.vo.CockpitStatsVO;
+import com.ningdatech.pmapi.dashboard.service.ICockpitStatsService;
 import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -30,6 +32,8 @@ public class CockpitStatsHandler {
 
     private final RegionCacheHelper regionCacheHelper;
 
+    private final ICockpitStatsService cockpitStatsService;
+
     public CockpitStatsVO convertCockpitStats(CockpitStats cockpitStats) {
         CockpitStatsVO res = BeanUtil.copyProperties(cockpitStats,CockpitStatsVO.class);
 
@@ -103,7 +107,7 @@ public class CockpitStatsHandler {
 
     private List<CockpitStatsVO.MapProjectsData> convertMapProjectsData(CockpitStats cockpitStats) {
         List<CockpitStatsVO.MapProjectsData> mapProjectsDatas = Lists.newArrayList();
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_COUNTY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
         regions = regions.stream().sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList());
         for(RegionDTO region : regions){
             CockpitStatsVO.MapProjectsData mapProjectsData = new CockpitStatsVO.MapProjectsData();
@@ -128,14 +132,20 @@ public class CockpitStatsHandler {
 
     private List<CockpitStatsVO.ExpertRegion> buidExpertRegionData(CockpitStats cockpitStats) {
         List<CockpitStatsVO.ExpertRegion> regionData = Lists.newArrayList();
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_COUNTY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
         regions = regions.stream().sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList());
+
+        List<CockpitStats> cs = cockpitStatsService.list();
+        Map<String, Integer> csMap = cs.stream().collect(Collectors.toMap(c -> c.getRegionCode() + c.getYear(), CockpitStats::getExpertTotalNum));
         for(RegionDTO region : regions){
             CockpitStatsVO.ExpertRegion expertRegion = new CockpitStatsVO.ExpertRegion();
             expertRegion.setRegionCode(region.getRegionCode());
             expertRegion.setRegionName(region.getRegionName());
-            //TODO: 区域数据
-            expertRegion.setExpertNum(0);
+            if(csMap.containsKey(region.getRegionCode() + 0)){
+                expertRegion.setExpertNum(csMap.get(region.getRegionCode() + 0));
+            }else{
+                expertRegion.setExpertNum(0);
+            }
             regionData.add(expertRegion);
         }
         return regionData;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java
index 72f40a4..3911c4b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java
@@ -103,7 +103,7 @@ public class CockpitStatsStatisticsTask {
                     DashboardConstant.CockpitStats.TOTAL,year));
         }
 
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_COUNTY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
 
         for(RegionDTO regionDto :  regions){
             res.add(statisticsData(regionDto.getRegionCode(),regionDto.getRegionName(),0));