diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index fbb6686ec6..74f33cbbea 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack; @@ -43,4 +44,11 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/userresiinfo/submit") Result submit(UserResiInfoDTO userResiInfoDTO); + + /** + * @Author sun + * @Description 居民端-居民注册根据手机号获取验证码 + **/ + @PostMapping(value = "epmetuser/userresiinfo/getverificationcode") + Result getVerificationCode(VerificationCodeFormDTO formDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index fddff4a777..79d432f019 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -51,5 +52,14 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "submit", userResiInfoDTO); } + /** + * @Author sun + * @Description 居民端-居民注册根据手机号获取验证码 + **/ + @Override + public Result getVerificationCode(VerificationCodeFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getVerificationCode", formDTO); + } + } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java index 2bb24c3a1f..a3a2b7cfc6 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java @@ -5,9 +5,9 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.resiregister.service.ResiRegisterService; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -47,5 +47,15 @@ public class ResiRegisterController { return resiRegisterService.submit(tokenDTO, userResiInfoDTO); } + /** + * @param + * @Author sun + * @Description 居民端-居民注册根据手机号获取验证码 + **/ + @PostMapping("getverificationcode") + public Result getVerificationCode(@LoginUser TokenDto tokenDTO, @RequestBody VerificationCodeFormDTO formDTO) { + return resiRegisterService.getVerificationCode(tokenDTO, formDTO); + } + } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java index 5c4780b0f1..6a675b15f2 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; /** @@ -32,4 +33,13 @@ public interface ResiRegisterService { */ Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO); + /** + * 居民端-居民注册根据手机号获取验证码 + * + * @param + * @return void + * @author sun + */ + Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO); + } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index f7324d7c42..704e248062 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.resiregister.service.ResiRegisterService; @@ -40,4 +41,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { userResiInfoDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.submit(userResiInfoDTO); } + + @Override + public Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO) { + if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { + return new Result().error(ModuleConstant.USER_NOT_NULL); + } + formDTO.setUserId(tokenDTO.getUserId()); + return epmetUserFeignClient.getVerificationCode(formDTO); + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java new file mode 100644 index 0000000000..a52b0e01ea --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 居民注册根据手机号获取获取验证码 + * @Author sun + */ + +@Data +public class VerificationCodeFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 手机号(注册手机号) + */ + private String mobile; + + /** + * 居民注册行为记录表Id resi_visit.id + */ + private String resiVisitId; + + /** + * 用户ID + */ + private String userId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java index 3d883da630..58fe02efb2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java @@ -39,4 +39,19 @@ public interface UserResiRegisterConstant { * 最后一次操作行为-提交失败 */ String MOBILECODE_EXCEPTION="手机验证码输入错误!"; + + /** + * 参数错误 + */ + String PARAMETER_ERROR="参数错误!"; + + /** + * 数据更新异常 + */ + String UPDATE_EXCEPTION="用户居民注册访问记录表更新数据失败!"; + + /** + * 手机号已存在 + */ + String MOBILE_EXIST="该手机号已注册居民!"; } 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 17b7e93685..7f333c98b6 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 @@ -23,10 +23,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.excel.UserResiInfoExcel; import com.epmet.service.UserResiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -114,4 +115,15 @@ public class UserResiInfoController { public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) { return userResiInfoService.submit(userResiInfoDTO); } + + /** + * @param formDTO + * @Author sun + * @Description 居民端-居民注册根据手机号获取验证码 + **/ + @PostMapping("getverificationcode") + public Result getVerificationCode(@RequestBody VerificationCodeFormDTO formDTO) { + return userResiInfoService.getVerificationCode(formDTO); + } + } 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 aa058b6350..478f58a4e4 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 @@ -23,6 +23,8 @@ import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.entity.UserResiInfoEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户居民端注册信息表 用户在居民端完善的个人信息 * @@ -46,4 +48,11 @@ public interface UserResiInfoDao extends BaseDao { * @Description 用户居民端注册信息表新增数据 **/ void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO); + + /** + * @Author sun + * @Description 根据手机号查询居民注册信息(user_resi_info)表数据 + **/ + List selectResiInfoByMobile(String regMobile); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java index 7c4a768bce..b030a8d4fd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java @@ -37,5 +37,5 @@ public interface UserResiRegisterVisitDao extends BaseDao selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO); - void updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO); + boolean updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java index db50e3c714..1a7035bbc5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.entity.UserResiInfoEntity; import java.util.List; @@ -112,4 +113,12 @@ public interface UserResiInfoService extends BaseService { * @author sun */ Result submit(UserResiInfoDTO userResiInfoDTO); + + /** + * 居民端-居民注册根据手机号获取验证码 + * + * @param formDTO + * @author sun + */ + Result getVerificationCode(VerificationCodeFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java index 9ec73fec91..62c385b557 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java @@ -25,6 +25,7 @@ import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.entity.UserResiRegisterVisitEntity; @@ -112,8 +113,15 @@ public interface UserResiRegisterVisitService extends BaseService implements UserResiInfoService { + private static final Logger log = LoggerFactory.getLogger(UserResiInfoServiceImpl.class); @Autowired private UserResiInfoRedis userResiInfoRedis; @Autowired @@ -140,14 +144,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); + if (list.size() > 0) { + bl = false; + } + return bl; + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java index 1f2e8efde9..9de9c0428e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java @@ -31,12 +31,14 @@ import com.epmet.dao.UserResiRegisterVisitDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.form.ResiRegisterFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.entity.UserResiRegisterVisitEntity; import com.epmet.redis.UserResiRegisterVisitRedis; import com.epmet.service.UserResiRegisterVisitService; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -55,6 +57,7 @@ import java.util.Map; @Service public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl implements UserResiRegisterVisitService { + private static final Logger log = LoggerFactory.getLogger(UserResiRegisterVisitServiceImpl.class); @Autowired private UserResiRegisterVisitRedis userResiRegisterVisitRedis; @Autowired @@ -140,7 +143,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl + + + uri.id AS "id", + uri.user_id AS "userId", + uri.reg_mobile AS "regMobile", + uri.surname AS "surname", + uri.`name` AS "name", + uri.street AS "street", + uri.district AS "district", + uri.building_address AS "buildingAddress", + uri.resi_visit_id AS "resiVisitId", + uri.del_flag AS "delflag", + uri.revision AS "revision", + uri.created_by AS "createdby", + uri.created_time AS "createdtime", + uri.updated_by AS "updatedby", + uri.updated_time AS "updatedtime" + + INSERT INTO user_resi_info ( id, @@ -80,4 +99,13 @@ AND uc.USER_ID = #{userId} + +