From c25d5ba08ac9b24a226f2d26b995c2f5fc0eea9a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 14:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E5=85=A8=E5=B1=80=E5=94=AF=E4=B8=80=E6=94=B9?= =?UTF-8?q?=E4=B8=BA-=E5=AE=A2=E6=88=B7=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/from/VerificationCodeFromDTO.java | 2 +- .../impl/PartyMemberConfirmServiceImpl.java | 1 + .../java/com/epmet/dto/UserResiInfoDTO.java | 8 ++++-- .../controller/UserResiInfoController.java | 5 +++- .../java/com/epmet/dao/UserResiInfoDao.java | 14 +++++------ .../service/impl/UserResiInfoServiceImpl.java | 25 +++++++++++++------ .../main/resources/mapper/UserResiInfoDao.xml | 7 ++++-- 7 files changed, 41 insertions(+), 21 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java index 5f655ffb7a..81db04b531 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java @@ -32,7 +32,7 @@ public class VerificationCodeFromDTO implements Serializable { private String mobile; /** - * 行为记录表ID + * 行为记录表ID partymember_visit.id */ @NotBlank(message = "行为记录表ID不能为空") private String visitId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index e047396cfd..0b5acdf437 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -550,6 +550,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId()); userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate()); userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding()); + userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); epmetUserFeignClient.saveResiInfo(userResiInfoDTO); } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java index eb38891968..9edf883123 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java @@ -17,9 +17,11 @@ package com.epmet.dto; +import lombok.Data; + +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -51,7 +53,8 @@ public class UserResiInfoDTO implements Serializable { /** * 手机号(注册手机号) */ - private String regMobile; + @NotBlank(message = "手机号不能为空") + private String regMobile; /** * 姓氏 @@ -121,6 +124,7 @@ public class UserResiInfoDTO implements Serializable { /** * 客户Id (customer.id) */ + @NotBlank(message = "客户Id不能为空") private String customerId; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 8844cfbdc1..4f52fc5e39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -17,7 +17,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -128,7 +130,7 @@ public class UserResiInfoController { * @Description 居民端-居民注册信息提交 **/ @PostMapping("submit") - public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) { + public Result submit(@LoginUser TokenDto tokenDto, @RequestBody UserResiInfoDTO userResiInfoDTO) { return userResiInfoService.submit(userResiInfoDTO); } @@ -149,6 +151,7 @@ public class UserResiInfoController { **/ @PostMapping("saveResiInfo") public Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO) { + ValidatorUtils.validateEntity(userResiInfoDTO); return userResiInfoService.saveResiInfo(userResiInfoDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index a47f215bdc..bd5934de94 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -39,8 +39,8 @@ import java.util.List; public interface UserResiInfoDao extends BaseDao { /** - * @return com.epmet.dto.UserResiInfoDTO * @param userResiInfoFormDTO + * @return com.epmet.dto.UserResiInfoDTO * @Author yinzuomei * @Description 查询用户注册信息 * @Date 2020/3/30 11:10 @@ -48,23 +48,23 @@ public interface UserResiInfoDao extends BaseDao { UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** - * @Description 查询用户注册信息 不按照客户Id查询 * @param userResiInfoFormDTO - * @return UserResiInfoResultDTO + * @return UserResiInfoResultDTO + * @Description 查询用户注册信息 不按照客户Id查询 * @author wangc * @date 2020.05.21 13:18 - **/ + **/ UserResiInfoResultDTO selectUserResiInfoNotByCustId(UserResiInfoFormDTO userResiInfoFormDTO); /** * @Author sun * @Description 根据手机号查询居民注册信息(user_resi_info)表数据 **/ - List selectResiInfoByMobile(String regMobile); + List selectResiInfoByMobile(@Param("regMobile") String regMobile, @Param("customerId") String customerId); /** - * @return java.util.List * @param userIdList + * @return java.util.List * @Author yinzuomei * @Description 根据userId集合查询用户注册信息 * @Date 2020/4/7 18:26 @@ -72,8 +72,8 @@ public interface UserResiInfoDao extends BaseDao { List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); /** - * @Description 根据userId查询议题发起人 * @param formDTO + * @Description 根据userId查询议题发起人 * @author zxc * @date 2020/5/11 11:18 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 5901ddd950..0ccd75bf6a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.token.util.UserUtil; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -31,6 +32,7 @@ import com.epmet.constant.UserConstant; import com.epmet.constant.UserRoleConstant; import com.epmet.dao.UserResiInfoDao; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.IssueInitiatorResultDTO; @@ -159,8 +161,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); - if(!result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getCode())){ + if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getCode())) { return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //4:删除缓存中可能存在的旧验证码 @@ -227,7 +231,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); + List list = userResiInfoDao.selectResiInfoByMobile(mobile, customerId); if (list.size() > 0) { bl = false; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index a95fc89291..067c49a86a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -98,8 +98,11 @@ SELECT FROM user_resi_info uri - WHERE uri.del_flag = '0' - AND uri.reg_mobile = #{regMobile} + LEFT JOIN user_customer uc ON uri.USER_ID = uc.USER_ID + WHERE + uri.DEL_FLAG = '0' + AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR} + AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}