用户进入网格时，统计注册信息逻辑更改

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

@@ -47,6 +47,15 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 **/
 	UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
+	/**
+	 * @Description 查询用户注册信息 不按照客户Id查询
+	 * @param userResiInfoFormDTO
+	 * @return  UserResiInfoResultDTO
+	 * @author wangc
+	 * @date 2020.05.21 13:18
+	**/
+	UserResiInfoResultDTO selectUserResiInfoNotByCustId(UserResiInfoFormDTO userResiInfoFormDTO);
+
 	/**
 	 * @Author sun
 	 * @Description 根据手机号查询居民注册信息(user_resi_info)表数据

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

@@ -47,6 +47,8 @@ import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.RegisterRelationRedis;
 import com.epmet.service.RegisterRelationService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +64,8 @@ import java.util.*;
 @Service
 public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelationDao, RegisterRelationEntity> implements RegisterRelationService {
 
+    private static final Logger log = LoggerFactory.getLogger(RegisterRelationServiceImpl.class);
+
     @Autowired
     private RegisterRelationRedis registerRelationRedis;
 
@@ -227,23 +231,25 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                             userCustomerDao.insert(userCustomer);
                         }
                     }else{
-
+                        log.warn("不存在不同客户不同网格下用户注册记录数据，可能因为居民注册时没有成功记录register_relation信息");
                         //如果不存在不同客户不同网格数据，说明在居民注册时没有成功记录register_relation信息
-                        UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
-                        userResiRegisterVisitDTO.setDelFlag(NumConstant.ZERO);
-                        userResiRegisterVisitDTO.setUserId(enterGridFormDTO.getUserId());
-                        List<UserResiRegisterVisitDTO> UserResiRegisterVisitRecord =
-                            userResiRegisterVisitDao.selectUserResiRegisterVisit(userResiRegisterVisitDTO);
+                        //UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
+                        //userResiRegisterVisitDTO.setDelFlag(NumConstant.ZERO);
+                        //userResiRegisterVisitDTO.setUserId(enterGridFormDTO.getUserId());
+                        //List<UserResiRegisterVisitDTO> UserResiRegisterVisitRecord =
+                        //    userResiRegisterVisitDao.selectUserResiRegisterVisit(userResiRegisterVisitDTO);
                     }
                 }
             }
 
             UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
             userResiInfoFormDTO.setUserId(enterGridFormDTO.getUserId());
-            userResiInfoFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
-            UserResiInfoResultDTO userResiInfo =  userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO);
-            resultObj.setNickname(userResiInfo.getShowName());
-
+            UserResiInfoResultDTO userResiInfo =  userResiInfoDao.selectUserResiInfoNotByCustId(userResiInfoFormDTO);
+            if(null != userResiInfo) {
+                resultObj.setNickname(userResiInfo.getShowName());
+            }else{
+                log.warn(String.format("查找用户居民注册信息失败，用户Id:【%s】",enterGridFormDTO.getUserId()));
+            }
         }
 
         //3.获取权限
@@ -267,7 +273,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             resultObj.setCurrentGridName(gridDTOResult.getData().getGridName());
         }else{
             //查询网格名称失败
-
+            log.warn(String.format("查找网格信息失败，网格Id:【%s】",gridId));
         }
 
         result.setData(resultObj);

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

@@ -72,6 +72,27 @@
             AND uw.USER_ID = #{userId}
     </select>
 
+    <!-- 查询用户注册信息 不按照客户Id查询  -->
+    <select id="selectUserResiInfoNotByCustId" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
+            resultType="com.epmet.dto.result.UserResiInfoResultDTO">
+        SELECT
+            uri.USER_ID,
+            CONCAT(
+            uri.STREET,
+            '-',
+            uri.SURNAME,
+            ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END )
+            ) AS show_name
+        FROM
+            user_resi_info uri
+            LEFT JOIN user_wechat uw ON (uri.USER_ID = uw.USER_ID)
+        WHERE
+            uri.DEL_FLAG = '0'
+            AND uw.DEL_FLAG = '0'
+            AND uri.USER_ID = #{userId}
+            AND uw.USER_ID = #{userId}
+    </select>
+
     <select id="selectResiInfoByMobile" parameterType="string"
             resultType="com.epmet.dto.UserResiInfoDTO">
         SELECT