diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java new file mode 100644 index 0000000000..4dc226e8a7 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.UserCustomerEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description 客户用户关系表 + * @IntefaceName UserCustomerDao + * @Author wangc + * @date 2020.03.31 13:53 + */ +@Mapper +public interface UserCustomerDao extends BaseDao{ + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java new file mode 100644 index 0000000000..0b92baede7 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java @@ -0,0 +1,31 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @Description + * @ClassName UserCustomerEntity + * @Author wangc + * @date 2020.03.31 13:54 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("user_customer") +public class UserCustomerEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 用户Id + * */ + private String userId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 4568078521..df9d5a7ede 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -36,6 +36,7 @@ import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.RegisterRelationEntity; +import com.epmet.entity.UserCustomerEntity; import com.epmet.entity.UserWechatEntity; import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.RegisterRelationRedis; @@ -74,6 +75,10 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -149,12 +154,15 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl registerRecords = baseDao.getListByUserId(enterGridFormDTO.getUserId()); //1.查找用户注册关系表,如果没有表示当前用户为陌生人(拉取用户微信表信息),如果有表示当前用户已经进行居民认证 if(null == registerRecords || registerRecords.size() <= 0){ //当前用户尚未注册过居民信息 - + userCustomerDao.insert(userCustomer); }else{ //2.根据居民认证的网格、客户进行统计 @@ -193,6 +201,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl gridDTOResult = govOrgFeignClient.getCustomerGridByGridId(customerGridFormDTO); - if(gridDTOResult.success()){ + if(gridDTOResult.success() && null != gridDTOResult.getData()){ resultObj.setCurrentGridName(gridDTOResult.getData().getGridName()); }else{ //查询网格名称失败 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml new file mode 100644 index 0000000000..d775556e5e --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file