diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java index 21e456a9dd..a0af3da6bf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java @@ -1,5 +1,8 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.constant.OrgTypeConstant; import com.epmet.constant.ProjectConstant; import com.epmet.dto.screen.ScreenProjectDataDTO; @@ -126,7 +129,11 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic //上面的initNewScreenProjectData已经赋值了orgName=组织名称 meta.setProjectContent(projectInfo.getBackGround()); meta.setLinkUserId(projectInfo.getCreatedBy()); - meta.setLinkName(projectInfo.getCreatedBy()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(param.getCustomerId(), projectInfo.getCreatedBy()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员："+projectInfo.getCreatedBy()); + } + meta.setLinkName(staffInfo.getRealName()); if (StringUtils.isNotBlank(projectInfo.getLocateDimension())) { meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension())); } 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-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java index a94247a9ba..2e32889995 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java @@ -16,6 +16,16 @@ public class CaResidentResultDTO implements Serializable { private String streetName; + /** + * 房屋id + */ + private String homeId; + + /** + * ic_resi_user表id + */ + private String icResiUserId; + /** * 人口ID */ 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..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,13 +1,23 @@ 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; 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; import com.epmet.opendata.dto.ca.CaLoudongDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -42,6 +52,9 @@ public class CaLoudongServiceImpl extends BaseServiceImpl page(Map params) { // IPage page = baseDao.selectPage( @@ -104,12 +117,36 @@ public class CaLoudongServiceImpl extends BaseServiceImpl getPage(CaLoudongFormDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + this.packGirdArray(gridOption.getData(), gridList); + 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()); } + 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 efd49ea4dd..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; @@ -7,10 +8,18 @@ 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.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; 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; import com.epmet.opendata.dto.ca.CaPingfangDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -30,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; @@ -44,6 +54,9 @@ public class CaPingfangServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -98,12 +111,36 @@ public class CaPingfangServiceImpl extends BaseServiceImpl> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + this.packGirdArray(gridOption.getData(), gridList); + 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()); } + 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 44dffcc7ee..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,17 +1,26 @@ 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; 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; 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.dto.form.GridOptionFormDTO; +import com.epmet.dto.result.CustomerStaffGridResultDTO; +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 +40,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 +57,9 @@ public class CaRentalServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -101,15 +114,37 @@ public class CaRentalServiceImpl extends BaseServiceImpl getPage(CaRentalFormtDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + this.packGirdArray(gridOption.getData(), gridList); + 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()); } + 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 6477389d46..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; @@ -8,12 +9,20 @@ 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.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; 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.dto.form.GridOptionFormDTO; +import com.epmet.dto.result.CustomerStaffGridResultDTO; 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 +44,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 +64,9 @@ public class CaResidentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -108,15 +121,39 @@ public class CaResidentServiceImpl extends BaseServiceImpl getPage(CaResidentFormDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + this.packGirdArray(gridOption.getData(), gridList); + + // 分页查询 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()); } + + 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 2d76b56fc0..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,17 +1,26 @@ 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; 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; 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.dto.form.GridOptionFormDTO; +import com.epmet.dto.result.CustomerStaffGridResultDTO; 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 +40,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 +60,9 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -104,15 +117,38 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl getPage(CaRotatorsFormDTO dto) { + // 获取组织id + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getUserId()); + String agencyId = staffInfo.getAgencyId(); + // 根据组织id获取gridId网格id + GridOptionFormDTO gridOptionFormDTO = new GridOptionFormDTO(); + gridOptionFormDTO.setAgencyId(agencyId); + gridOptionFormDTO.setPurpose("query"); + Result> gridOption = govOrgOpenFeignClient.getGridOption(gridOptionFormDTO); + List gridList = new ArrayList<>(); + gridList.add(agencyId); + this.packGirdArray(gridOption.getData(), gridList); + + 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()); } + 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/resources/db/migration/V0.0.10__add_indexes_of_ca_resident_user.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.10__add_indexes_of_ca_resident_user.sql new file mode 100644 index 0000000000..93ea003731 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.10__add_indexes_of_ca_resident_user.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ca_resident_user` ADD INDEX ID_CARD (`id_card` ); +ALTER TABLE `ca_resident_user` ADD INDEX DEL_FLAG (`DEL_FLAG` ) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.11__update_ca_view.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.11__update_ca_view.sql new file mode 100644 index 0000000000..5c200e78f6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.11__update_ca_view.sql @@ -0,0 +1,35 @@ +DROP INDEX DEL_FLAG ON `ca_resident_user`; + +DROP VIEW IF EXISTS `view_grid_comm_street_ca`; +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street_ca` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path`, +`bbo`.`business_org_id` AS `business_org_id` +FROM + ((( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) + LEFT JOIN `business_bind_org` `bbo` ON ((( + concat( `g4`.`grid_id` ) = `bbo`.`third_org_id` + ) + AND ( `bbo`.`business_code` = 'ca' ) + AND ( `bbo`.`DEL_FLAG` = '0' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) \ No newline at end of file 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 c541483cf0..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 @@ -103,10 +103,27 @@ ca.plat_code, vs.grid_name, vs.community_name as comName, - vs.street_name + vs.street_name, + cau.home_id, + 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' @@ -119,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 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 7e5e0f10cc..d48547de04 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -394,14 +394,13 @@ public interface IcResiUserDao extends BaseDao { @Param("customerId") String customerId); /** - * @return com.epmet.entity.IcResiUserEntity - * @describe: 通过身份证号查询实体类 - * @author wangtong - * @date 2022/6/13 17:32 - * @params [idCard, customerId] - */ - IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); - + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + * @return com.epmet.entity.IcResiUserEntity + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); List getListIcResiUserDTO(@Param("icResiUserIdList") List icResiUserIdList); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 9c0b3702a3..f9a35f3411 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2663,32 +2663,24 @@ public class IcResiUserServiceImpl extends BaseServiceImpl result = guardarDatosFeignClient.getResidentDetailByIdCard(dto); ResidentByIdCardResultDTO residentDetailByIdCard = result.getData(); - if (org.springframework.util.StringUtils.isEmpty(residentDetailByIdCard)) { - throw new RenException("获取不到人的信息"); - } - // 根据房屋id获取房屋信息 - if (StringUtils.isBlank(form.getHomeId())) { - throw new RenException("房屋id不能为空"); + if(!result.success() || residentDetailByIdCard == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息失败", "获取居民信息失败"); } HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), form.getHomeId()); - if (org.springframework.util.StringUtils.isEmpty(houseInfo)) { - throw new RenException("获取不到房屋信息"); + if(houseInfo == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败"); } // 将人的信息放入ic_resi_user对象中 IcResiUserEntity entity = new IcResiUserEntity(); entity.setCustomerId(form.getCustomerId()); // 进行日期转换 if(residentDetailByIdCard.getBirthday() == null){ - throw new RenException("出生日期为空"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败"); } - Date d = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String birthday = sdf.format(residentDetailByIdCard.getBirthday()); @@ -2701,7 +2693,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId()); - entity.setGridId(resultDTOResult.getData().getGridId()); - entity.setPids(resultDTOResult.getData().getPids()); + HouseAgencyInfoResultDTO data = resultDTOResult.getData(); + entity.setGridId(data.getGridId()); + entity.setPids(data.getPids() + ":" + data.getAgencyId()); } else { - throw new RenException("房屋信息不全"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整"); } SaveCaResidentUserFormDTO saveForm = new SaveCaResidentUserFormDTO(); saveForm.setHomeId(form.getHomeId()); @@ -2727,14 +2720,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl