enterGrid修改，增加user_customer

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<UserCustomerEntity>{
+
+}

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

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<RegisterRelatio
     @Autowired
     private UserResiRegisterVisitDao userResiRegisterVisitDao;
 
+    @Autowired
+    private UserCustomerDao userCustomerDao;
+
+
     @Override
     public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
         IPage<RegisterRelationEntity> page = baseDao.selectPage(
@@ -149,12 +154,15 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             resultObj.setNickname(strangerWechatInfo.get(0).getNickname());
             resultObj.setUserHeadPhoto(strangerWechatInfo.get(0).getHeadImgUrl());
         }
-
+        //需要新增的用户关系参数
+        UserCustomerEntity userCustomer = new UserCustomerEntity();
+        userCustomer.setCustomerId(enterGridFormDTO.getCustomerId());
+        userCustomer.setUserId(enterGridFormDTO.getUserId());
         List<RegisterRelationEntity> 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<RegisterRelatio
                         registerRelationToSave.setParticipation("1");
 
                         baseDao.insert(registerRelationToSave);
+                        userCustomerDao.insert(userCustomer);
                     }else{
 
                         //如果不存在不同客户不同网格数据，说明在居民注册时没有成功记录register_relation信息
@@ -229,7 +238,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         customerGridFormDTO.setGridId(gridId);
         Result<CustomerGridDTO> gridDTOResult =
         govOrgFeignClient.getCustomerGridByGridId(customerGridFormDTO);
-        if(gridDTOResult.success()){
+        if(gridDTOResult.success() && null != gridDTOResult.getData()){
             resultObj.setCurrentGridName(gridDTOResult.getData().getGridName());
         }else{
             //查询网格名称失败

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.UserCustomerDao">
+
+
+    <resultMap type="com.epmet.entity.UserCustomerEntity" id="userCustomerMap">
+        <result property="id" column="ID"/>
+        <result property="app" column="APP"/>
+        <result property="roleName" column="ROLE_NAME"/>
+        <result property="roleKey" column="ROLE_KEY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+</mapper>