diff --git a/src/main/java/com/xujie/sys/modules/reader/controller/GetInformationForExcelController.java b/src/main/java/com/xujie/sys/modules/reader/controller/GetInformationForExcelController.java index e8b757ca..394efcec 100644 --- a/src/main/java/com/xujie/sys/modules/reader/controller/GetInformationForExcelController.java +++ b/src/main/java/com/xujie/sys/modules/reader/controller/GetInformationForExcelController.java @@ -21,4 +21,14 @@ public class GetInformationForExcelController { getInformationForExcelService.saveByExcel(); return R.ok(); } + +// public static void main(String[] args) throws Exception { + +// String filePath ="E:\\file\\cs.tff"; +// BufferedReader bufferedReader = new BufferedReader(new FileReader(filePath)); +// String line; +// while ((line=bufferedReader.readLine())!=null){ +// System.out.println(line); +// } +// } } 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 787bd6be..87402ae7 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 @@ -30,6 +30,10 @@ public class EquipmentDataDetail { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String createDate; private Date createBy; + //批次号 + private int batchNo; + //文件编号 + private String fileNo; } diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java index 80f19fe0..6d7fe2de 100644 --- a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java +++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java @@ -15,5 +15,7 @@ public class EquipmentFolderLocation { private String site; private String buNo; private String itemNo; + //文件编号 + private String fileNo; } 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 f6240349..787ff4da 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 @@ -2,6 +2,7 @@ package com.xujie.sys.modules.reader.service.impl; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.support.ExcelTypeEnum; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xujie.sys.modules.reader.dao.GetInformationForExcelMapper; import com.xujie.sys.modules.reader.entity.EquipmentDataDetail; @@ -59,16 +60,36 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl equipmentDataDetails =new ArrayList<>(); //获取文件夹下所有文件 List files=getExcelFiles(folderFiler); if(CollectionUtils.isEmpty(files)){ return; } + //判断这个批次号应该是多少 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EquipmentDataDetail::getBuNo,excel.getBuNo()); + queryWrapper.eq(EquipmentDataDetail::getSite,excel.getSite()); + queryWrapper.eq(EquipmentDataDetail::getFileNo,excel.getFileNo()); + List equipments = this.list(queryWrapper); + //定义批次号 + Integer batchNo; + if (CollectionUtils.isEmpty(equipments)){ + batchNo=1; + }else { + batchNo=equipments.get(equipments.size()-1).getBatchNo()+1; + } + List equipmentDataDetails =new ArrayList<>(); + //创建一个list用来存储所有的的excel文件路径 List fileName = new ArrayList<>(); for (File file : files) { - fileName.add(folderFiler+"\\"+file.getName()); + //找到.的索引 + int dotIndex = file.getName().lastIndexOf("."); + String s = file.getName().substring(dotIndex + 1); + + if (s.equals("csv")){ + fileName.add(folderFiler+"\\"+file.getName()); + } } //获取每个excel下的所有关于Test的两个值并保存 for (String s : fileName) { @@ -90,7 +111,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl excelFiles=new ArrayList<>(); - if (file !=null){ + if (file !=null ){ for (File file1 : files) { if (file1.isFile()){ excelFiles.add(file1); diff --git a/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml b/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml index 8fa1acb2..51e32d11 100644 --- a/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml +++ b/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml @@ -18,12 +18,14 @@ + + - 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) + 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) 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.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})