Merge branch 'yantai_zhengwu_master'

epmet-auth/src/main/java/com/epmet/dto/result/ResiHfiveAppLoginResDTO.java

@@ -10,5 +10,8 @@ import lombok.Data;
 @Data
 public class ResiHfiveAppLoginResDTO {
     private String authorization;
+
+    // 网格id
+    private String gridId;
 }
 

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -1119,6 +1119,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         HfiveLoginResiFormDTO hfiveLoginResiFormDTO = new HfiveLoginResiFormDTO();
 
         hfiveLoginResiFormDTO.setUserBaseInfoId(formDTO.getUserBaseInfoId());
+        hfiveLoginResiFormDTO.setCustomerId(getCurrentCustomerId());
 
         // 2、调用userfeign接口获取userId、注册网格相关信息
         Result<DingLoginResiResDTO> loginResiResDTOResult = epmetUserOpenFeignClient.hFiveResiLogin(hfiveLoginResiFormDTO);
@@ -1128,6 +1129,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "提供的居民id获取居民信息失败:"+ formDTO.getUserBaseInfoId(), "获取token失败");
         }
         DingLoginResiResDTO resiResDTO = loginResiResDTOResult.getData();
+        // 网格id
+        resDTO.setGridId(loginResiResDTOResult.getData().getGridId());
 
         // 3.生成token，并且存放Redis
         String token = this.saveTokenDtoHfive(AppClientConstant.APP_RESI, AppClientConstant.LAN_TU, resiResDTO.getEpmetUserId(), getCurrentCustomerId());
@@ -1159,7 +1162,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         Result<LantuRegisterResiResDTO> lantuRegisterResi = epmetUserOpenFeignClient.lantuRegisterResi(lantuRegisterResiFormDTO);
 
         if (!lantuRegisterResi.success() || null == lantuRegisterResi.getData()) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民注册异常", "居民注册异常");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), JSON.toJSONString(lantuRegisterResi), "居民注册异常");
         }
 
         resiRegisterLantuResultDTO.setUserBaseInfoId(lantuRegisterResi.getData().getEpmetUserId());

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

@@ -645,6 +645,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息失败", "获取居民信息失败");
         }else {
             result.setEpmetUserId(baseInfo.getUserId());
+
+            LambdaQueryWrapper<RegisterRelationEntity> registerWrapper = new LambdaQueryWrapper<>();
+            registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId());
+            registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId());
+            registerWrapper.eq(RegisterRelationEntity::getFirstRegister, NumConstant.ONE_STR);
+            RegisterRelationEntity registerRelation = registerRelationDao.selectOne(registerWrapper);
+            if (registerRelation!=null){
+                result.setGridId(registerRelation.getGridId());
+            }else{
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民网格关系失败，请更新注册信息", "获取居民网格关系失败");
+            }
         }
         return result;
     }
@@ -706,6 +717,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             }
             result.setEpmetUserId(baseInfo.getId());
             // 新增网格关系 先查询有没有网格关系
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId());
+            if (null == gridInfo) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格失败", "获取网格失败");
+            }
             LambdaQueryWrapper<RegisterRelationEntity> registerWrapper = new LambdaQueryWrapper<>();
             registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId());
             registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId());
@@ -717,10 +732,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 registerRelation.setCustomerId(formDTO.getCustomerId());
                 registerRelation.setGridId(formDTO.getGridId());
                 //表中新增字段 为其赋值
-                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId());
-                if (null == gridInfo) {
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存失败", "获取网格缓存失败");
-                }
+
                 registerRelation.setAgencyId(gridInfo.getPid());
                 registerRelation.setAgencyIdPath(gridInfo.getPids());
                 registerRelation.setUserId(baseInfo.getUserId());