|
|
|
@ -37,6 +37,7 @@ import com.epmet.redis.UserResiInfoRedis; |
|
|
|
import com.epmet.service.RegisterRelationService; |
|
|
|
import com.epmet.service.UserResiInfoService; |
|
|
|
import com.epmet.service.UserResiRegisterVisitService; |
|
|
|
import com.epmet.service.UserRoleService; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@ -58,153 +59,161 @@ import java.util.Map; |
|
|
|
@Service |
|
|
|
public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, UserResiInfoEntity> implements UserResiInfoService { |
|
|
|
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(UserResiInfoServiceImpl.class); |
|
|
|
@Autowired |
|
|
|
private UserResiInfoRedis userResiInfoRedis; |
|
|
|
@Autowired |
|
|
|
private UserResiRegisterVisitService userResiRegisterVisitService; |
|
|
|
@Autowired |
|
|
|
private UserResiInfoDao userResiInfoDao; |
|
|
|
@Autowired |
|
|
|
private RegisterRelationService registerRelationService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<UserResiInfoDTO> page(Map<String, Object> params) { |
|
|
|
IPage<UserResiInfoEntity> page = baseDao.selectPage( |
|
|
|
getPage(params, FieldConstant.CREATED_TIME, false), |
|
|
|
getWrapper(params) |
|
|
|
); |
|
|
|
return getPageData(page, UserResiInfoDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<UserResiInfoDTO> list(Map<String, Object> params) { |
|
|
|
List<UserResiInfoEntity> entityList = baseDao.selectList(getWrapper(params)); |
|
|
|
|
|
|
|
return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params) { |
|
|
|
String id = (String) params.get(FieldConstant.ID_HUMP); |
|
|
|
|
|
|
|
QueryWrapper<UserResiInfoEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
|
|
|
|
|
|
return wrapper; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public UserResiInfoDTO get(String id) { |
|
|
|
UserResiInfoEntity entity = baseDao.selectById(id); |
|
|
|
return ConvertUtils.sourceToTarget(entity, UserResiInfoDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void save(UserResiInfoDTO dto) { |
|
|
|
UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); |
|
|
|
insert(entity); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void update(UserResiInfoDTO dto) { |
|
|
|
UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); |
|
|
|
updateById(entity); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void delete(String[] ids) { |
|
|
|
// 逻辑删除（@TableLogic 注解）
|
|
|
|
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param userResiInfoFormDTO |
|
|
|
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO> |
|
|
|
* @Author yinzuomei |
|
|
|
* @Description 查询用户注册信息 |
|
|
|
* @Date 2020/3/30 11:07 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { |
|
|
|
UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); |
|
|
|
if (null != userResiInfoDTO) { |
|
|
|
String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName(); |
|
|
|
userResiInfoDTO.setShowName(showName); |
|
|
|
} |
|
|
|
return new Result<UserResiInfoDTO>().ok(userResiInfoDTO); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result submit(UserResiInfoDTO userResiInfoDTO) { |
|
|
|
Result result = new Result(); |
|
|
|
//1:手机验证码数据校验//TODO
|
|
|
|
|
|
|
|
//2:验证码校验失败则更新行为记录表数据 返回前台结果
|
|
|
|
if (false) { |
|
|
|
userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO); |
|
|
|
result.error(UserResiRegisterConstant.PARAMETER_ERROR); |
|
|
|
result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION); |
|
|
|
return result; |
|
|
|
} |
|
|
|
//3:校验成功 数据存入居民注册表 更新行为记录表数据
|
|
|
|
saveUserResiInfo(userResiInfoDTO); |
|
|
|
userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); |
|
|
|
//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
|
|
|
|
registerRelationService.saveRegisterRelation(userResiInfoDTO); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 居民注册信息表新增数据 |
|
|
|
* |
|
|
|
* @param userResiInfoDTO |
|
|
|
* @Author sun |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) { |
|
|
|
Date date = new Date(); |
|
|
|
userResiInfoDTO.setId(IdWorker.get32UUID()); |
|
|
|
userResiInfoDTO.setDelFlag(NumConstant.ZERO); |
|
|
|
userResiInfoDTO.setRevision(NumConstant.ZERO); |
|
|
|
userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId()); |
|
|
|
userResiInfoDTO.setCreatedTime(date); |
|
|
|
userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId()); |
|
|
|
userResiInfoDTO.setUpdatedTime(date); |
|
|
|
userResiInfoDao.saveUserResiInfo(userResiInfoDTO); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param verificationCodeFormDTO |
|
|
|
* @Author sun |
|
|
|
* @Description 居民端-居民注册根据手机号获取验证码 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public Result getVerificationCode(VerificationCodeFormDTO verificationCodeFormDTO) { |
|
|
|
Result result = new Result(); |
|
|
|
//1:更新居民注册访问记录表数据
|
|
|
|
userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO); |
|
|
|
//2:判断手机号是否可用
|
|
|
|
if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) { |
|
|
|
result.error(UserResiRegisterConstant.PARAMETER_ERROR); |
|
|
|
result.setMsg(UserResiRegisterConstant.MOBILE_EXIST); |
|
|
|
return result; |
|
|
|
} |
|
|
|
//3:调用短信服务 生成验证码发送短信 TODO
|
|
|
|
|
|
|
|
//4:将验证码存入redis TODO
|
|
|
|
|
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) { |
|
|
|
Result result = new Result(); |
|
|
|
|
|
|
|
//判断手机号是否可用
|
|
|
|
if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) { |
|
|
|
private static final Logger log = LoggerFactory.getLogger(UserResiInfoServiceImpl.class); |
|
|
|
@Autowired |
|
|
|
private UserResiInfoRedis userResiInfoRedis; |
|
|
|
@Autowired |
|
|
|
private UserResiRegisterVisitService userResiRegisterVisitService; |
|
|
|
@Autowired |
|
|
|
private UserResiInfoDao userResiInfoDao; |
|
|
|
@Autowired |
|
|
|
private RegisterRelationService registerRelationService; |
|
|
|
@Autowired |
|
|
|
private UserRoleService userRoleService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<UserResiInfoDTO> page(Map<String, Object> params) { |
|
|
|
IPage<UserResiInfoEntity> page = baseDao.selectPage( |
|
|
|
getPage(params, FieldConstant.CREATED_TIME, false), |
|
|
|
getWrapper(params) |
|
|
|
); |
|
|
|
return getPageData(page, UserResiInfoDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<UserResiInfoDTO> list(Map<String, Object> params) { |
|
|
|
List<UserResiInfoEntity> entityList = baseDao.selectList(getWrapper(params)); |
|
|
|
|
|
|
|
return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params) { |
|
|
|
String id = (String) params.get(FieldConstant.ID_HUMP); |
|
|
|
|
|
|
|
QueryWrapper<UserResiInfoEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); |
|
|
|
|
|
|
|
return wrapper; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public UserResiInfoDTO get(String id) { |
|
|
|
UserResiInfoEntity entity = baseDao.selectById(id); |
|
|
|
return ConvertUtils.sourceToTarget(entity, UserResiInfoDTO.class); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void save(UserResiInfoDTO dto) { |
|
|
|
UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); |
|
|
|
insert(entity); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void update(UserResiInfoDTO dto) { |
|
|
|
UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class); |
|
|
|
updateById(entity); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void delete(String[] ids) { |
|
|
|
// 逻辑删除（@TableLogic 注解）
|
|
|
|
baseDao.deleteBatchIds(Arrays.asList(ids)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param userResiInfoFormDTO |
|
|
|
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO> |
|
|
|
* @Author yinzuomei |
|
|
|
* @Description 查询用户注册信息 |
|
|
|
* @Date 2020/3/30 11:07 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) { |
|
|
|
UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO); |
|
|
|
if (null != userResiInfoDTO) { |
|
|
|
String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName(); |
|
|
|
userResiInfoDTO.setShowName(showName); |
|
|
|
} |
|
|
|
return new Result<UserResiInfoDTO>().ok(userResiInfoDTO); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result submit(UserResiInfoDTO userResiInfoDTO) { |
|
|
|
Result result = new Result(); |
|
|
|
//1:手机验证码数据校验//TODO
|
|
|
|
|
|
|
|
//2:验证码校验失败则更新行为记录表数据 返回前台结果
|
|
|
|
if (false) { |
|
|
|
userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO); |
|
|
|
result.error(UserResiRegisterConstant.PARAMETER_ERROR); |
|
|
|
result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION); |
|
|
|
return result; |
|
|
|
} |
|
|
|
//3:校验成功 数据存入居民注册表 新增角色 更新行为记录表数据
|
|
|
|
saveUserResiInfo(userResiInfoDTO); |
|
|
|
userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); |
|
|
|
//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
|
|
|
|
registerRelationService.saveRegisterRelation(userResiInfoDTO); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 居民注册信息表新增数据,角色表新增角色 |
|
|
|
* |
|
|
|
* @param userResiInfoDTO |
|
|
|
* @Author sun |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Result saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) { |
|
|
|
//1:注册信息表新增数据
|
|
|
|
Date date = new Date(); |
|
|
|
userResiInfoDTO.setId(IdWorker.get32UUID()); |
|
|
|
userResiInfoDTO.setDelFlag(NumConstant.ZERO); |
|
|
|
userResiInfoDTO.setRevision(NumConstant.ZERO); |
|
|
|
userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId()); |
|
|
|
userResiInfoDTO.setCreatedTime(date); |
|
|
|
userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId()); |
|
|
|
userResiInfoDTO.setUpdatedTime(date); |
|
|
|
userResiInfoDao.saveUserResiInfo(userResiInfoDTO); |
|
|
|
//2:角色表新增角色数据
|
|
|
|
userRoleService.saveResiRole(userResiInfoDTO); |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param verificationCodeFormDTO |
|
|
|
* @Author sun |
|
|
|
* @Description 居民端-居民注册根据手机号获取验证码 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public Result getVerificationCode(VerificationCodeFormDTO verificationCodeFormDTO) { |
|
|
|
Result result = new Result(); |
|
|
|
//1:更新居民注册访问记录表数据
|
|
|
|
userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO); |
|
|
|
//2:判断手机号是否可用
|
|
|
|
if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) { |
|
|
|
result.error(UserResiRegisterConstant.PARAMETER_ERROR); |
|
|
|
result.setMsg(UserResiRegisterConstant.MOBILE_EXIST); |
|
|
|
return result; |
|
|
|
} |
|
|
|
//3:调用短信服务 生成验证码发送短信 TODO
|
|
|
|
String verificationCode = "TODO"; |
|
|
|
|
|
|
|
//4:将验证码存入redis TODO
|
|
|
|
userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile(), verificationCode); |
|
|
|
|
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) { |
|
|
|
Result result = new Result(); |
|
|
|
|
|
|
|
//判断手机号是否可用
|
|
|
|
if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) { |
|
|
|
UserResiRegisterVisitEntity visitEntity = new UserResiRegisterVisitEntity(); |
|
|
|
visitEntity.setCustomerId(userResiInfoDTO.getCustomerId()); |
|
|
|
visitEntity.setGridId(userResiInfoDTO.getGridId()); |
|
|
|
@ -215,30 +224,30 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us |
|
|
|
visitEntity.setVisitTime(new Date()); |
|
|
|
userResiRegisterVisitService.insert(visitEntity); |
|
|
|
//数据存入居民注册表
|
|
|
|
userResiInfoDTO.setResiVisitId(visitEntity.getId()); |
|
|
|
saveUserResiInfo(userResiInfoDTO); |
|
|
|
userResiInfoDTO.setResiVisitId(visitEntity.getId()); |
|
|
|
saveUserResiInfo(userResiInfoDTO); |
|
|
|
//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
|
|
|
|
registerRelationService.saveRegisterRelation(userResiInfoDTO); |
|
|
|
} |
|
|
|
|
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据 |
|
|
|
* |
|
|
|
* @param mobile |
|
|
|
* @return |
|
|
|
* @Author sun |
|
|
|
*/ |
|
|
|
private Boolean getResiInfoByMobile(String mobile) { |
|
|
|
Boolean bl = true; |
|
|
|
|
|
|
|
List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile); |
|
|
|
if (list.size() > 0) { |
|
|
|
bl = false; |
|
|
|
} |
|
|
|
return bl; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据 |
|
|
|
* |
|
|
|
* @param mobile |
|
|
|
* @return |
|
|
|
* @Author sun |
|
|
|
*/ |
|
|
|
private Boolean getResiInfoByMobile(String mobile) { |
|
|
|
Boolean bl = true; |
|
|
|
|
|
|
|
List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile); |
|
|
|
if (list.size() > 0) { |
|
|
|
bl = false; |
|
|
|
} |
|
|
|
return bl; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
sunyuchao
5 years ago