edit 空值预处理

yundong-third-domain/src/main/java/com/yundong/third/server/IssuesListDetailServer.java

@@ -9,12 +9,14 @@ import java.io.File;
  */
 public interface IssuesListDetailServer {
     /**
-     * * excel导入
+     * excel导入
      *
-     * @param excel     excel文件
-     * @param projectId 项目id
-     * @param userId    当前登录人id
+     * @param excel       excel文件
+     * @param projectId   项目id
+     * @param userId      当前登录人id
+     * @param projectName 项目名称
+     * @param tenantId    租户id
      * @return
      */
-    Result<String> importExcel(File excel, String projectId, String userId);
+    Result<String> importExcel(File excel, String projectId, String userId, String projectName, String tenantId);
 }

yundong-third-domain/src/main/java/com/yundong/third/server/impl/IssuesListDetailServerImpl.java

@@ -12,7 +12,6 @@ import com.yundong.third.entity.IssuesListDetailExcel;
 import com.yundong.third.mapper.IssuesListDeatilMapper;
 import com.yundong.third.server.IssuesListDetailServer;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,14 +30,16 @@ public class IssuesListDetailServerImpl implements IssuesListDetailServer {
     /**
      * excel导入
      *
-     * @param excel     excel文件
-     * @param projectId 项目id
-     * @param userId    当前登录人id
+     * @param excel       excel文件
+     * @param projectId   项目id
+     * @param userId      当前登录人id
+     * @param projectName 项目名称
+     * @param tenantId    租户id
      * @return
      */
     @YdcGateway(name = "monitorCounter-issuesList", url = "third/monitor/issuesListDetail/importExcel.json")
     @Override
-    public Result<String> importExcel(File excel, String projectId, String userId) {
+    public Result<String> importExcel(File excel, String projectId, String userId, String projectName, String tenantId) {
         if (excel == null) {
             return Result.fail("文件不能为空");
         }
@@ -50,19 +51,25 @@ public class IssuesListDetailServerImpl implements IssuesListDetailServer {
             ExcelListener excelListener = new ExcelListener();
             EasyExcelFactory.read(excel, IssuesListDetailExcel.class, excelListener).excelType(ExcelTypeEnum.XLSX).sheet().doRead();
             List<IssuesListDetail> successData = excelListener.getSuccessData();
+            if (successData.size() == 0) {
+                return Result.success("导入成功,条数：0条");
+            }
 
             //查询
             List<IssuesListDetail> issuesListDetails = issuesListDeatilMapper.selectList(
                     new LambdaQueryWrapper<IssuesListDetail>()
                             .eq(IssuesListDetail::getIsDeleted, 0)
                             .eq(IssuesListDetail::getPROJECTID, projectId));
-            String projectName = issuesListDetails.get(NumberUtils.INTEGER_ZERO).getPROJECTNAME();
-            String tenantId = issuesListDetails.get(NumberUtils.INTEGER_ZERO).getTenantId();
             //过滤
-            List<IssuesListDetail> importDataList = successData.stream()
-                    .filter(item1 -> issuesListDetails.stream().noneMatch(item2 -> item2.getDISCOVERYTIME().equals(item1.getDISCOVERYTIME())
-                            && item2.getDESCRIBETEXT().equals(item1.getDESCRIBETEXT())))
-                    .collect(Collectors.toList());
+            List<IssuesListDetail> importDataList;
+            if (issuesListDetails.size() != 0) {
+                importDataList = successData.stream()
+                        .filter(item1 -> issuesListDetails.stream().noneMatch(item2 -> item2.getDISCOVERYTIME().equals(item1.getDISCOVERYTIME())
+                                && item2.getDESCRIBETEXT().equals(item1.getDESCRIBETEXT())))
+                        .collect(Collectors.toList());
+            } else {
+                importDataList = successData;
+            }
 
             //赋值导入
             Date date = new Date(System.currentTimeMillis());