修改逻辑

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,12 +8,14 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaLoudongDao;
@@ -118,12 +121,13 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        staffGridList.getData().forEach(item -> {
+        this.packGirdArray(gridOption.getData(), gridList);
-            gridList.add(item.getGridId());
-        });
 
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaLoudongResultDTO> result = baseDao.getPage(dto.getCommunityName(),
@@ -134,6 +138,15 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 楼栋基本信息详情
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,6 +9,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -15,6 +17,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaPingfangDao;
@@ -112,12 +115,13 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        staffGridList.getData().forEach(item -> {
+        this.packGirdArray(gridOption.getData(), gridList);
-            gridList.add(item.getGridId());
-        });
 
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaPingfangResultDTO> result = baseDao.getPage(dto.getBuildingName(),
@@ -128,6 +132,15 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 平房调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -16,6 +18,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.CaRentalDao;
@@ -115,12 +118,13 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        staffGridList.getData().forEach(item -> {
+        this.packGirdArray(gridOption.getData(), gridList);
-            gridList.add(item.getGridId());
-        });
 
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaRentalResultDTO> result = baseDao.getPage(dto.getResidentName(),
@@ -132,6 +136,15 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 出租房调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,6 +10,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -17,6 +19,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -122,12 +125,13 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        staffGridList.getData().forEach(item -> {
+        this.packGirdArray(gridOption.getData(), gridList);
-            gridList.add(item.getGridId());
-        });
 
         // 分页查询
         PageHelper.startPage(dto.getPage(), dto.getLimit());
@@ -140,6 +144,16 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
         return new PageData<>(result, info.getTotal());
     }
 
+
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 人口基本信息调用ruoyi接口存储数据
      *

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -15,6 +17,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.result.CustomerStaffGridResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -118,12 +121,14 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId());
         String agencyId = staffInfo.getAgencyId();
         // 根据组织id获取gridId网格id
-        Result<List<CustomerStaffGridResultDTO>> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode());
+        GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO();
+        gridOptionFormDTO.setAgencyId(agencyId);
+        gridOptionFormDTO.setPurpose("query");
+        Result<List<OptionResultDTO>> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO);
         List<String> gridList = new ArrayList<>();
         gridList.add(agencyId);
-        staffGridList.getData().forEach(item -> {
+        this.packGirdArray(gridOption.getData(), gridList);
-            gridList.add(item.getGridId());
+
-        });
 
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         List<CaRotatorsResultDTO> result = baseDao.getPage(dto.getRotatorsName(),
@@ -135,6 +140,15 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         return new PageData<>(result, info.getTotal());
     }
 
+    private void packGirdArray(List<OptionResultDTO> options, List<String> gridList) {
+        if (CollUtil.isNotEmpty(options)) {
+            for (OptionResultDTO option : options) {
+                gridList.add(option.getValue());
+                packGirdArray(option.getChildren(), gridList);
+            }
+        }
+    }
+
     /**
      * 流动人口调用ruoyi接口存储数据
      *