diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java index 1652e30259..c79bf3e596 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java @@ -15,10 +15,10 @@ import java.io.Serializable; public class RentTenantDataFormDTO implements Serializable { private static final long serialVersionUID = 9156247659994638103L; - @NotBlank(message = "userId不能为空",groups = PersonDataFormDTO.PersonDataForm.class) + @NotBlank(message = "userId不能为空") private String userId; - @NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataFormDTO.PersonDataForm.class) + @NotBlank(message = "tokenDto获取customerId不能为空") private String customerId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java index 06f1e1d8dd..039b433416 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java @@ -1,9 +1,10 @@ package com.epmet.dto.form; +import com.epmet.dto.IcResiUserAttachmentDTO; +import com.epmet.dto.IcResiUserDTO; import lombok.Data; import java.io.Serializable; -import java.util.LinkedHashMap; import java.util.List; /** @@ -19,7 +20,7 @@ public class RentTenantFormDTO implements Serializable { /** * 头像 */ - private String img; + private List images; /** * customerId @@ -27,63 +28,18 @@ public class RentTenantFormDTO implements Serializable { private String customerId; /** - * gridId - */ - private String gridId; - - /** - * - */ - private String agencyId; - - /** - * - */ - private String pids; - - /** - * 所属小区ID - */ - private String villageId; - - /** - * 所属楼宇Id - */ - private String buildId; - - /** - * 单元id - */ - private String unitId; - - /** - * 所属家庭Id - */ - private String homeId; - - /** - * 是否本地户籍 - */ - private String isBdhj; - - /** - * 姓名 - */ - private String name; - - /** - * 手机号 + * 身份证号 */ - private String mobile; + private String idCard; /** - * 性别 + * 人员类型 0：房东 1：租客 */ - private String gender; + private String type; /** - * 身份证号 + * 人员信息 */ - private String idCard; + private IcResiUserDTO user; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index fba6650314..366f4b9ec4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -729,18 +729,18 @@ public interface EpmetUserOpenFeignClient { * @author zhy * @date 2022/4/26 10:48 */ - @PostMapping("/epmetuser/icresiuser/rent/rentUpdate") - Result rentUpdate(@RequestBody RentTenantFormDTO formDTO); + @PostMapping("/epmetuser/icresiuser/rent/updateimage") + Result updateImage(@RequestBody RentTenantFormDTO formDTO); /** - * 租客房东根据身份证更新头像 + * 查询居民信息 * * @param formDTO * @return com.epmet.commons.tools.utils.Result * @author zhy * @date 2022/4/26 10:48 */ - @PostMapping("/epmetuser/icresiuser/rent/tenantData") - Result tenantData(@RequestBody RentTenantDataFormDTO formDTO); + @PostMapping("/epmetuser/icresiuser/rent/getrentresiuserinfo") + Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index eb14ab22d7..77b6d21cc6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -535,12 +535,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "rentUpdate", formDTO); + public Result updateImage(@RequestBody RentTenantFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateImage", formDTO); } @Override - public Result tenantData(@RequestBody RentTenantDataFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "tenantData", formDTO); + public Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRentResiUserInfo", formDTO); } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 4576a0d599..2bc4736b29 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -242,9 +242,9 @@ public class IcResiUserController implements ResultDataResolver { * @author zhy * @date 2022/4/26 10:48 */ - @PostMapping("rent/rentUpdate") - public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) { - String resiUserId = icResiUserService.rentUpdate(formDTO); + @PostMapping("rent/updateimage") + public Result updateImage(@RequestBody RentTenantFormDTO formDTO) { + String resiUserId = icResiUserService.updateImage(formDTO); //推送MQ事件 editResiMq(formDTO.getCustomerId(), resiUserId); return new Result(); @@ -270,10 +270,23 @@ public class IcResiUserController implements ResultDataResolver { * @author zhy * @date 2022/4/26 15:51 */ - @PostMapping("rent/tenantData") - public Result tenantData(@RequestBody RentTenantDataFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, RentTenantDataFormDTO.class); - return new Result().ok(icResiUserService.tenantData(formDTO)); + @PostMapping("rent/getrentresiuserinfo") + public Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(icResiUserService.getRentResiUserInfo(formDTO)); + } + + /** + * 租客房东黑名单查询个人数据 + * + * @param idCard + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/4/26 15:51 + */ + @PostMapping("rent/getresiuserinfo/{idCard}") + public Result> getRentResiUserInfoByIdCard(@PathVariable("idCard") String idCard) { + return new Result>().ok(icResiUserService.getRentResiUserInfoByIdCard(idCard)); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index bb652c4870..2b63ba2671 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -58,16 +58,6 @@ public interface IcResiUserService extends BaseService { **/ String edit(TokenDto tokenDto, List formDTO); - /** - * 租客房东根据身份证更新头像 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @author zhy - * @date 2022/4/26 10:48 - */ - String rentUpdate(RentTenantFormDTO formDTO); - /** * @Description 获取房间内人员 * @Param homeId @@ -105,16 +95,6 @@ public interface IcResiUserService extends BaseService { */ PersonDataResultDTO personData(PersonDataFormDTO formDTO); - /** - * 租客房东黑名单查询个人数据 - * - * @param formDTO - * @return com.epmet.dto.result.RentTenantDataResultDTO - * @author zhy - * @date 2022/4/26 16:03 - */ - RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO); - /** * @Description 根据名字搜索 * @param formDTO @@ -264,4 +244,35 @@ public interface IcResiUserService extends BaseService { * @Date 2022/3/29 16:25 */ EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO); + + /** + * 租客房东黑名单查询个人数据 + * + * @param formDTO + * @return com.epmet.dto.result.RentTenantDataResultDTO + * @author zhy + * @date 2022/4/26 16:03 + */ + RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO); + + /** + * 租客房东黑名单查询个人数据 + * + * @param idCard + * @return com.epmet.dto.result.RentTenantDataResultDTO + * @author zhy + * @date 2022/4/26 16:03 + */ + List getRentResiUserInfoByIdCard(String idCard); + + /** + * 租客房东根据身份证更新头像 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/4/26 10:48 + */ + String updateImage(RentTenantFormDTO formDTO); + } 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 5744c10f62..18592dd4ef 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 @@ -399,29 +399,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(list, null == list ? NumConstant.ZERO : list.size()); } + + @Override + public RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO) { + IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId()); + return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class); + } + + @Override + public List getRentResiUserInfoByIdCard(String idCard) { + Map params = new HashMap<>(8); + params.put("idCard", idCard); + List entityList = baseDao.selectList(getWrapper(params)); + return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public String updateImage(RentTenantFormDTO formDTO) { + String resiUserId = ""; + IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId()); + if (null != userDTO) { + resiUserId = userDTO.getId(); + // 插入附件头像(只有一张) + List images = formDTO.getImages(); + images.forEach(item -> item.setUserId(userDTO.getId())); + images.forEach(item-> icResiUserAttachmentService.save(item)); + } else if (NumConstant.ONE_STR.equals(formDTO.getType())) { + // 如果是新增的租客，需要新增一条信息，不存在的房东就不管了 + IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class); + insert(entity); + resiUserId = entity.getId(); + + // 新增用户后保存头像信息 + List images = formDTO.getImages(); + images.forEach(item -> item.setUserId(entity.getId())); + images.forEach(item -> icResiUserAttachmentService.save(item)); + } + + return resiUserId; + } }