Merge branch 'energy-manage-shiyue'

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcontract/impl/PowerWordContractServiceImpl.java

@@ -18,6 +18,7 @@ import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractP
 import com.energy.manage.service.domain.dto.windfield.WindFieldUpdateDto;
 import com.energy.manage.service.domain.vo.excel.PowerWordContractExcelVo;
 import com.energy.manage.service.domain.vo.excel.PowerWordCriterionExcelVo;
+import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
 import com.energy.manage.service.domain.vo.powerwordcontract.PowerWordContractPageVo;
 import com.energy.manage.service.mappers.powerwordcontract.PowerWordContractMapper;
 import com.energy.manage.service.service.powerwordcontract.PowerWordContractService;
@@ -40,6 +41,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -65,11 +67,15 @@ public class PowerWordContractServiceImpl extends BaseServiceImpl<PowerWordContr
         if (StringUtils.isEmpty(powerWordContractExcelDto.getFieldCode())) {
             return ResultResp.FAIL("未填写机型！");
         }
-        List<PowerWordContractExcelVo> powerWordContractExcelVos = EasyExcel.read(file.getInputStream()).head(PowerWordContractExcelVo.class).sheet().doReadSync();
-        if (CollectionUtils.isEmpty(powerWordContractExcelVos)) {
+        List<PowerWordContractExcelVo> vos = EasyExcel.read(file.getInputStream()).head(PowerWordContractExcelVo.class).sheet().doReadSync();
+        if (CollectionUtils.isEmpty(vos)) {
             return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
         }
 
+        // 过滤空数据
+        List<PowerWordContractExcelVo> powerWordContractExcelVos = vos.stream().filter(item -> item.getActivePower()!=null && item.getWindSpeed()!=null).collect(Collectors.toList());
+
+
         // 更新风场功率曲线地址
         String path = minioUtils.upload(file);
         log.info(" 合同功率曲线minio上传地址 ====> " + path);