1.自测bug修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java

@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
+import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
@@ -202,6 +204,17 @@ public class DPStatisticsServiceImpl {
         return result;
     }
 
+    private List<RegionModel> setRegionIfRootParent(String regionCode) throws Exception {
+        List<RegionModel> regionList = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
+        // 陕西省时需要在地图返回独立的地级市:韩城、杨凌、西咸
+        if (regionCode.equals(TZSCommonConstant.SHAN_XI_REGION_CODE)) {
+            List<RegionModel> independentRegions = ReginStepEnum.enum2RegionList("map");
+            regionList.addAll(independentRegions);
+        }
+        return regionList;
+    }
+
+
     private void buildYDataForInspectPersonCount(Map<String, Object> result, List<RegionModel> childRegion) {
         List<Long> yData = new ArrayList<>();
         childRegion.forEach(regionModel -> {
@@ -235,8 +248,7 @@ public class DPStatisticsServiceImpl {
     private List<RegionModel> getRegionList(DPFilterParamDto dpFilterParamDto) {
         try {
             if (regionChildRegionMap.get(dpFilterParamDto.getCityCode()) == null) {
-                FeignClientResult<List<RegionModel>> feignClientResult = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(dpFilterParamDto.getCityCode()));
-                List<RegionModel> regionModels = feignClientResult.getResult();
+                List<RegionModel> regionModels = this.setRegionIfRootParent(dpFilterParamDto.getCityCode());
                 regionChildRegionMap.put(dpFilterParamDto.getCityCode(), regionModels);
                 return regionModels;
             } else {
@@ -428,7 +440,7 @@ public class DPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> getCenterMapCountDataForOverview(DPFilterParamDto dpFilterParamDto) {
-        return getRegionList(dpFilterParamDto).parallelStream().filter(e -> e.getParentRegionCode() != null && (e.getParentRegionCode().toString()).equals(dpFilterParamDto.getCityCode())).map(r -> {
+        return getRegionList(dpFilterParamDto).parallelStream().map(r -> {
             DPFilterParamDto filterParamDto = new DPFilterParamDto();
             filterParamDto.setCityCode(r.getRegionCode().toString());
             Map<String, Object> itemResult = getCenterMapOverviewData(filterParamDto);