Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java

@@ -53,4 +53,15 @@ public class InitInfoResultDTO implements Serializable {
 	 * 手机号
 	 */
 	private String mobile;
+
+	/**
+	 * 2023.04.18烟台需求增加
+	 * 用于完善信息界面展示
+	 */
+	private String gridId;
+	/**
+	 * 2023.04.18烟台需求增加
+	 * 用于完善信息界面展示
+	 */
+	private String gridName;
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java

@@ -1,6 +1,8 @@
 package com.epmet.modules.mine.service.impl;
 
 import com.epmet.commons.tools.exception.RenException;
+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.EditInfoFormDTO;
@@ -11,6 +13,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.mine.service.PersonalCenterService;
 import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +49,16 @@ public class PersonalCenterServiceImpl implements PersonalCenterService {
 		resultDTO.setIdNum(baseInfoResult.getData().getIdNum());
 		resultDTO.setMobile(baseInfoResult.getData().getMobile());
 		resultDTO.setRealName(baseInfoResult.getData().getRealName());
+		// start
+		//  2023.04.18烟台需求增加
+		//  用于完善信息界面展示
+		resultDTO.setGridId(baseInfoResult.getData().getGridId());
+		if (StringUtils.isNotBlank(resultDTO.getGridId())) {
+			GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resultDTO.getGridId());
+			if (null != gridInfoCache) {
+				resultDTO.setGridName(gridInfoCache.getGridNamePath());
+			}
+		}// end
 		return resultDTO;
 	}
 

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

@@ -365,7 +365,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
 
     @Override
     public Result<ResiUserBaseInfoResultDTO> selecUserBaseInfoByUserId(String userId) {
-        return new Result<ResiUserBaseInfoResultDTO>().ok(baseDao.selecUserBaseInfoByUserId(userId));
+        ResiUserBaseInfoResultDTO resultDTO=baseDao.selecUserBaseInfoByUserId(userId);
+        // start
+        //  2023.04.18烟台需求增加
+        //  用于完善信息界面展示
+        if (null != resultDTO) {
+            RegisterRelationEntity registerRelation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
+            if (null != registerRelation) {
+                resultDTO.setGridId(registerRelation.getGridId());
+            }
+        }// end
+        return new Result<ResiUserBaseInfoResultDTO>().ok(resultDTO);
     }