小区，场所，房屋修改

zhongrj

2023-12-22 ddef54b90b578d14e2cdad5d21a0fc2f612be46a

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -27,6 +27,8 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseEntity;
@@ -43,6 +45,7 @@
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +68,9 @@

   @Autowired
   private IHouseholdService householdService;

   @Autowired
   private IGridRangeService gridRangeService;

   @Override
   public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
@@ -97,17 +103,52 @@
    */
   @Override
   public boolean saveOrUpdateHouse(HouseEntity house) {
      // 查询是否已存在房屋数据
      QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("house_code",house.getHouseCode());
      HouseEntity one = getOne(wrapper);
      if (null != one){
         house.setId(one.getId());
         // 更新数据
         return updateById(house);
      boolean flag = false;
      // 如果没有房屋编号，自己生成
      if (!Strings.isBlank(house.getHouseCode())) {
         // 查询是否已存在房屋数据
         QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("house_code", house.getHouseCode());
         HouseEntity one = getOne(wrapper);
         if (null != one) {
            house.setId(one.getId());
            // 更新数据
            return updateById(house);
         }
      }else {
         //自己生成编号
         // 设置来源( 1：地址总表  2：国控采集)
         house.setSource(2);
         // 并生成36位的houseCode
         house.setHouseCode(IdUtils.getIdBy36());
      }
      //插入数据
      return save(house);
      flag = save(house);
      // 设置网格绑定数据
      gridBind(house);
      // 返回
      return flag;
   }

   /**
    * 网格绑定
    * @param house
    */
   public void gridBind(HouseEntity house) {
      if (null!=house.getGridId()){
         // 判断关联关系表是否存在
         QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("grid_id",house.getGridId()).eq("house_code",house.getHouseCode());
         GridRangeEntity one = gridRangeService.getOne(wrapper);
         if (null!=one){
            // 新增
            GridRangeEntity gridRangeEntity = new GridRangeEntity();
            gridRangeEntity.setHouseCode(house.getHouseCode());
            gridRangeEntity.setGridId(house.getGridId());
            // 插入
            gridRangeService.save(gridRangeEntity);
         }
      }
   }