diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java index be285a60..44938f18 100644 --- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java @@ -84,7 +84,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl imageFiles = new ArrayList<>(); -// List deleteFile =new ArrayList<>(); + List deleteFile =new ArrayList<>(); if (fileInfo != null && files != null) { Path folderPath = Paths.get(folderFiler); @@ -96,15 +96,18 @@ public class GetInformationForExcelServiceImpl extends ServiceImpltime){ - batchNo = equipments.get(equipments.size() - 1).getBatchNo()+ 1; - }else { + Long finalTime = date.getTime() - createDate.getTime(); + if (finalTime / 1000 > time) { + batchNo = equipments.get(equipments.size() - 1).getBatchNo() + 1; + } else { batchNo = equipments.get(equipments.size() - 1).getBatchNo(); } } //对图片保存 - if (CollectionUtils.isNotEmpty(imageFiles)){ + if (CollectionUtils.isNotEmpty(imageFiles)) { List equipmentDataDetails = saveImage(imageFiles, excel, batchNo); getInformationForExcelMapper.saveByExcels(equipmentDataDetails); - for (String s : imageFiles) { + for (String s : deleteFile) { // 创建源文件对象和目标文件夹对象 deleteBypath(s, excel.getBackupPhotoPath()); } @@ -163,7 +166,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveImage(List fileName,EquipmentFolderLocation excel,Integer batchNo){ + private static List saveImage(List fileName, EquipmentFolderLocation excel, Integer batchNo) { List detailList = new ArrayList<>(); for (String s : fileName) { EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail(); @@ -449,7 +452,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl stream = Files.newDirectoryStream(folderPath)) { @@ -460,15 +463,17 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl