|
|
@ -99,8 +99,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
deleteFile.add(folderFiler + "\\" + file1.getName()); |
|
|
deleteFile.add(folderFiler + "\\" + file1.getName()); |
|
|
imageFiles.add(folderFiler + "\\" + renamedFile.getName()); |
|
|
imageFiles.add(folderFiler + "\\" + renamedFile.getName()); |
|
|
} else { |
|
|
} else { |
|
|
deleteFile.add(folderFiler + "\\" + file1.getName()); |
|
|
|
|
|
excelFiles.add(renamedFile); |
|
|
|
|
|
|
|
|
excelFiles.add(file1); |
|
|
} |
|
|
} |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
e.printStackTrace(); |
|
|
e.printStackTrace(); |
|
|
@ -161,7 +160,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
if (CollectionUtils.isNotEmpty(equipmentDataDetails)) { |
|
|
if (CollectionUtils.isNotEmpty(equipmentDataDetails)) { |
|
|
//批量新增 |
|
|
//批量新增 |
|
|
getInformationForExcelMapper.saveByExcels(equipmentDataDetails); |
|
|
getInformationForExcelMapper.saveByExcels(equipmentDataDetails); |
|
|
for (String s : deleteFile) { |
|
|
|
|
|
|
|
|
for (String s : fileName) { |
|
|
deleteBypath(s, excel.getBackupFolderPath()); |
|
|
deleteBypath(s, excel.getBackupFolderPath()); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
@ -173,7 +172,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
List<EquipmentDataDetail> equipmentDataDetails = saveTxt(tffName, excel, batchNo); |
|
|
List<EquipmentDataDetail> equipmentDataDetails = saveTxt(tffName, excel, batchNo); |
|
|
//新增数据 |
|
|
//新增数据 |
|
|
saveInformation(equipmentDataDetails); |
|
|
saveInformation(equipmentDataDetails); |
|
|
for (String s : deleteFile) { |
|
|
|
|
|
|
|
|
for (String s : tffName) { |
|
|
deleteBypath(s, excel.getBackupFolderPath()); |
|
|
deleteBypath(s, excel.getBackupFolderPath()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -181,7 +180,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio |
|
|
if (CollectionUtils.isNotEmpty(txtName)) { |
|
|
if (CollectionUtils.isNotEmpty(txtName)) { |
|
|
List<EquipmentDataDetail> equipmentDataDetails1 = saveTxtFile(txtName, excel, batchNo); |
|
|
List<EquipmentDataDetail> equipmentDataDetails1 = saveTxtFile(txtName, excel, batchNo); |
|
|
saveInformation(equipmentDataDetails1); |
|
|
saveInformation(equipmentDataDetails1); |
|
|
for (String s : deleteFile) { |
|
|
|
|
|
|
|
|
for (String s : txtName) { |
|
|
deleteBypath(s, excel.getBackupFolderPath()); |
|
|
deleteBypath(s, excel.getBackupFolderPath()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|