Browse Source

居民端-居民注册信息提交接口-部分逻辑代码提交

dev
sunyuchao 5 years ago
parent
commit
f60c49c010
  1. 8
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  2. 2
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
  3. 13
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
  4. 17
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
  5. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java
  6. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
  7. 21
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java
  8. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java
  9. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java
  10. 20
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
  11. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
  12. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
  13. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java
  14. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java
  15. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
  16. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java
  17. 35
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
  18. 54
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
  19. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java
  20. 34
      epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml
  21. 37
      epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
  22. 7
      epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml

8
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@ -2,6 +2,7 @@ package com.epmet.modules.feign;
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.result.LatestGridInfoResultDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
@ -35,4 +36,11 @@ public interface EpmetUserFeignClient {
**/
@PostMapping(value = "epmetuser/userresiregistervisit/init")
Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO);
/**
* @Author sun
* @Description 居民端-居民注册信息提交
**/
@PostMapping(value = "epmetuser/userresiinfo/submit")
Result submit(UserResiInfoDTO userResiInfoDTO);
}

2
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
* @Description 居民端陌生人导览 调用epmet-user服务
* @Author sun
*/
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,url="http://localhost:8096")
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
public interface ResiPartymemberFeignClient {
/**

13
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@ -3,6 +3,7 @@ package com.epmet.modules.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
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.result.LatestGridInfoResultDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
@ -39,4 +40,16 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO);
}
/**
* @Author sun
* @Description 居民端-居民注册信息提交
* @Date 2020/3/30
**/
@Override
public Result submit(UserResiInfoDTO userResiInfoDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "submit", userResiInfoDTO);
}
}

17
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java

@ -3,9 +3,11 @@ package com.epmet.modules.resiregister.controller;
import com.epmet.commons.tools.annotation.LoginUser;
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.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;
@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("resiregister")
public class ResiRegisterController {
@Autowired
private ResiRegisterService resiMineGridService;
private ResiRegisterService resiRegisterService;
/**
* @param
@ -32,7 +34,18 @@ public class ResiRegisterController {
**/
@PostMapping("init")
public Result<ResiRegisterResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) {
return resiMineGridService.init(tokenDTO, resiRegisterFormDTO);
return resiRegisterService.init(tokenDTO, resiRegisterFormDTO);
}
/**
* @param
* @Author sun
* @Description 居民端-居民注册信息提交
**/
@PostMapping("submit")
public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody UserResiInfoDTO userResiInfoDTO) {
return resiRegisterService.submit(tokenDTO, userResiInfoDTO);
}
}

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java

@ -2,6 +2,7 @@ package com.epmet.modules.resiregister.service;
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.result.ResiRegisterResultDTO;
@ -22,4 +23,13 @@ public interface ResiRegisterService {
*/
Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO);
/**
* 居民端-居民注册信息提交
*
* @param
* @return void
* @author sun
*/
Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO);
}

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@ -2,6 +2,7 @@ package com.epmet.modules.resiregister.service.impl;
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.result.ResiRegisterResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
@ -30,4 +31,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
formDTO.setUserId(tokenDTO.getUserId());
return epmetUserFeignClient.init(formDTO);
}
@Override
public Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO) {
if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
}
userResiInfoDTO.setUserId(tokenDTO.getUserId());
return epmetUserFeignClient.submit(userResiInfoDTO);
}
}

21
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java

@ -33,6 +33,11 @@ public class UserResiInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 用户Id(主键) user.id
*/
@ -108,4 +113,20 @@ public class UserResiInfoDTO implements Serializable {
*/
private String showName;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* 手机验证码
*/
private String mobileCode;
}

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java

@ -34,7 +34,7 @@ public class ResiRegisterResultDTO implements Serializable {
/**
* 用户居民端注册访问记录表(user_resi_register_visit)Id
*/
private String userResiRegisterVisitId;
private String resiVisitId;
}

5
epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java

@ -34,4 +34,9 @@ public interface UserResiRegisterConstant {
* 最后一次操作行为-提交失败
*/
String FAILD="faild";
/**
* 最后一次操作行为-提交失败
*/
String MOBILECODE_EXCEPTION="手机验证码输入错误!";
}

