From e18b2e87988b3995d3fee005f0063a6b4f292568 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 24 Jun 2022 14:37:24 +0800 Subject: [PATCH 1/4] =?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 --- .../opendata/dto/form/CaLoudongFormDTO.java | 10 ++++++++ .../opendata/dto/form/CaPingfangFormDTO.java | 10 ++++++++ .../opendata/dto/form/CaRentalFormtDTO.java | 10 ++++++++ .../opendata/dto/form/CaResidentFormDTO.java | 11 +++++++++ .../opendata/dto/form/CaRotatorsFormDTO.java | 10 ++++++++ .../controller/CaLoudongController.java | 2 ++ .../controller/CaPingfangController.java | 2 ++ .../controller/CaRentalController.java | 2 ++ .../controller/CaResidentController.java | 2 ++ .../controller/CaRotatorsController.java | 2 ++ .../com/epmet/opendata/dao/CaLoudongDao.java | 3 ++- .../com/epmet/opendata/dao/CaPingfangDao.java | 3 ++- .../com/epmet/opendata/dao/CaRentalDao.java | 3 ++- .../com/epmet/opendata/dao/CaResidentDao.java | 3 ++- .../com/epmet/opendata/dao/CaRotatorsDao.java | 3 ++- .../service/impl/CaLoudongServiceImpl.java | 23 +++++++++++++++++- .../service/impl/CaPingfangServiceImpl.java | 24 ++++++++++++++++++- .../service/impl/CaRentalServiceImpl.java | 22 ++++++++++++++++- .../service/impl/CaResidentServiceImpl.java | 23 +++++++++++++++++- .../service/impl/CaRotatorsServiceImpl.java | 22 ++++++++++++++++- .../main/resources/mapper/CaLoudongDao.xml | 18 ++++++++++++-- .../main/resources/mapper/CaPingfangDao.xml | 18 ++++++++++++-- .../src/main/resources/mapper/CaRentalDao.xml | 18 ++++++++++++-- .../main/resources/mapper/CaResidentDao.xml | 18 ++++++++++++-- .../main/resources/mapper/CaRotatorsDao.xml | 18 ++++++++++++-- 25 files changed, 260 insertions(+), 20 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java index 4bc0cec51d..6c6194c0e7 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java @@ -20,6 +20,16 @@ public class CaLoudongFormDTO implements Serializable { */ private String buildingName; + /** + * userId + */ + private String userId; + + /** + * 客户id + */ + private String customerId; + /** * 网格id */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java index e98bf07580..5a507918a2 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java @@ -9,6 +9,16 @@ public class CaPingfangFormDTO implements Serializable { private static final long serialVersionUID = 7714897295294884648L; + /** + * userId + */ + private String userId; + + /** + * 客户id + */ + private String customerId; + /** * 楼栋名称 */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java index dab0b4611a..06070f65ae 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java @@ -9,6 +9,16 @@ public class CaRentalFormtDTO implements Serializable { private static final long serialVersionUID = -6052280300032032361L; + /** + * userId + */ + private String userId; + + /** + * 客户id + */ + private String customerId; + /** * 房主姓名 */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java index d2303ff5e9..07ba491aca 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java @@ -13,6 +13,17 @@ public class CaResidentFormDTO implements Serializable { private Integer limit; + /** + * userId + */ + private String userId; + + /** + * 客户id + */ + private String customerId; + + /** * 姓名 */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java index 664e6f4c2f..9d02d8178d 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java @@ -10,6 +10,16 @@ public class CaRotatorsFormDTO implements Serializable { private static final long serialVersionUID = 3356808153818385932L; + /** + * 客户id + */ + private String customerId; + + /** + * userId + */ + private String userId; + /** * 姓名 */ diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java index 1a24078b95..68e2f83406 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java @@ -96,6 +96,8 @@ public class CaLoudongController { */ @PostMapping("getPage") public Result> getPage(@RequestBody CaLoudongFormDTO dto, @LoginUser TokenDto tokenDto) { + dto.setUserId(tokenDto.getUserId()); + dto.setCustomerId(tokenDto.getCustomerId()); PageData data = caLoudongService.getPage(dto); return new Result>().ok(data); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java index 3ef18ebada..dec0be83fe 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java @@ -92,6 +92,8 @@ public class CaPingfangController { */ @PostMapping("getPage") public Result getPage(@RequestBody CaPingfangFormDTO dto, @LoginUser TokenDto tokenDto) { + dto.setUserId(tokenDto.getUserId()); + dto.setCustomerId(tokenDto.getCustomerId()); PageData data = caPingfangService.getPage(dto); return new Result().ok(data); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java index ac31858960..325d686931 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java @@ -95,6 +95,8 @@ public class CaRentalController { */ @PostMapping("getPage") public Result> getPage(@RequestBody CaRentalFormtDTO dto, @LoginUser TokenDto tokenDto) { + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); PageData data = caRentalService.getPage(dto); return new Result>().ok(data); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java index 8b29c65cf2..afa40cf658 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java @@ -98,6 +98,8 @@ public class CaResidentController { */ @PostMapping("getPage") public Result> getPage(@RequestBody CaResidentFormDTO dto, @LoginUser TokenDto tokenDto) { + dto.setUserId(tokenDto.getUserId()); + dto.setCustomerId(tokenDto.getCustomerId()); PageData data = caResidentService.getPage(dto); return new Result>().ok(data); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java index 8072b7fbb5..c3d84e32a2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java @@ -95,6 +95,8 @@ public class CaRotatorsController { */ @PostMapping("getPage") public Result> getPage(@RequestBody CaRotatorsFormDTO dto, @LoginUser TokenDto tokenDto) { + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setUserId(tokenDto.getUserId()); PageData data = caRotatorsService.getPage(dto); return new Result>().ok(data); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java index cb923fdc9a..1d8ca38493 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java @@ -34,7 +34,8 @@ public interface CaLoudongDao extends BaseDao { */ List getPage(@Param("communityName") String communityName, @Param("buildingName") String buildingName, - @Param("gridId") String gridId); + @Param("gridId") String gridId, + @Param("gridList") List gridList); /** * 楼栋基本信息详情 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java index 28675c6bb2..16889328a4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java @@ -24,7 +24,8 @@ public interface CaPingfangDao extends BaseDao { */ List getPage(@Param("buildingName") String buildingName, @Param("communityName") String communityName, - @Param("gridId") String gridId); + @Param("gridId") String gridId, + @Param("gridList") List gridList); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java index 4b1460a9ea..3fbdf239e6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java @@ -29,7 +29,8 @@ public interface CaRentalDao extends BaseDao { List getPage(@Param("residentName") String residentName, @Param("houseName") String houseName, @Param("renterName") String renterName, - @Param("gridId") String gridId); + @Param("gridId") String gridId, + @Param("gridList") List gridList); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java index 2558268345..d53c54856d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java @@ -31,7 +31,8 @@ public interface CaResidentDao extends BaseDao { List getPage(@Param("residentName") String residentName, @Param("idCard") String idCard, @Param("telephone") String telephone, - @Param("gridId") String gridId); + @Param("gridId") String gridId, + @Param("gridList") List gridList); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java index ade7309eaa..f790b1dcdc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java @@ -29,7 +29,8 @@ public interface CaRotatorsDao extends BaseDao { List getPage(@Param("rotatorsName") String rotatorsName, @Param("idCard") String idCard, @Param("telephone") String telephone, - @Param("gridId") String gridId); + @Param("gridId") String gridId, + @Param("gridList") List gridList); int deleteAll(); 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 40e440d48e..cc7433601a 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 @@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.*; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaLoudongDao; import com.epmet.opendata.dto.ca.CaLoudongDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -42,6 +46,9 @@ public class CaLoudongServiceImpl extends BaseServiceImpl page(Map params) { // IPage page = baseDao.selectPage( @@ -104,8 +111,22 @@ public class CaLoudongServiceImpl extends BaseServiceImpl getPage(CaLoudongFormDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + Result> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + gridIListByAgency.getData().forEach(item -> { + gridList.add(item.getId()); + }); + PageHelper.startPage(dto.getPage(), dto.getLimit()); - List result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName(),dto.getGridId()); + List result = baseDao.getPage(dto.getCommunityName(), + dto.getBuildingName(), + dto.getGridId(), + gridList); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } 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 efd49ea4dd..d5b9cc35df 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 @@ -7,10 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; 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.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaPingfangDao; import com.epmet.opendata.dto.ca.CaPingfangDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -30,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -44,6 +49,9 @@ public class CaPingfangServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -98,8 +106,22 @@ public class CaPingfangServiceImpl extends BaseServiceImpl> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + gridIListByAgency.getData().forEach(item -> { + gridList.add(item.getId()); + }); + PageHelper.startPage(dto.getPage(), dto.getLimit()); - List result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName(),dto.getGridId()); + List result = baseDao.getPage(dto.getBuildingName(), + dto.getCommunityName(), + dto.getGridId(), + gridList); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } 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 44dffcc7ee..0b5f0dff11 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 @@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; 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.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaRentalDao; import com.epmet.opendata.dto.ca.CaRentalDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -31,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -47,6 +52,9 @@ public class CaRentalServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -101,11 +109,23 @@ public class CaRentalServiceImpl extends BaseServiceImpl getPage(CaRentalFormtDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + Result> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + gridIListByAgency.getData().forEach(item -> { + gridList.add(item.getId()); + }); + PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getResidentName(), dto.getHouseName(), dto.getRenterName(), - dto.getGridId()); + dto.getGridId(), + gridList); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } 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 6477389d46..5860ac1a98 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 @@ -8,12 +8,16 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; 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.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; 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.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaResidentDao; import com.epmet.opendata.dto.ca.CaResidentDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -35,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -54,6 +59,9 @@ public class CaResidentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -108,11 +116,24 @@ public class CaResidentServiceImpl extends BaseServiceImpl getPage(CaResidentFormDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + Result> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + gridIListByAgency.getData().forEach(item -> { + gridList.add(item.getId()); + }); + + // 分页查询 PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getResidentName(), dto.getIdCard(), dto.getTelephone(), - dto.getGridId()); + dto.getGridId(), + gridList); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } 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 2d76b56fc0..c06ef31ba2 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 @@ -6,12 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; 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.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaRotatorsDao; import com.epmet.opendata.dto.ca.CaRotatorsDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -31,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -50,6 +55,9 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -104,11 +112,23 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl getPage(CaRotatorsFormDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + Result> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + gridIListByAgency.getData().forEach(item -> { + gridList.add(item.getId()); + }); + PageHelper.startPage(dto.getPage(), dto.getLimit()); List result = baseDao.getPage(dto.getRotatorsName(), dto.getIdCard(), dto.getTelephone(), - dto.getGridId()); + dto.getGridId(), + gridList); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index 8d91b0b087..9f62247250 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -88,7 +88,21 @@ vs.street_name FROM ca_loudong as ca - LEFT JOIN view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id + INNER JOIN ( + SELECT + viewca.grid_id, + viewca.grid_name, + viewca.community_name, + viewca.street_name, + viewca.business_org_id + FROM + view_grid_comm_street_ca viewca + WHERE + viewca.business_org_id IN + + #{gridId} + + ) AS vs ON ca.grid_id = vs.grid_id ca.delete_flag = 'normal' @@ -98,7 +112,7 @@ AND ca.building_name like '%${buildingName}%' - AND vs.grid_id_path like '%${gridId}%' + AND vs.business_org_id = #{gridId} order by ca.grid_id,ca.building_id,ca.community_id desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 4fa522780d..25bb366707 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -85,7 +85,21 @@ vs.street_name FROM ca_pingfang as ca - left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id + INNER JOIN ( + SELECT + viewca.grid_id, + viewca.grid_name, + viewca.community_name, + viewca.street_name, + viewca.business_org_id + FROM + view_grid_comm_street_ca viewca + WHERE + viewca.business_org_id IN + + #{gridId} + + ) AS vs ON ca.grid_id = vs.grid_id ca.delete_flag = 'normal' @@ -95,7 +109,7 @@ AND ca.community_name like '%${communityName}%' - AND vs.grid_id_path like '%${gridId}%' + AND vs.business_org_id = #{gridId} order by ca.grid_id,ca.building_id,ca.community_id desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml index 4dedc59b1f..f87e62be7f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml @@ -77,7 +77,21 @@ vs.street_name FROM ca_rental as ca - left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id + INNER JOIN ( + SELECT + viewca.grid_id, + viewca.grid_name, + viewca.community_name, + viewca.street_name, + viewca.business_org_id + FROM + view_grid_comm_street_ca viewca + WHERE + viewca.business_org_id IN + + #{gridId} + + ) AS vs ON ca.grid_id = vs.grid_id ca.delete_flag = 'normal' @@ -90,7 +104,7 @@ AND ca.renter_name like '%${renterName}%' - AND vs.grid_id_path like '%${gridId}%' + AND vs.business_org_id = #{gridId} order by ca.grid_id,ca.rental_id,ca.id_card desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml index a0243f0dc8..98049c9977 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml @@ -108,7 +108,21 @@ cau.ic_resi_user_id FROM ca_resident as ca - left join view_grid_comm_street_ca as vs on ca.grid_id = vs.grid_id + INNER JOIN ( + SELECT + viewca.grid_id, + viewca.grid_name, + viewca.community_name, + viewca.street_name, + viewca.business_org_id + FROM + view_grid_comm_street_ca viewca + WHERE + viewca.business_org_id IN + + #{gridId} + + ) AS vs ON ca.grid_id = vs.grid_id left join ca_resident_user as cau on cau.id_card = ca.id_card and del_flag = '0' ca.delete_flag = 'normal' @@ -122,7 +136,7 @@ AND ca.telephone like '%${telephone}%' - AND vs.grid_id_path like '%${gridId}%' + AND vs.business_org_id = #{gridId} order by ca.grid_id,ca.resident_id,ca.id_card desc diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml index 593b137b9a..dbe97aecb8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml @@ -109,7 +109,21 @@ vs.street_name FROM ca_rotators as ca - left join view_grid_comm_street_ca as vs on vs.grid_id = ca.grid_id + INNER JOIN ( + SELECT + viewca.grid_id, + viewca.grid_name, + viewca.community_name, + viewca.street_name, + viewca.business_org_id + FROM + view_grid_comm_street_ca viewca + WHERE + viewca.business_org_id IN + + #{gridId} + + ) AS vs ON ca.grid_id = vs.grid_id ca.delete_flag = 'normal' @@ -122,7 +136,7 @@ AND ca.telephone like '%${telephone}%' - AND vs.grid_id_path like '%${gridId}%' + AND vs.business_org_id = #{gridId} order by ca.grid_id,ca.rotators_id,ca.id_card desc From 06c5265351dc9817a368b5316f1df04cc89dfda2 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 24 Jun 2022 14:59:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/service/impl/CaLoudongServiceImpl.java | 9 ++++++--- .../opendata/service/impl/CaResidentServiceImpl.java | 8 +++++--- 2 files changed, 11 insertions(+), 6 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 cc7433601a..b00f359e0f 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 @@ -7,10 +7,13 @@ 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.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.result.CustomerStaffGridResultDTO; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaLoudongDao; import com.epmet.opendata.dto.ca.CaLoudongDTO; @@ -115,11 +118,11 @@ public class CaLoudongServiceImpl extends BaseServiceImpl> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + Result> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); List gridList = new ArrayList<>(); gridList.add(agencyId); - gridIListByAgency.getData().forEach(item -> { - gridList.add(item.getId()); + staffGridList.getData().forEach(item -> { + gridList.add(item.getGridId()); }); PageHelper.startPage(dto.getPage(), dto.getLimit()); 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 5860ac1a98..26a4ee91e9 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 @@ -9,6 +9,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.enums.OrgTypeEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; @@ -16,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.result.CustomerStaffGridResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaResidentDao; @@ -120,11 +122,11 @@ public class CaResidentServiceImpl extends BaseServiceImpl> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + Result> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); List gridList = new ArrayList<>(); gridList.add(agencyId); - gridIListByAgency.getData().forEach(item -> { - gridList.add(item.getId()); + staffGridList.getData().forEach(item -> { + gridList.add(item.getGridId()); }); // 分页查询 From d0138dcaafb4bc873e1c5a1c2c0d981a1078a265 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 24 Jun 2022 15:12:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/service/impl/CaPingfangServiceImpl.java | 8 +++++--- .../epmet/opendata/service/impl/CaRentalServiceImpl.java | 8 +++++--- .../opendata/service/impl/CaRotatorsServiceImpl.java | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) 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 d5b9cc35df..49d58a32b0 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 @@ -8,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.enums.OrgTypeEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; 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.result.CustomerStaffGridResultDTO; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaPingfangDao; import com.epmet.opendata.dto.ca.CaPingfangDTO; @@ -110,11 +112,11 @@ public class CaPingfangServiceImpl extends BaseServiceImpl> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + Result> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); List gridList = new ArrayList<>(); gridList.add(agencyId); - gridIListByAgency.getData().forEach(item -> { - gridList.add(item.getId()); + staffGridList.getData().forEach(item -> { + gridList.add(item.getGridId()); }); PageHelper.startPage(dto.getPage(), dto.getLimit()); 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 0b5f0dff11..adf8fa344a 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 @@ -7,6 +7,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.enums.OrgTypeEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -15,6 +16,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.result.CustomerStaffGridResultDTO; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaRentalDao; import com.epmet.opendata.dto.ca.CaRentalDTO; @@ -113,11 +115,11 @@ public class CaRentalServiceImpl extends BaseServiceImpl> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + Result> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); List gridList = new ArrayList<>(); gridList.add(agencyId); - gridIListByAgency.getData().forEach(item -> { - gridList.add(item.getId()); + staffGridList.getData().forEach(item -> { + gridList.add(item.getGridId()); }); PageHelper.startPage(dto.getPage(), dto.getLimit()); 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 c06ef31ba2..0db1a7e43f 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 @@ -7,6 +7,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.enums.OrgTypeEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -14,6 +15,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.result.CustomerStaffGridResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.opendata.dao.CaRotatorsDao; @@ -116,11 +118,11 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl> gridIListByAgency = govOrgOpenFeignClient.getGridIListByAgency(agencyId); + Result> staffGridList = govOrgOpenFeignClient.getStaffGridList(dto.getCustomerId(), agencyId, OrgTypeEnum.AGENCY.getCode()); List gridList = new ArrayList<>(); gridList.add(agencyId); - gridIListByAgency.getData().forEach(item -> { - gridList.add(item.getId()); + staffGridList.getData().forEach(item -> { + gridList.add(item.getGridId()); }); PageHelper.startPage(dto.getPage(), dto.getLimit()); From d9062388710128cce996ba2f71c61d8243662e45 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 24 Jun 2022 18:01:27 +0800 Subject: [PATCH 4/4] =?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接口存储数据 *