From 4440deb44e7d8b8e8d9d61f90c0423bc8e4a7ea5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Jun 2022 10:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=B5=81=E7=A8=8B=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/MyHomeServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java index 4b79844581..dc0c4e3ee4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java @@ -10,10 +10,7 @@ import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.IcResiUserDao; -import com.epmet.dao.UserBaseInfoDao; -import com.epmet.dao.UserResiInfoDao; -import com.epmet.dao.UserRoleDao; +import com.epmet.dao.*; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.EnterGridFormDTO; @@ -25,6 +22,7 @@ import com.epmet.dto.result.ResiUserBaseInfoResultDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.UserBaseInfoEntity; import com.epmet.entity.UserResiInfoEntity; +import com.epmet.entity.UserResiRegisterVisitEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; @@ -35,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -64,6 +63,8 @@ public class MyHomeServiceImpl implements MyHomeService { private IcResiUserDao icResiUserDao; @Resource private RegisterRelationService registerRelationService; + @Resource + private UserResiRegisterVisitDao userResiRegisterVisitDao; @Override public List selectListHomeMember(String houseCode, String customerId) { @@ -88,7 +89,7 @@ public class MyHomeServiceImpl implements MyHomeService { @Override @Transactional(rollbackFor = Exception.class) public void registerAndBind(RegisterAndBindFormDTO formDTO) { - //TODO 是否走进入网格（entergrid）流程 + //进入网格（entergrid）流程 EnterGridFormDTO userInfoParams = new EnterGridFormDTO(); userInfoParams.setUserId(formDTO.getUserId()); userInfoParams.setCustomerId(formDTO.getCustomerId()); @@ -119,11 +120,20 @@ public class MyHomeServiceImpl implements MyHomeService { UserBaseInfoEntity userBaseInfoEntity = ConvertUtils.sourceToTarget(userResiInfo, UserBaseInfoEntity.class); userBaseInfoService.insertOrUpdate(userBaseInfoEntity); } else { + //visit表添加数据 + UserResiRegisterVisitEntity visit = new UserResiRegisterVisitEntity(); + visit.setCustomerId(formDTO.getCustomerId()); + visit.setGridId(formDTO.getGridId()); + visit.setUserId(formDTO.getUserId()); + visit.setVisitFrom("register_and_bind"); + visit.setLastOperateVisit("success"); + visit.setVisitTime(new Date()); + userResiRegisterVisitDao.insert(visit); //注册居民 UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(formDTO, UserResiInfoDTO.class); userResiInfoDTO.setIdNum(formDTO.getIdCard()); userResiInfoDTO.setRegMobile(formDTO.getMobile()); - userResiInfoDTO.setResiVisitId(formDTO.getVisitId()); + userResiInfoDTO.setResiVisitId(visit.getId()); userResiInfoDTO.setDistrict(formDTO.getAddress()); userResiInfoDTO.setCustomerId(formDTO.getCustomerId()); userResiInfoDTO.setApp("resi");