From d9062388710128cce996ba2f71c61d8243662e45 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 24 Jun 2022 18:01:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CaLoudongServiceImpl.java | 21 ++++++++++++++---- .../service/impl/CaPingfangServiceImpl.java | 21 ++++++++++++++---- .../service/impl/CaRentalServiceImpl.java | 21 ++++++++++++++---- .../service/impl/CaResidentServiceImpl.java | 22 +++++++++++++++---- .../service/impl/CaRotatorsServiceImpl.java | 22 +++++++++++++++---- 5 files changed, 87 insertions(+), 20 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java index b00f359e0f..79d3c65a91 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java +++ b/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> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); List gridList = new ArrayList<>(); gridList.add(agencyId); - staffGridList.getData().forEach(item -> { - gridList.add(item.getGridId()); - }); + this.packGirdArray(gridOption.getData(), gridList); PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getCommunityName(), @@ -134,6 +138,15 @@ public class CaLoudongServiceImpl extends BaseServiceImpl(result, info.getTotal()); } + private void packGirdArray(List options, List gridList) { + if (CollUtil.isNotEmpty(options)) { + for (OptionResultDTO option : options) { + gridList.add(option.getValue()); + packGirdArray(option.getChildren(), gridList); + } + } + } + /** * 楼栋基本信息详情 * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java index 49d58a32b0..9161176eaa 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java +++ b/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> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); List gridList = new ArrayList<>(); gridList.add(agencyId); - staffGridList.getData().forEach(item -> { - gridList.add(item.getGridId()); - }); + this.packGirdArray(gridOption.getData(), gridList); PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getBuildingName(), @@ -128,6 +132,15 @@ public class CaPingfangServiceImpl extends BaseServiceImpl(result, info.getTotal()); } + private void packGirdArray(List options, List gridList) { + if (CollUtil.isNotEmpty(options)) { + for (OptionResultDTO option : options) { + gridList.add(option.getValue()); + packGirdArray(option.getChildren(), gridList); + } + } + } + /** * 平房调用ruoyi接口存储数据 * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java index adf8fa344a..51b2a9a2db 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java +++ b/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> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); List gridList = new ArrayList<>(); gridList.add(agencyId); - staffGridList.getData().forEach(item -> { - gridList.add(item.getGridId()); - }); + this.packGirdArray(gridOption.getData(), gridList); PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getResidentName(), @@ -132,6 +136,15 @@ public class CaRentalServiceImpl extends BaseServiceImpl(result, info.getTotal()); } + private void packGirdArray(List options, List gridList) { + if (CollUtil.isNotEmpty(options)) { + for (OptionResultDTO option : options) { + gridList.add(option.getValue()); + packGirdArray(option.getChildren(), gridList); + } + } + } + /** * 出租房调用ruoyi接口存储数据 * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java index 26a4ee91e9..a0878ffbad 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java +++ b/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> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); List gridList = new ArrayList<>(); gridList.add(agencyId); - staffGridList.getData().forEach(item -> { - gridList.add(item.getGridId()); - }); + this.packGirdArray(gridOption.getData(), gridList); // 分页查询 PageHelper.startPage(dto.getPage(), dto.getLimit()); @@ -140,6 +144,16 @@ public class CaResidentServiceImpl extends BaseServiceImpl(result, info.getTotal()); } + + private void packGirdArray(List options, List gridList) { + if (CollUtil.isNotEmpty(options)) { + for (OptionResultDTO option : options) { + gridList.add(option.getValue()); + packGirdArray(option.getChildren(), gridList); + } + } + } + /** * 人口基本信息调用ruoyi接口存储数据 * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java index 0db1a7e43f..56c0de7d95 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java +++ b/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> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); List gridList = new ArrayList<>(); gridList.add(agencyId); - staffGridList.getData().forEach(item -> { - gridList.add(item.getGridId()); - }); + this.packGirdArray(gridOption.getData(), gridList); + PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getRotatorsName(), @@ -135,6 +140,15 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl(result, info.getTotal()); } + private void packGirdArray(List options, List gridList) { + if (CollUtil.isNotEmpty(options)) { + for (OptionResultDTO option : options) { + gridList.add(option.getValue()); + packGirdArray(option.getChildren(), gridList); + } + } + } + /** * 流动人口调用ruoyi接口存储数据 *