diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index b15a8eff5c..f0faf8ac7b 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -1158,10 +1158,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol lantuRegisterResiFormDTO.setAvatarUrl(formDTO.getAvatarUrl()); // 通过给的areaCode 去获取一下当前社区统建网格id - String gridId = govOrgOpenFeignClient.getGridIdByCommunityCode(formDTO.getAreaCode()).getData(); + LanhuAgencyResultDTO lanhuAgencyResultDTO = govOrgOpenFeignClient.getGridIdByCommunityCode(formDTO.getAreaCode()).getData(); - lantuRegisterResiFormDTO.setGridId(gridId); + lantuRegisterResiFormDTO.setGridId(lanhuAgencyResultDTO.getGridId()); + lantuRegisterResiFormDTO.setStreetName(lanhuAgencyResultDTO.getStreetName()); // 注册 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LanhuAgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LanhuAgencyResultDTO.java new file mode 100644 index 0000000000..dadc607e7c --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LanhuAgencyResultDTO.java @@ -0,0 +1,40 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 组织信息 + * + * @author sun + */ +@Data +public class LanhuAgencyResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + + private String agencyName; + + private String streetName; + + private String gridId; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 767c029350..c0e9e57ecc 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -793,5 +793,5 @@ public interface GovOrgOpenFeignClient { * @Date: 2024/4/11 13:57 */ @PostMapping("/gov/org/agency/getGridIdByCommunityCode/{areaCode}") - Result getGridIdByCommunityCode(@PathVariable(value = "areaCode")String areaCode); + Result getGridIdByCommunityCode(@PathVariable(value = "areaCode")String areaCode); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 77f32a966f..38c046a271 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -495,7 +495,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { } @Override - public Result getGridIdByCommunityCode(String areaCode) { + public Result getGridIdByCommunityCode(String areaCode) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIdByCommunityCode", areaCode); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index e9eb1549a8..12ea2af80c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -647,11 +647,11 @@ public class AgencyController { * @Date: 2024/4/11 13:57 */ @PostMapping("getGridIdByCommunityCode/{areaCode}") - public Result getGridIdByCommunityCode(@PathVariable(value = "areaCode") String areaCode) { + public Result getGridIdByCommunityCode(@PathVariable(value = "areaCode") String areaCode) { if (StringUtils.isBlank(areaCode)) { return new Result<>(); } - return new Result().ok(agencyService.getGridIdByCommunityCode(areaCode)); + return new Result().ok(agencyService.getGridIdByCommunityCode(areaCode)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java index ecbe27c8eb..45ab2c40ee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java @@ -212,5 +212,5 @@ public interface AgencyService { */ List getAllCommunity(String customerId); - String getGridIdByCommunityCode(String areaCode); + LanhuAgencyResultDTO getGridIdByCommunityCode(String areaCode); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 9a62040692..44118b9880 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -1190,7 +1190,9 @@ public class AgencyServiceImpl implements AgencyService { } @Override - public String getGridIdByCommunityCode(String areaCode) { + public LanhuAgencyResultDTO getGridIdByCommunityCode(String areaCode) { + + LanhuAgencyResultDTO lanhuAgencyResultDTO = new LanhuAgencyResultDTO(); LambdaQueryWrapper agencyqw = new LambdaQueryWrapper<>(); agencyqw.eq(CustomerAgencyEntity::getAreaCode,areaCode).eq(CustomerAgencyEntity::getLevel,"community").orderByDesc(CustomerAgencyEntity::getCreatedTime).last("limit 1"); @@ -1199,6 +1201,9 @@ public class AgencyServiceImpl implements AgencyService { String errorMsg = "当前areaCode查询社区失败："+areaCode; throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg); } + CustomerAgencyEntity street = customerAgencyDao.selectById(community.getPid()); + lanhuAgencyResultDTO.setStreetName(street.getOrganizationName()); + LambdaQueryWrapper gridqw = new LambdaQueryWrapper<>(); gridqw.eq(CustomerGridEntity::getPid,community.getId()).eq(CustomerGridEntity::getGridName,"统建网格").orderByDesc(CustomerGridEntity::getCreatedTime).last("limit 1"); CustomerGridEntity gridEntity = customerGridDao.selectOne(gridqw); @@ -1206,7 +1211,8 @@ public class AgencyServiceImpl implements AgencyService { String errorMsg = "当前areaCode查询到的社区没有统建网格："+areaCode; throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg); } + lanhuAgencyResultDTO.setGridId(gridEntity.getId()); - return gridEntity.getId(); + return lanhuAgencyResultDTO; } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LantuRegisterResiFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LantuRegisterResiFormDTO.java index da8c23562a..5e23c0eb64 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LantuRegisterResiFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LantuRegisterResiFormDTO.java @@ -41,6 +41,7 @@ public class LantuRegisterResiFormDTO { private String sex; + private String streetName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 925e62f61a..77f1b32b10 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; @@ -90,6 +91,15 @@ public interface UserResiInfoDao extends BaseDao { **/ UserResiInfoDTO selectByUserId(String userId); + /** + * @Description: 根据要用户id, 查询用户注册的信息 从resiinfo变成baseinfo + * @param userId: + * @Return com.epmet.dto.UserBaseInfoDTO + * @Author: lichao + * @Date: 2024/4/12 14:44 + */ + UserBaseInfoDTO selectByUserBaseInfoId(@Param("userId") String userId); + /** * 根据用户ID更新 * @author zhaoqifeng 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 0a82cefbec..b7a1b00e0a 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 @@ -772,6 +772,30 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl userCustomerEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); userCustomerEntityLambdaQueryWrapper.eq(UserCustomerEntity::getCustomerId,baseInfo.getCustomerId()); @@ -803,6 +827,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl + + +