From 62b0b7e44bfc449578b42d44682b47087bfafa93 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 10:14:15 +0800 Subject: [PATCH] =?UTF-8?q?/resi/mine/personalcenter/initinfo=E8=BF=94?= =?UTF-8?q?=E5=9B=9EgridId,gridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/mine/dto/result/InitInfoResultDTO.java | 11 +++++++++++ .../service/impl/PersonalCenterServiceImpl.java | 13 +++++++++++++ .../epmet/service/impl/UserBaseInfoServiceImpl.java | 12 +++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java index 36b860a3e9..c55c4d41fb 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java +++ b/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; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java index 5c4788f7b7..29f2eecffe 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java +++ b/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; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 52930c1242..4cfde975f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -365,7 +365,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl selecUserBaseInfoByUserId(String userId) { - return new Result().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().ok(resultDTO); }