当前区域数据统计

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderAreaDataServiceImpl.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+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.cylinder.api.dto.KeyValueDto;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
@@ -313,8 +316,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
     }
 
     public Map<String, Object> getChildEarlyWarning(String regionCode) throws Exception {
-        List<RegionModel> regionModels = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
-        List<Map> list = new ArrayList<>();
+        List<RegionModel> regionModels = this.setRegionIfRootParent(regionCode);
         List<String> collect = regionModels.stream().map(c -> c.getRegionCode().toString()).collect(Collectors.toList());
         List<CompanyModel> companyModelList = Privilege.companyClient.queryListByCompanyCode(Strings.join(collect, ",")).getResult();
         Map<String, CompanyModel> companyMap = companyModelList.stream().collect(Collectors.toMap(CompanyModel::getCompanyCode, c -> c));
@@ -464,7 +466,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
 
     public Map<String, Object> getCylinderStatisticsDataByCity(String regionCode) throws Exception {
         // 构建搜索请求
-        List<RegionModel> regionList = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
+        List<RegionModel> regionList = this.setRegionIfRootParent(regionCode);
         List<String> companyCode = regionList.stream().map(r -> r.getRegionCode().toString()).collect(Collectors.toList());
         List<CompanyModel> companyList = Privilege.companyClient.queryListByCompanyCode(String.join(",", companyCode)).getResult();
         Map<String, RegionModel> regionMap = regionList.stream().collect(Collectors.toMap(r ->r.getRegionCode().toString(), r -> r));
@@ -550,6 +552,16 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
         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;
+    }
+
     public Map<String, Object> getCylinderStatisticsDataByCityForTotal(String regionCode) throws IOException {
         // 构建搜索请求
         CompanyModel comapany = Privilege.companyClient.queryByCompanyCode(regionCode).getResult();
@@ -597,7 +609,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
 
     public List<Map<String, Object>> getCylinderStatisticsDataByCityForMap(String regionCode) throws Exception {
         // 构建搜索请求
-        List<RegionModel> regionList = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
+        List<RegionModel> regionList = this.setRegionIfRootParent(regionCode);
         List<String> companyCode = regionList.stream().map(r -> r.getRegionCode().toString()).collect(Collectors.toList());
         List<CompanyModel> companyList = Privilege.companyClient.queryListByCompanyCode(String.join(",", companyCode)).getResult();
         Map<String, RegionModel> regionMap = regionList.stream().collect(Collectors.toMap(r ->r.getRegionCode().toString(), r -> r));
@@ -662,7 +674,7 @@ public class CylinderAreaDataServiceImpl extends BaseService<CylinderAreaDataDto
 
 
     public Map<String, Object> getsecurityIndex(String regionCode) throws Exception {
-        List<RegionModel> regionModels = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(regionCode)).getResult();
+        List<RegionModel> regionModels = this.setRegionIfRootParent(regionCode);
         List<String> collect = regionModels.stream().map(c -> c.getRegionCode().toString()).collect(Collectors.toList());
         List<CompanyModel> companyModelList = Privilege.companyClient.queryListByCompanyCode(Strings.join(collect, ",")).getResult();
         Map<String, CompanyModel> companyMap = companyModelList.stream().collect(Collectors.toMap(CompanyModel::getCompanyCode, c -> c));