20
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@ -51,19 +51,19 @@ public class UserResiInfoController {
private UserResiInfoService userResiInfoService;
@GetMapping("page")
public Result<PageData<UserResiInfoDTO>> page(@RequestParam Map<String, Object> params){
public Result<PageData<UserResiInfoDTO>> page(@RequestParam Map<String, Object> params) {
PageData<UserResiInfoDTO> page = userResiInfoService.page(params);
return new Result<PageData<UserResiInfoDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<UserResiInfoDTO> get(@PathVariable("id") String id){
public Result<UserResiInfoDTO> get(@PathVariable("id") String id) {
UserResiInfoDTO data = userResiInfoService.get(id);
return new Result<UserResiInfoDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody UserResiInfoDTO dto){
public Result save(@RequestBody UserResiInfoDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
userResiInfoService.save(dto);
@ -71,7 +71,7 @@ public class UserResiInfoController {
}
@PutMapping
public Result update(@RequestBody UserResiInfoDTO dto){
public Result update(@RequestBody UserResiInfoDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
userResiInfoService.update(dto);
@ -79,7 +79,7 @@ public class UserResiInfoController {
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
userResiInfoService.delete(ids);
@ -104,4 +104,14 @@ public class UserResiInfoController {
ValidatorUtils.validateEntity(userResiInfoFormDTO);
return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO);
}
/**
* @param userResiInfoDTO
* @Author sun
* @Description 居民端-居民注册信息提交
**/
@PostMapping("submit")
public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) {
return userResiInfoService.submit(userResiInfoDTO);
}
}

3
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java

@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.RegisterRelationDTO;
import com.epmet.entity.RegisterRelationEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -34,6 +35,6 @@ import java.util.List;
public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
List<RegisterRelationEntity> getListByUserId(@Param("userId") String userId);
boolean saveRegisterRelation(RegisterRelationDTO registerRelationDTO);
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@ -40,4 +40,10 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
* @Date 2020/3/30 11:10
**/
UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
/**
* @Author sun
* @Description 用户居民端注册信息表新增数据
**/
void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java

@ -36,4 +36,6 @@ public interface UserResiRegisterVisitDao extends BaseDao<UserResiRegisterVisitE
void saveUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
List<UserResiRegisterVisitDTO> selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
void updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
}

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.RegisterRelationDTO;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.EnterGridFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.entity.RegisterRelationEntity;
@ -104,4 +105,11 @@ public interface RegisterRelationService extends BaseService<RegisterRelationEnt
* @Date 2020.03.30 15:06
**/
Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO);
/**
* @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
* @Param userResiInfoDTO
* @Author sun
**/
Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO);
}

9
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java

@ -103,4 +103,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
* @Date 2020/3/30 11:07
**/
Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
/**
* 居民端-居民注册信息提交
*
* @param userResiInfoDTO
* @return void
* @author sun
*/
Result submit(UserResiInfoDTO userResiInfoDTO);
}

11
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java

@ -21,8 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
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.result.ResiRegisterResultDTO;
import com.epmet.entity.UserResiRegisterVisitEntity;
@ -105,4 +107,13 @@ public interface UserResiRegisterVisitService extends BaseService<UserResiRegist
* @author sun
*/
Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO);
/**
* 居民端-居民注册信息提交-更新访问行为记录表数据
*
* @param bl userResiInfoDTO
* @return void
* @author sun
*/
Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO);
}

35
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java

@ -19,7 +19,9 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
@ -78,6 +80,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
@Autowired
private UserCustomerDao userCustomerDao;
@Autowired
private RegisterRelationDao registerRelationDao;
@Override
public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
@ -249,4 +254,34 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
return result;
}
/**
* @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
* @Param userResiInfoDTO
* @Author sun
**/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO) {
Date date = new Date();
RegisterRelationDTO registerRelationDTO = new RegisterRelationDTO();
registerRelationDTO.setCustomerId(userResiInfoDTO.getCustomerId());
registerRelationDTO.setGridId(userResiInfoDTO.getGridId());
registerRelationDTO.setUserId(userResiInfoDTO.getUserId());
//首次注册用户 (0表示不参与计数 1表示参与计数)
registerRelationDTO.setFirstRegister(NumConstant.ONE_STR);
//注册用户 (0表示不参与计数 1表示参与计数)
registerRelationDTO.setRegister(NumConstant.ONE_STR);
//参与用户 (0表示不参与计数 1表示参与计数)
registerRelationDTO.setParticipation(NumConstant.ONE_STR);
registerRelationDTO.setId(IdWorker.get32UUID());
registerRelationDTO.setDelFlag(NumConstant.ZERO);
registerRelationDTO.setRevision(NumConstant.ZERO);
registerRelationDTO.setCreatedBy(userResiInfoDTO.getUserId());
registerRelationDTO.setCreatedTime(date);
registerRelationDTO.setUpdatedBy(userResiInfoDTO.getUserId());
registerRelationDTO.setUpdatedTime(date);
registerRelationDao.saveRegisterRelation(registerRelationDTO);
return new Result();
}
}

