diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java index 6ac8113e..208582a1 100644 --- a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java +++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java @@ -36,5 +36,8 @@ public class EquipmentDataDetail { private int batchNo; //文件编号 private String fileNo; + //文件复制之后的路径 private String fileValue1; + //第几住数据 + private int groupValue; } 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 e59a3648..f28d1c01 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 @@ -67,7 +67,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl txtName = new ArrayList<>(); for (String file : excelFiles) { - //找到.的索引 int dotIndex = file.lastIndexOf("."); String s = file.substring(dotIndex + 1); @@ -204,7 +202,8 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl equipmentDataDetails = saveTxt(tffName, excel, batchNo); + String timestamp1 = String.valueOf(System.currentTimeMillis()); + List equipmentDataDetails = saveTxt(tffName, excel, batchNo,timestamp1); //新增数据 saveInformation(equipmentDataDetails); for (String s : tffName) { @@ -212,21 +211,22 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl equipmentDataDetails1 = saveTxtFile(txtName, excel, batchNo); + String timestamp1 = String.valueOf(System.currentTimeMillis()); + List equipmentDataDetails1 = saveTxtFile(txtName, excel, batchNo,timestamp1); saveInformation(equipmentDataDetails1); for (String s : txtName) { + int index=1; //找到\\的最后索引 int dotIndex = s.lastIndexOf("\\"); String name = s.substring(dotIndex + 1); - String timestamp1 = String.valueOf(System.currentTimeMillis()); - deleteBypath(s, excel.getBackupFolderPath(), timestamp1 + "$" + name); + deleteBypath(s, excel.getBackupFolderPath(), index + timestamp1 + "$" + name); + index++; } } } @@ -267,16 +267,10 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveTxt(List fileName, EquipmentFolderLocation excel, Integer batchNo) { + private List saveTxt(List fileName, EquipmentFolderLocation excel, Integer batchNo,String timestamp1) { List equipmentDataDetails = new ArrayList<>(); - -// //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo()) -// .eq(EquipmentFolderDetailEntity::getSite, excel.getSite()) -// .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo()); -// List entityList = equipmentFolderDetailService.list(lambdaQueryWrapper); int index = 1; + int group = 1; for (String s : fileName) { int startLine = 15; // 第一次读取开始的行数 int firstReadLines = 41; @@ -317,6 +311,14 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl 1) { equipmentDataDetail.setValue1(data[1]); } @@ -356,7 +359,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl 9) { equipmentDataDetail.setValue9(data[9]); } + equipmentDataDetail.setGroupValue(group); + + if (StringUtils.equals(data[0],"1000.000")){ + group++; + } equipmentDataDetail.setNum(index); + equipmentDataDetail.setFileValue1(file); equipmentDataDetails.add(equipmentDataDetail); index++; } @@ -586,13 +595,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveExcel(List fileName, EquipmentFolderLocation excel, Integer batchNo, String timestamp1) { List equipmentDataDetails = new ArrayList<>(); - - //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo()) - .eq(EquipmentFolderDetailEntity::getSite, excel.getSite()) - .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo()); - List entityList = equipmentFolderDetailService.list(lambdaQueryWrapper); //获取每个excel下的所有关于Test的两个值并保存 int index = 1; for (String s : fileName) { @@ -686,7 +688,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl saveTxtFile(List fileName, EquipmentFolderLocation excel, Integer batchNo) { + public List saveTxtFile(List fileName, EquipmentFolderLocation excel, Integer batchNo,String timestamp1) { int index = 1; List detailList = new ArrayList<>(); //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert @@ -712,6 +714,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl 3) { equipmentDataDetail.setValue3(data[3]); } - - equipmentDataDetail.setNum(index); + equipmentDataDetail.setFileValue1(file); detailList.add(equipmentDataDetail); index++; } @@ -856,9 +864,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl equipmentDataDetails.size()) { @@ -869,8 +877,8 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl + + - insert into Equipment_data_detail(site,bu_no,equipment_no,item_no,value0,value1,value2,value3,value4,value5,value6,value7,value8,value9,create_date,create_by,batch_no,file_no,photo_value1,num) + insert into Equipment_data_detail(site,bu_no,equipment_no,item_no,value0,value1,value2,value3,value4,value5,value6,value7,value8,value9,create_date,create_by,batch_no,file_no,photo_value1,num,file_value1,group_value) values - (#{item.site},#{item.buNo},#{item.equipmentNo},#{item.itemNo},#{item.value0},#{item.value1},#{item.value2},#{item.value3},#{item.value4},#{item.value5},#{item.value6},#{item.value7},#{item.value8},#{item.value9},#{item.createDate},#{item.createBy},#{item.batchNo},#{item.fileNo},#{item.photoValue1},#{item.num}) + (#{item.site},#{item.buNo},#{item.equipmentNo},#{item.itemNo},#{item.value0},#{item.value1},#{item.value2},#{item.value3},#{item.value4},#{item.value5},#{item.value6},#{item.value7},#{item.value8},#{item.value9},#{item.createDate},#{item.createBy},#{item.batchNo},#{item.fileNo},#{item.photoValue1},#{item.num},#{item.fileValue1},#{item.groupValue})