Merge branch 'dev_more_appid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

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;

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -560,6 +560,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);
 		}
 	}

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;
 
 	/**

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);
     }
 

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<UserResiInfoEntity> {
 
 	/**
-	 * @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<UserResiInfoEntity> {
 	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<UserResiInfoDTO> selectResiInfoByMobile(String regMobile);
+	List<UserResiInfoDTO> selectResiInfoByMobile(@Param("regMobile") String regMobile, @Param("customerId") String customerId);
 
 	/**
-	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
 	 * @param userIdList
+	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
 	 * @Author yinzuomei
 	 * @Description 根据userId集合查询用户注册信息
 	 * @Date 2020/4/7 18:26
@@ -72,8 +72,8 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	List<UserResiInfoResultDTO> selectListUserResiInfoDTO(@Param("userIdList") List<String> userIdList);
 
 	/**
-	 * @Description  根据userId查询议题发起人
 	 * @param formDTO
+	 * @Description 根据userId查询议题发起人
 	 * @author zxc
 	 * @date 2020/5/11 11:18
 	 */

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;
@@ -33,6 +34,7 @@ import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dao.UserWechatDao;
 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;
@@ -164,8 +166,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
 			return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
 		}*/
-		//2:再次判断手机号是否可用
-		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
+		//2:再次判断手机号是否在客户下可用
+		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
 			//手机号验证失败则更新行为记录表数据 返回前台结果
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
@@ -221,15 +223,17 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//1:更新居民注册访问记录表数据
 		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
 		//2:判断手机号是否可用
-		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
+		//2020-07-29 根据要注册的网格获取客户Id
+		UserResiRegisterVisitDTO registerVisitDTO = userResiRegisterVisitService.get(verificationCodeFormDTO.getResiVisitId());
+		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getCustomerId())) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
 		//3:调用短信服务 生成验证码发送短信
-		SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO();
+		SendVerificationCodeFormDTO sendVerificationCodeFormDTO = new SendVerificationCodeFormDTO();
 		sendVerificationCodeFormDTO.setMobile(verificationCodeFormDTO.getMobile());
 		sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER);
 		Result<SendVerificationCodeResultDTO> 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:删除缓存中可能存在的旧验证码
@@ -244,7 +248,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		Result result = new Result();
 
 		//判断手机号是否可用
-		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
+		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
 			//数据存入居民注册表
 			saveUserResiInfo(userResiInfoDTO);
 			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
@@ -280,12 +284,17 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据
 	 *
 	 * @param mobile
+	 * @param customerId
 	 * @return
 	 * @Author sun
 	 */
-	private Boolean getResiInfoByMobile(String mobile) {
+	private Boolean getResiInfoByMobile(String mobile, String customerId) {
+		if (StringUtils.isBlank(customerId)) {
+			customerId = UserUtil.getCurrentUser().getCustomerId();
+			log.info("getResiInfoByMobile UserUtil.getCustomerId:{}", customerId);
+		}
 		Boolean bl = true;
-		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile);
+		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile, customerId);
 		if (list.size() > 0) {
 			bl = false;
 		}

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -98,8 +98,11 @@
         SELECT
         <include refid="sql"></include>
         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}
     </select>
 
     <!-- 根据userId集合查询用户注册信息   -->