小区迁移

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<Boolean> changeBuilding(@RequestParam Map<String, Object> params){
+        if(params.get("neighborhoodId") ==null || params.get("buildingId") ==null){
+            return new Result();
+        }
+        return new Result<Boolean>().ok(buildingService.changeBuilding(params));
+
+    }
+
+
 
 }

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<ImportTaskCommonResultDTO> importTask) throws IOException;
 
+
+    Boolean changeBuilding(Map<String, Object> params);
 }

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<String, Object> 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<IcHouseEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(IcHouseEntity::getBuildingId,building.getId());
+        List<IcHouseEntity> houseEntityList = icHouseDao.selectList(queryWrapper);
+        houseEntityList.forEach(house->{
+            house.setNeighborHoodId(building.getNeighborHoodId());
+            icHouseDao.updateById(house);
+        });
+
+        // 修改居民的小区id
+        epmetUserOpenFeignClient.changeResiNeighborHoodByBuilding(params);
+
+
+
+        return null;
+    }
+
     private List<IcBuildingExcel> searchAllBuilding(IcHouseListFormDTO formDTO) {
         IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class);
         building.setDelFlag("0");

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<String, Object> params);
 }

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<String, Object> params) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "changeResiNeighborHoodByBuilding", params);
+    }
 }

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<String, Object> params) {
+        return new Result<>().ok(icResiUserService.changeResiNeighborHoodByBuilding(params));
+    }
+
+
     /**
      * 根据房屋主键查询户内家庭成员简信息
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -611,5 +611,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
 
     void updateUserDistribute();
 
+    boolean changeResiNeighborHoodByBuilding(Map<String, Object> params);
     Result<String> getOrgIdByPhone(String phone);
 }

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

@@ -4392,16 +4392,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     @Override
-    public Result<String> getOrgIdByPhone(String phone) {
+    public boolean changeResiNeighborHoodByBuilding(Map<String, Object> params) {
-        LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+
-        wrapper.eq(IcResiUserEntity::getMobile, phone);
+
-        wrapper.eq(IcResiUserEntity::getDelFlag, NumConstant.ZERO_STR);
+        LambdaQueryWrapper<IcResiUserEntity> queryWrapper = new LambdaQueryWrapper<>();
-        List<IcResiUserEntity> list = baseDao.selectList(wrapper);
+        queryWrapper.eq(IcResiUserEntity::getBuildId,params.get("buildingId").toString());
-        String agencyId = null;
+
-        if (null != list && list.size() > 0){
+
-            agencyId=list.get(0).getAgencyId();
+        List<IcResiUserEntity> resiUserEntities = icResiUserDao.selectList(queryWrapper);
-        }
+        resiUserEntities.forEach(user->{
-            return new Result<String>().ok(agencyId);
+            user.setVillageId(params.get("neighborhoodId").toString());
+            icResiUserDao.updateById(user);
+        });
+
+        return true;
     }
 
 }