From 478414a3fd5309cc89353d7157e81d811d064425 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 23 Aug 2024 14:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 11 ++++++ .../com/epmet/service/BuildingService.java | 3 ++ .../service/impl/BuildingServiceImpl.java | 34 +++++++++++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 ++ .../EpmetUserOpenFeignClientFallback.java | 5 +++ .../controller/IcResiUserController.java | 6 ++++ .../com/epmet/service/IcResiUserService.java | 1 + .../service/impl/IcResiUserServiceImpl.java | 24 +++++++------ 8 files changed, 77 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 971015a298..a93e9eeec4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -52,6 +52,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -283,5 +284,15 @@ public class BuildingController { } + @GetMapping("changeBuilding") + public Result changeBuilding(@RequestParam Map params){ + if(params.get("neighborhoodId") ==null || params.get("buildingId") ==null){ + return new Result(); + } + return new Result().ok(buildingService.changeBuilding(params)); + + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 27e1c4c1ee..8d31c492e3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.List; +import java.util.Map; /** * 楼栋 @@ -96,4 +97,6 @@ public interface BuildingService { */ Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result importTask) throws IOException; + + Boolean changeBuilding(Map params); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index c8a7d1fd13..4bf3fdf199 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -36,6 +36,7 @@ import com.epmet.enums.BuildingTypeEnums; import com.epmet.enums.OrganizationTypeEnums; import com.epmet.excel.IcBuildingExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.model.BuildingInfoModel; import com.epmet.model.ImportBuildingInfoListener; import com.epmet.redis.IcHouseRedis; @@ -43,6 +44,7 @@ import com.epmet.service.*; import com.epmet.util.ExcelPoiUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.sun.org.apache.bcel.internal.generic.RETURN; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -94,6 +96,8 @@ public class BuildingServiceImpl implements BuildingService { private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl; @Autowired private CommunityBuildingManagerDao communityBuildingManagerDao; + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override @@ -655,6 +659,36 @@ public class BuildingServiceImpl implements BuildingService { return new Result<>(); } +// @Transactional + @Override + public Boolean changeBuilding(Map params) { + + + // 找到本身的building 先改掉小区id + IcBuildingEntity building = icBuildingDao.selectById(params.get("buildingId").toString()); + if (building == null){ + return true; + } + building.setNeighborHoodId(params.get("neighborhoodId").toString()); + icBuildingDao.updateById(building); + + // 找到该building的house 改掉小区id + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcHouseEntity::getBuildingId,building.getId()); + List houseEntityList = icHouseDao.selectList(queryWrapper); + houseEntityList.forEach(house->{ + house.setNeighborHoodId(building.getNeighborHoodId()); + icHouseDao.updateById(house); + }); + + // 修改居民的小区id + epmetUserOpenFeignClient.changeResiNeighborHoodByBuilding(params); + + + + return null; + } + private List searchAllBuilding(IcHouseListFormDTO formDTO) { IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); building.setDelFlag("0"); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 0feb10a84f..695b2a83e8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1065,4 +1065,7 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icresiuser/userchartRedis") Result userChartRedis(); + + @PostMapping("/epmetuser/icresiuser/changeResiNeighborHoodByBuilding") + Result changeResiNeighborHoodByBuilding(@RequestBody Map params); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index ef423fff70..d4de1a7ddc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -794,4 +794,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result userChartRedis() { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userChartRedis", ""); } + + @Override + public Result changeResiNeighborHoodByBuilding(Map params) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "changeResiNeighborHoodByBuilding", params); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 3795045b15..afe37c8cb2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1216,6 +1216,12 @@ public class IcResiUserController implements ResultDataResolver { } + @PostMapping("changeResiNeighborHoodByBuilding") + public Result changeResiNeighborHoodByBuilding(@RequestBody Map params) { + return new Result<>().ok(icResiUserService.changeResiNeighborHoodByBuilding(params)); + } + + /** * 根据房屋主键查询户内家庭成员简信息 * diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index b18c207f25..5216e72f15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -611,5 +611,6 @@ public interface IcResiUserService extends BaseService { void updateUserDistribute(); + boolean changeResiNeighborHoodByBuilding(Map params); Result getOrgIdByPhone(String phone); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 1716dbd851..f178e56a39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -4392,16 +4392,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getOrgIdByPhone(String phone) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getMobile, phone); - wrapper.eq(IcResiUserEntity::getDelFlag, NumConstant.ZERO_STR); - List list = baseDao.selectList(wrapper); - String agencyId = null; - if (null != list && list.size() > 0){ - agencyId=list.get(0).getAgencyId(); - } - return new Result().ok(agencyId); + public boolean changeResiNeighborHoodByBuilding(Map params) { + + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getBuildId,params.get("buildingId").toString()); + + + List resiUserEntities = icResiUserDao.selectList(queryWrapper); + resiUserEntities.forEach(user->{ + user.setVillageId(params.get("neighborhoodId").toString()); + icResiUserDao.updateById(user); + }); + + return true; } } \ No newline at end of file