1.当用户选择否时，直接删除备份文件，不再走文件处理流程

2.遍历list时，可以把需要处理的逻辑放到一起，不需多次遍历
3.判断list>0时，删除旧数据添加新数据的代码逻辑放一起，不要分开，保证代码逻辑清晰
4.批量插入一次5000条，性能优化，一次插入数量可通过测试调整

src/main/java/com/jeeplus/modules/supply/judgementBills/service/SupplyJudgementBillsService.java

@@ -87,14 +87,14 @@ public class SupplyJudgementBillsService extends CrudService<SupplyJudgementBill
     public String disposeStockOutList(List<SupplyJudgementBills> judgementBillsList){
         //分批处理
         if(null!=judgementBillsList && judgementBillsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = judgementBillsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){
                 int part = size/pointsDataLimit;//分批数
                 //
                 for (int i = 0; i < part; i++) {
-                    //1000条
+                    //5000条
                     List<SupplyJudgementBills> listPage = judgementBillsList.subList(0, pointsDataLimit);
                     mapper.insertList(listPage);
                     //剔除

src/main/java/com/jeeplus/modules/supply/materialLibrary/service/MaterialLibraryService.java

@@ -53,13 +53,20 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
         Integer materialCount= materialLibraryMapper.getMaterialCodeByMaterialCount();
         if(materialCount>0){
             File multipartFile = transformMultipartFile(file);
-            String multipartFileStr = multipartFile.getCanonicalPath().replaceAll("\\\\","/");
-            returnMap.keySet().removeIf(key -> key == "repeat");
-            returnMap.put("repeat","3");
-            returnMap.put("success",true);
-            returnMap.put("file",multipartFile.getCanonicalPath());
-            returnMap.keySet().removeIf(key -> key == "msg");
-            returnMap.put("msg","已存在物料数据，是否覆盖？");
+            try {
+                //将文件存到服务器
+                String filePath = saveFile(multipartFile);
+                returnMap.keySet().removeIf(key -> key == "repeat");
+                returnMap.put("repeat", "3");
+                returnMap.put("success", true);
+                returnMap.put("filePath", filePath);
+                returnMap.keySet().removeIf(key -> key == "msg");
+                returnMap.put("msg", "已存在物料数据，是否覆盖？");
+            }catch (Exception e){
+                e.getMessage();
+            }finally {
+                multipartFile.delete();
+            }
         }else{
             returnMap.put("success",false);
         }
@@ -85,74 +92,27 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
                 returnMap.put("success",false);
                 returnMap.put("msg","第" + index + "行，存在物料编码为空的数据，请确认后重新提交！");
                 return returnMap;
-//                its.remove();  //删除为空信息
             }
         }
 
-        /*Set<String> materialCodeSet = new HashSet<>();
-        for (MaterialLibrary importInfo : list){
-            //将物料编码放入set中
-            materialCodeSet.add(importInfo.getMaterialCode());
-        }
-        //将去重后的set转换为list  方便比较
-        List<String> materialCodeList = new ArrayList<>(materialCodeSet);
-
-        //判断物流编码list长度和导入数据的list长度是否一样，不一样则说明导入数据中项目名存在重复数据
-        if(materialCodeList.size() != list.size()){
-            returnMap.keySet().removeIf(key -> key == "msg");
-            returnMap.put("success",false);
-            returnMap.put("msg","存在物流编码重复的数据，请确认后重新提交！");
-        }*/
-
-        //方便快捷删除  找到对应重复数据，以便最后批量操作使用
-        /*List<String> codeList = materialLibraryMapper.getMaterialCodeByMaterialCodeList(materialCodeList);  //即为重复数据的编码集合
-        Iterator<MaterialLibrary> it = list.iterator();
-        if(codeList.size()!=0 && repeat.equals("0") && codeList != null) {  //有重复值并且为第一次交互  就保存文件
-            File copyFile = transformMultipartFile(file);
-            //将文件存到服务器
-            String filePath = saveFile(copyFile);
-            returnMap.put("filePath",filePath);
-            returnMap.keySet().removeIf(key -> key == "repeat");
-            returnMap.put("repeat","3");
-            returnMap.put("success",true);
-            returnMap.keySet().removeIf(key -> key == "msg");
-            returnMap.put("msg","已存在物料数据，是否覆盖？");
-            return returnMap;
-        }*/
-
         if(repeat.equals("1")){  //覆盖 则删除数据库中的重复数据
             //删除数据库中数据
             if(list.size()>0){
+                //提前保存读取的list的长度
+                int size = list.size();
                 materialLibraryMapper.deleteAll();
+                modifyHandmadeVindicateList(list);
+
+                returnMap.keySet().removeIf(key -> key == "msg");
+                returnMap.put("success",true);
+                returnMap.put("msg","已成功导入 "+size+" 条物料库记录");
             }else{
                 returnMap.keySet().removeIf(key -> key == "msg");
                 returnMap.put("success",false);
                 returnMap.put("msg","导入表数据量为0条，不进行替换");
-                return returnMap;
             }
-            /*//批量删除重复数据  覆盖操作  物理删除
-            modifyHandmadeVindicateListTwo(codeList);*/
-        }
-
-        /*if(repeat.equals("2")) {  //不覆盖 则删除list中的重复数据
-            while (it.hasNext()) {
-                MaterialLibrary materialLibrary = it.next();
-                if (codeList.contains(materialLibrary.getMaterialCode())) {
-                    it.remove();
-                }
-            }
-        }*/
-
-        //提前保存读取的list的长度
-        int size = list.size();
 
-        //批量新增  分批次新增
-        if(list.size()!=0) {
-            modifyHandmadeVindicateList(list);
         }
-        returnMap.keySet().removeIf(key -> key == "msg");
-        returnMap.put("success",true);
-        returnMap.put("msg","已成功导入 "+size+" 条物料库记录");
         return returnMap;
     }
 
