Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

 src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java

@@ -17,13 +17,22 @@
package org.springblade.modules.grid.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.excel.GridExcel;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.grid.mapper.GridMapper;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.system.entity.User;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * 网格表 服务实现类
@@ -39,5 +48,44 @@
      return page.setRecords(baseMapper.selectGridPage(page, grid));
   }

   /**
    * 网格数导入
    * @param data
    * @param isCovered
    */
   @Override
   public void importGrid(List<GridExcel> data, Boolean isCovered) {
      List<GridEntity> list = new ArrayList<>();
      // 遍历
      for (GridExcel gridExcel : data) {
         GridEntity gridEntity = Objects.requireNonNull(BeanUtil.copy(gridExcel, GridEntity.class));
         gridEntity.setCreateUser(AuthUtil.getUserId());
         gridEntity.setCreateTime(new Date());
         gridEntity.setUpdateUser(AuthUtil.getUserId());
         gridEntity.setUpdateTime(new Date());
         list.add(gridEntity);
      }
      // 批量导入
      saveBatch(list);
   }

   /**
    * 根据地址编号查询网格数据
    * @param houseCode
    * @return
    */
   @Override
   public GridVO getGridDetailByHouseCode(String houseCode) {
      return baseMapper.getGridDetailByHouseCode(houseCode);
   }

   /**
    * 根据用户id(网格员)查询对应的房屋地址code
    * @param userId
    * @return
    */
   @Override
   public List<String> getAddressCodeListByUserId(Long userId) {
      return baseMapper.getAddressCodeListByUserId(userId);
   }
}