54
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@ -19,23 +19,29 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.UserResiRegisterConstant;
import com.epmet.dao.UserResiInfoDao;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.entity.UserResiInfoEntity;
import com.epmet.redis.UserResiInfoRedis;
import com.epmet.service.RegisterRelationService;
import com.epmet.service.UserResiInfoService;
import com.epmet.service.UserResiRegisterVisitService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -50,6 +56,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
@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) {
@ -67,8 +79,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class);
}
private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
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);
@ -120,4 +132,42 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
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.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION);
return result;
}
//3:校验成功 数据存入居民注册表 更新行为记录表数据
saveUserResiInfo(userResiInfoDTO);
result = userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
result = 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);
}
}

22
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java

@ -28,8 +28,10 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.UserResiRegisterConstant;
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.result.ResiRegisterResultDTO;
import com.epmet.entity.UserResiRegisterVisitEntity;
import com.epmet.redis.UserResiRegisterVisitRedis;
@ -132,8 +134,26 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
userResiRegisterVisitDTO.setUpdatedTime(date);
userResiRegisterVisitDao.saveUserResiRegisterVisit(userResiRegisterVisitDTO);
ResiRegisterResultDTO resiRegisterResultDTO = new ResiRegisterResultDTO();
resiRegisterResultDTO.setUserResiRegisterVisitId(userResiRegisterVisitDTO.getId());
resiRegisterResultDTO.setResiVisitId(userResiRegisterVisitDTO.getId());
return new Result<ResiRegisterResultDTO>().ok(resiRegisterResultDTO);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO) {
UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
if (bl) {
//最后一次操作行为-提交成功
userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.SUCCESS);
} else {
//最后一次操作行为-提交失败
userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.FAILD);
}
userResiRegisterVisitDTO.setId(userResiInfoDTO.getResiVisitId());
userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
userResiRegisterVisitDTO.setUpdatedTime(new Date());
userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO);
return new Result();
}
}

34
epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml

@ -19,6 +19,40 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<insert id="saveRegisterRelation" parameterType="com.epmet.dto.RegisterRelationDTO">
INSERT INTO register_relation (
id,
customer_id,
grid_id,
user_id,
first_register,
register,
participation,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
(
#{id},
#{customerId},
#{gridId},
#{userId},
#{firstRegister},
#{register},
#{participation},
#{delFlag},
#{revision},
#{createdBy},
#{createdTime},
#{updatedBy},
#{updatedTime}
)
</insert>
<select id="getListByUserId" parameterType="string" resultType="com.epmet.entity.RegisterRelationEntity">
SELECT *

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

@ -19,6 +19,43 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<insert id="saveUserResiInfo" parameterType="com.epmet.dto.UserResiInfoDTO">
INSERT INTO user_resi_info (
id,
user_id,
reg_mobile,
surname,
`name`,
street,
district,
building_address,
resi_visit_id,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
(
#{id},
#{userId},
#{regMobile},
#{surname},
#{name},
#{street},
#{district},
#{buildingAddress},
#{resiVisitId},
#{delFlag},
#{revision},
#{createdBy},
#{createdTime},
#{updatedBy},
#{updatedTime}
)
</insert>
<!-- 查询用户注册信息 -->
<select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"

7
epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml

@ -50,6 +50,13 @@
#{updatedTime}
)
</insert>
<update id="updateResiRegisterVisit" parameterType="com.epmet.dto.UserResiRegisterVisitDTO">
UPDATE user_resi_register_visit
SET last_operate_visit = #{lastOperateVisit},
updated_by = #{updatedBy},
updated_time = #{updatedTime}
WHERE id = #{id}
</update>
</mapper>
Loading…
Cancel
Save