@@ -167,7 +127,7 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
     public String modifyHandmadeVindicateList(List<MaterialLibrary> projectBasicsList){
         //分批处理
         if(null!=projectBasicsList && projectBasicsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = projectBasicsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){
@@ -211,7 +171,7 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
     public String modifyHandmadeVindicateListTwo(List<String> projectBasicsList){
         //分批处理
         if(null!=projectBasicsList && projectBasicsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = projectBasicsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){

src/main/java/com/jeeplus/modules/supply/materialLibrary/web/MaterialLibraryController.java

@@ -144,19 +144,23 @@ public class MaterialLibraryController extends BaseController {
         AjaxJson j = new AjaxJson();
         try {
             File file = new File(filePath);
-            MultipartFile file1 = materialLibraryService.transformFile(file);
-            ImportExcel ei = new ImportExcel(file, 1, 0);
-            List<MaterialLibrary> list = ei.getDataList(MaterialLibrary.class);
-            LinkedHashMap returnMap = materialLibraryService.disposeImportMaterialLibrary(list,file1,repeat);
-            //如果文件已经使用完毕，则删除
-            materialLibraryService.deleteFileContent(file);
-            Boolean boole = (Boolean) returnMap.get("success");
-            if(!boole){
-                j.setSuccess(false);
+            if("2".equals(repeat)){
+                file.delete();
+            }else {
+                MultipartFile file1 = materialLibraryService.transformFile(file);
+                ImportExcel ei = new ImportExcel(file, 1, 0);
+                List<MaterialLibrary> list = ei.getDataList(MaterialLibrary.class);
+                LinkedHashMap returnMap = materialLibraryService.disposeImportMaterialLibrary(list, file1, repeat);
+                //如果文件已经使用完毕，则删除
+                materialLibraryService.deleteFileContent(file);
+                Boolean boole = (Boolean) returnMap.get("success");
+                if(!boole){
+                    j.setSuccess(false);
+                }
+                //放要放的值
+                j.setBody(returnMap);
+                j.setMsg(returnMap.get("msg").toString());
             }
-            //放要放的值
-            j.setBody(returnMap);
-            j.setMsg(returnMap.get("msg").toString());
         } catch (Exception e) {
             j.setSuccess(false);
             j.setMsg("导入物料库失败！失败信息：" + e.getMessage());

src/main/java/com/jeeplus/modules/supply/materialsProvidedByAForReview/service/MaterialsProvidedByAForReviewService.java

@@ -122,14 +122,14 @@ public class MaterialsProvidedByAForReviewService extends CrudService<MaterialsP
     public String disposeMaterialsProvidedByAForReviewList(List<MaterialsProvidedByAForReview> projectBasicsList){
         //分批处理
         if(null!=projectBasicsList && projectBasicsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = projectBasicsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){
                 int part = size/pointsDataLimit;//分批数
                 //
                 for (int i = 0; i < part; i++) {
-                    //1000条
+                    //5000条
                     List<MaterialsProvidedByAForReview> listPage = projectBasicsList.subList(0, pointsDataLimit);
                     materialsProvidedByAForReviewMapper.insertList(listPage);
                     //剔除

src/main/java/com/jeeplus/modules/supply/projectInformation/service/ProjectInformationService.java

@@ -57,13 +57,20 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
         Integer projectCount= projectInformationMapper.getProjectCount();
         if(projectCount>0){
             File multipartFile = transformMultipartFile(file);
-            String multipartFileStr = multipartFile.getCanonicalPath().replaceAll("\\\\","/");
-            returnMap.keySet().removeIf(key -> key == "repeat");
-            returnMap.put("repeat","3");
-            returnMap.put("success",true);
-            returnMap.put("filePath",multipartFileStr);
-            returnMap.keySet().removeIf(key -> key == "msg");
-            returnMap.put("msg","已存在项目数据，是否覆盖？");
+            try{
+                //将文件存到服务器
+                String filePath = saveFile(multipartFile);
+                returnMap.keySet().removeIf(key -> key == "repeat");
+                returnMap.put("repeat","3");
+                returnMap.put("success",true);
+                returnMap.put("filePath",filePath);
+                returnMap.keySet().removeIf(key -> key == "msg");
+                returnMap.put("msg","已存在项目数据，是否覆盖？");
+            }catch (Exception e){
+                e.getMessage();
+            }finally {
+                multipartFile.delete();
+            }
         }else{
             returnMap.put("success",false);
         }
@@ -80,6 +87,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
         LinkedHashMap returnMap = new LinkedHashMap();
         Integer index = 2;
         Iterator<ProjectInformation> its = list.iterator();
+        Set<String> submissionFormIdSet = new HashSet<>();
         while(its.hasNext()){
             index ++ ;
             ProjectInformation info = its.next();
@@ -87,19 +95,15 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
                 returnMap.put("success",false);
                 returnMap.put("msg","第" + index + "行，存在审定单id为空的数据，请确认后重新提交！");
                 return returnMap;
-//                its.remove();       //根据主键 送审单id做判断，防止空值
             }else if(StringUtils.isBlank(info.getProjectDefinitionNumber())){
                 returnMap.put("success",false);
                 returnMap.put("msg","第" + index + "行，存在项目定义号为空的数据，请确认后重新提交！");
                 return returnMap;
             }
-        }
-
-        Set<String> submissionFormIdSet = new HashSet<>();
-        for (ProjectInformation importInfo : list){
             //将审定单id放入set中
-            submissionFormIdSet.add(importInfo.getSubmissionFormId());
+            submissionFormIdSet.add(info.getSubmissionFormId());
         }
+
         //将去重后的set转换为list  方便比较
         List<String> submissionFormIdList = new ArrayList<>(submissionFormIdSet);
 
@@ -113,84 +117,29 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
 
         //将项目信息的内容去重  遍历
         List<ProjectInformation> projectInformationList = groupDistinctProjectInformation(list);
-        /*Set<String> projectDefinitionNumberSet = new HashSet<>();//去重后的项目定义号
-        for(int i=0;i<list.size();i++){ //遍历取出项目定义号
-            projectDefinitionNumberSet.add(list.get(i).getProjectDefinitionNumber());
-        }
-        Iterator<String> projectDefinitionNumberIt = projectDefinitionNumberSet.iterator();//将项目定义号加入迭代器
-        while(projectDefinitionNumberIt.hasNext()){//遍历迭代器，遍历list数据，当存在两个项目定义号相等时，存入新的list结合，为项目信息表的导入做准备
-            String projectDefinitionNumber = projectDefinitionNumberIt.next();
-            for(ProjectInformation info:list){
-                if(info.getProjectDefinitionNumber().equals(projectDefinitionNumber)){
-                    projectInformationList.add(info);
-                    break;
-                }
-            }
-        }*/
-
-
-        /*//方便快捷删除  找到对应重复数据，以便最后批量操作使用  审定单id
-        List<String> codeList = projectInformationMapper.getSubmissionFormIdListBysubmissionFormIdList(submissionFormIdList);  //即为重复数据的审定单id集合
-        Iterator<ProjectInformation> it = list.iterator();
-        if(codeList.size()!=0 && repeat.equals("0") && codeList != null) {  //有重复值并且为第一次交互  就保存文件
-            File copyFile = transformMultipartFile(file);
-            //将文件存到服务器
-            String filePath = saveFile(copyFile);
-            returnMap.put("filePath",filePath);
-            returnMap.keySet().removeIf(key -> key == "repeat");
-            returnMap.put("repeat","3");
-            returnMap.keySet().removeIf(key -> key == "msg");
-            returnMap.put("success",true);
-            returnMap.put("msg","已存在项目数据，是否覆盖？");
-            return returnMap;
-        }*/
-
-        /*if(repeat.equals("2")) {  //不覆盖 则删除list中的重复数据
-            while (it.hasNext()) {
-                ProjectInformation projectInformation = it.next();
-                if (codeList.contains(projectInformation.getSubmissionFormId())) {
-                    it.remove();
-                }
-            }
-            Iterator<ProjectInformation> projectIt = projectInformationList.iterator();
-            while(projectIt.hasNext()){
-                ProjectInformation projectInformation = projectIt.next();
-                if(codeList.contains(projectInformation.getSubmissionFormId())){
-                    projectIt.remove();
-                }
-            }
-        }else */
 
         if(repeat.equals("1")){  //覆盖 则删除数据库中的重复数据
-
             if(list.size()>0){
+                //提前保存读取的list的长度
+                int size = list.size();
                 //删除项目数据
                 projectInformationMapper.deleteAllProject();
                 //删除工程信息
                 projectInformationMapper.deleteAllSubmissionForm();
-            }else{
-                returnMap.keySet().removeIf(key -> key == "msg");
-                returnMap.put("success",false);
-                returnMap.put("msg","导入表数据量为0条，不进行替换");
-                return returnMap;
-            }
-
-            //批量删除重复数据  覆盖操作
-            //modifyHandmadeVindicateListTwo(codeList);
-        }
 
-        //提前保存读取的list的长度
-        int size = list.size();
+                //批量新增  分批次新增
+                modifyHandmadeVindicateList(list);
+                modifyHandmadeVindicateList2(projectInformationList);
 
-        //批量新增  分批次新增
-        if(list.size()!=0) {
-            modifyHandmadeVindicateList(list);
-            modifyHandmadeVindicateList2(projectInformationList);
+                returnMap.keySet().removeIf(key -> key == "msg");
+                returnMap.put("success",true);
+                returnMap.put("msg","已成功导入 "+size+" 条项目信息记录");
+            }
+            returnMap.keySet().removeIf(key -> key == "msg");
+            returnMap.put("success",false);
+            returnMap.put("msg","导入表数据量为0条，不进行替换");
         }
 
-        returnMap.keySet().removeIf(key -> key == "msg");
-        returnMap.put("success",true);
-        returnMap.put("msg","已成功导入 "+size+" 条项目信息记录");
         return returnMap;
     }
 
@@ -220,7 +169,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
     public String modifyHandmadeVindicateList(List<ProjectInformation> projectBasicsList){
         //分批处理
         if(null!=projectBasicsList && projectBasicsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = projectBasicsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){
@@ -261,7 +210,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
     public String modifyHandmadeVindicateList2(List<ProjectInformation> projectBasicsList){
         //分批处理
         if(null!=projectBasicsList && projectBasicsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = projectBasicsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){
@@ -302,7 +251,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
     public String modifyHandmadeVindicateListTwo(List<String> projectBasicsList){
         //分批处理
         if(null!=projectBasicsList && projectBasicsList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = projectBasicsList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){

src/main/java/com/jeeplus/modules/supply/projectInformation/web/ProjectInformationController.java

@@ -151,15 +151,20 @@ public class ProjectInformationController extends BaseController {
         AjaxJson j = new AjaxJson();
         try {
             File file = new File(filePath);
-            MultipartFile file1 = projectInformationService.transformFile(file);
-            ImportExcel ei = new ImportExcel(file, 1, 0);
-            List<ProjectInformation> list = ei.getDataList(ProjectInformation.class);
-            LinkedHashMap returnMap = projectInformationService.disposeImportProjectInformation(list,file1,repeat);
-            //如果文件已经使用完毕，则删除
-            projectInformationService.deleteFileContent(file);
-            //放要放的值
-            j.setBody(returnMap);
-            j.setMsg(returnMap.get("msg").toString());
+            if("2".equals(repeat)){
+                file.delete();
+            }else{
+                MultipartFile file1 = projectInformationService.transformFile(file);
+                ImportExcel ei = new ImportExcel(file, 1, 0);
+                List<ProjectInformation> list = ei.getDataList(ProjectInformation.class);
+                LinkedHashMap returnMap = projectInformationService.disposeImportProjectInformation(list,file1,repeat);
+                //如果文件已经使用完毕，则删除
+                projectInformationService.deleteFileContent(file);
+                //放要放的值
+                j.setBody(returnMap);
+                j.setMsg(returnMap.get("msg").toString());
+            }
+
         } catch (Exception e) {
             j.setSuccess(false);
             j.setMsg("导入项目信息失败！失败信息：" + e.getMessage());

src/main/java/com/jeeplus/modules/supply/stockOut/service/SupplyStockOutService.java

@@ -107,14 +107,14 @@ public class SupplyStockOutService  extends CrudService<SupplyStockOutMapper, Su
     public String disposeStockOutList(List<SupplyStockOut> stockOutList){
         //分批处理
         if(null!=stockOutList && stockOutList.size()>0){
-            int pointsDataLimit = 1000;//限制条数
+            int pointsDataLimit = 5000;//限制条数
             Integer size = stockOutList.size();
             //判断是否有必要分批
             if(pointsDataLimit<size){
                 int part = size/pointsDataLimit;//分批数
                 //
                 for (int i = 0; i < part; i++) {
-                    //1000条
+                    //5000条
                     List<SupplyStockOut> listPage = stockOutList.subList(0, pointsDataLimit);
                     mapper.insertList(listPage);
                     //剔除