导入和更新

air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java

@@ -1,6 +1,8 @@
 package com.air.land.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.StrUtil;
 import com.air.applets.dto.LandDto;
 import com.air.applets.vo.LandVo;
@@ -12,6 +14,9 @@ import com.air.land.service.*;
 import com.air.land.vo.LandListedAppletsVo;
 import com.air.utils.DateUtil;
 import com.air.utils.ExcelUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.enums.SqlMethod;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -35,6 +40,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 已挂牌地块，整体数据的核心，数据来源三部分：爬虫数据、用户维护数据、系统计算数据。
@@ -111,13 +117,17 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
         try {
             dataList = ExcelUtil.importExcel(file.getInputStream(), 0, 1, 0, LandListed.class, "config/landListed-config.json");
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("导入已挂牌地块数据出错", e);
             throw new BusinessException(e.getMessage());
         }
+        dataList=dataList.stream().filter(x->{
+            return StringUtils.isNotEmpty( x.getAnnoId());
+        }).collect(Collectors.toList());
         if (CollectionUtil.isNotEmpty(dataList)) {
             try {
                 dataList.forEach(landListed -> {
-                    landListed.setLandListedId(DateUtil.landListedIdfromDate(LocalDateTime.now(), "yyyyMMdd", this.selectId()));
+                    if(landListed.getLandListedId()==null) landListed.setLandListedId(DateUtil.landListedIdfromDate(LocalDateTime.now(), "yyyyMMdd", this.selectId()));
                     //土地出让面积，计算土地出让面积（亩）（出让面积/2000*3）
                     BigDecimal landTransferSquare = landListed.getLandTransferSquare();
                     if (landTransferSquare != null) {
@@ -161,12 +171,15 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
                                 ? new BigDecimal(0) : (dealPrice.subtract(transferPrice)).divide(transferPrice, 4, BigDecimal.ROUND_HALF_UP)
                                 .multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP));
                     }
+
                 });
             } catch (Exception e) {
                 log.error("数据计算出错:",e);
             }
         }
-        return this.saveBatch(dataList);
+
+
+        return this.saveOrUpdateBatch(dataList);
     }
 
     @Override
@@ -356,6 +369,7 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
     private List<String> entityToList(LandListed data) {
         List<String> list = new ArrayList<>();
         //公告信息
+        list.add(data.getLandListedId());
         list.add(data.getAnnoId());
         list.add(data.getLandCode());
         list.add(data.getLandPosition());