租客导入优化

linwe

2024-06-17 3e8159ed09163dbd8051be53fced8568f8b53122

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

@@ -23,6 +23,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
@@ -74,6 +76,8 @@
 */
@Service
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {

   private static Logger logger = LoggerFactory.getLogger(HouseholdServiceImpl.class);

   @Autowired
   private IUserHouseLabelService userHouseLabelService;
@@ -350,16 +354,18 @@
      ExecutorService executorService = Executors.newFixedThreadPool(numberOfThreads);

      // 创建Future列表来保存每个任务的结果
      List<Future<String>> futures = new ArrayList<>();
      List<Future<Map<String, String>>> futures = new ArrayList<>();

      for (ImportHouseholdExcel houseHoldExcel : data) {
         Callable<String> task = () -> importHouseHold(houseHoldExcel,houseService,isCovered,isTenant);
         Callable<Map<String, String>> task = () -> importHouseHold(houseHoldExcel, houseService, isCovered, isTenant);
         futures.add(executorService.submit(task));
      }
      // 收集并打印结果
      for (Future<String> future : futures) {
      for (Future<Map<String, String>> future : futures) {
         try {
            String result = future.get();
            Map<String, String> stringStringMap = future.get();
            logger.info("结果：{}", stringStringMap);
            String result = stringStringMap.get("restult");
            switch (result){
               case "1":
                  importNum++;
@@ -370,10 +376,18 @@
               case "3":
                  errorNum++;
                  break;
               case "4":
                  importNum++;
                  updateNum++;
                  break;
               default:
                  errorNum++;
                  break;
            }
            // 获取并打印每个任务的结果
         } catch (InterruptedException | ExecutionException e) {
            e.printStackTrace();
            errorNum++;
            logger.error("获取异常-----》", e);
         }
      }
      // 关闭线程池
@@ -398,21 +412,29 @@
   }


   public String importHouseHold(ImportHouseholdExcel houseHoldExcel, IHouseService houseService, Boolean isCovered,String isTenant) {
   public Map<String, String> importHouseHold(ImportHouseholdExcel houseHoldExcel, IHouseService houseService, Boolean isCovered, String isTenant) {
      Map<String, String> objectObjectHashMap = new HashMap<>();
      try {
      HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
      // 判断姓名，手机号
      if (Strings.isBlank(householdEntity.getName())
         || Strings.isBlank(householdEntity.getHouseCode())
      ) {
         // errorNum++;
         // continue;
         return "3";
         if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getHouseCode())) {
            objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
            objectObjectHashMap.put("restult", "3");
            return objectObjectHashMap;
         }
         // 去除手机号中间空格
         if (StringUtils.isNotBlank(householdEntity.getPhoneNumber())) {
            householdEntity.setPhoneNumber(householdEntity.getPhoneNumber().replaceAll(" ", ""));
      }
      // 查询库中是否已存在
      QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("house_code", householdEntity.getHouseCode())
         .eq("is_deleted", 0)
         .eq("name", householdEntity.getName());
         // 判断是否租客
         if (StringUtils.isNotBlank(isTenant)) {
            wrapper.eq("relationship", 18);
         }
      List<HouseholdEntity> list = this.list(wrapper);
      // 与角色关系
      if (!Strings.isBlank(houseHoldExcel.getRelationship())) {
@@ -426,7 +448,7 @@
      if (StringUtils.isNotBlank(isTenant)) {
         householdEntity.setRelationship(18);
         HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
            .eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()));
               .eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()).last("limit 1"));
         if (houseRentalEntity != null) {
            householdEntity.setHousingRentalId(houseRentalEntity.getId());
         } else {
@@ -504,7 +526,10 @@
         // importNum++;
         // 处理标签
         handleLabel(householdEntity, houseHoldExcel);
         return "1";
            // return "1";
            objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
            objectObjectHashMap.put("restult", "1");
            return objectObjectHashMap;
      } else {
         // updateNum++;
         if (isCovered) {
@@ -517,10 +542,23 @@
               handleLabel(householdEntity, houseHoldExcel);
            }
            // importNum++;
            return "2";
               // return "4";
               objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
               objectObjectHashMap.put("restult", "4");
               return objectObjectHashMap;
         }
            // return "2";
            objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
            objectObjectHashMap.put("restult", "2");
            return objectObjectHashMap;
      }
      return "3";
      } catch (Exception e) {
         logger.error("异常导入------------》", e);
         // return "3";
         // objectObjectHashMap.put("row", householdEntity.getName() + ":" + householdEntity.getPhoneNumber());
         objectObjectHashMap.put("restult", "3");
         return objectObjectHashMap;
      }
   }

   /**