进网格接口加返参

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java

@@ -1,6 +1,9 @@
 package com.epmet.service.impl;
 
 
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.EnterGridFormDTO;
@@ -37,6 +40,16 @@ public class UserAccessServiceImpl implements UserAccessService {
         userInfoParams.setGridId(formDTO.getGridId());
         Result<UserInfoOnEnterGridResultDTO> userInfoResult =
                 epmetUserFeignClient.getUserInfoAndRoles(userInfoParams);
+        //获取网格缓存信息
+        if(userInfoResult.success()){
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(userInfoResult.getData().getCurrentGridId());
+            if (null == gridInfo) {
+                log.error(String.format("居民端进网格接口获取网格缓存信息失败，网格Id->%s",userInfoResult.getData().getCurrentGridId()));
+                return userInfoResult;
+            }
+            userInfoResult.getData().setAgencyId(gridInfo.getPid());
+            userInfoResult.getData().setAgencyName(gridInfo.getAgencyName());
+        }
         return userInfoResult;
     }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@@ -77,4 +77,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
     private String orgName = "";
     //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId)
     private String orgType = "";
+
+    //进入的网格所属组织
+    private String agencyId;
+    private String agencyName;
 }