From f853336747b9f04aae162bb0b4f06b442852c0a1 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Wed, 26 Jun 2024 11:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=94=B9=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reader/entity/EquipmentDataDetail.java    |   1 +
 .../GetInformationForExcelServiceImpl.java    | 709 +++++++++---------
 2 files changed, 359 insertions(+), 351 deletions(-)

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 d3409fe6..6ac8113e 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,4 +36,5 @@ public class EquipmentDataDetail {
     private int batchNo;
     //文件编号
     private String fileNo;
+    private String fileValue1;
 }
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 218f94a3..e59a3648 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
@@ -23,10 +23,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -144,6 +141,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
 
         //对图片保存
         if (CollectionUtils.isNotEmpty(imageFiles)) {
+
             String timestamp = String.valueOf(System.currentTimeMillis());
             List<String> list = new ArrayList<>();
             for (String imageFile : imageFiles) {
@@ -186,7 +184,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
         }
         //excel(csv)不为空就做新增
         if (CollectionUtils.isNotEmpty(fileName)) {
-            List<EquipmentDataDetail> equipmentDataDetails = saveExcel(fileName, excel, batchNo);
+            String timestamp1 = String.valueOf(System.currentTimeMillis());
+
+            List<EquipmentDataDetail> equipmentDataDetails = saveExcel(fileName, excel, batchNo, timestamp1);
             if (CollectionUtils.isNotEmpty(equipmentDataDetails)) {
                 //批量新增
                 getInformationForExcelMapper.saveByExcels(equipmentDataDetails);
@@ -194,8 +194,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     //找到\\的最后索引
                     int dotIndex = s.lastIndexOf("\\");
                     String name = s.substring(dotIndex + 1);
-                    String timestamp1 = String.valueOf(System.currentTimeMillis());
-                    deleteBypath(s, excel.getBackupFolderPath(), timestamp1 + "$" + name);
+                    int index = 1;
+                    deleteBypath(s, excel.getBackupFolderPath(), index + timestamp1 + "$" + name);
+                    index++;
                 }
             } else {
                 return;
@@ -207,12 +208,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             //新增数据
             saveInformation(equipmentDataDetails);
             for (String s : tffName) {
+                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++;
             }
         }
         //txt文件不为空就做新增
@@ -267,14 +269,13 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
     //对tff文件进行操作
     private List<EquipmentDataDetail> saveTxt(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
         List<EquipmentDataDetail> equipmentDataDetails = new ArrayList<>();
-        List<EquipmentDataDetail> equipmentDataDetails1 = new ArrayList<>();
 
-        //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
-        LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo())
-                .eq(EquipmentFolderDetailEntity::getSite, excel.getSite())
-                .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo());
-        List<EquipmentFolderDetailEntity> entityList = equipmentFolderDetailService.list(lambdaQueryWrapper);
+//        //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
+//        LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo())
+//                .eq(EquipmentFolderDetailEntity::getSite, excel.getSite())
+//                .eq(EquipmentFolderDetailEntity::getEquipmentNo, excel.getEquipmentNo());
+//        List<EquipmentFolderDetailEntity> entityList = equipmentFolderDetailService.list(lambdaQueryWrapper);
         int index = 1;
         for (String s : fileName) {
             int startLine = 15; // 第一次读取开始的行数
@@ -360,230 +361,230 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     index++;
                 }
 
-                if (CollectionUtils.isNotEmpty(entityList)){
-                    for (EquipmentFolderDetailEntity one : entityList) {
-                        for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) {
-                            if (StringUtils.equals(one.getCollectionSource(), "value0")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue0())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue0());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue0("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue0("不合格");
-                                    }
-                                }
-                            }
-                            if (StringUtils.equals(one.getCollectionSource(), "value1")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue1())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue1());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue1("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue1("不合格");
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.equals(one.getCollectionSource(), "value2")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue2())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue2());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue2("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue2("不合格");
-                                    }
-                                }
-                            }
-                            if (StringUtils.equals(one.getCollectionSource(), "value3")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue3())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue3());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue3("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue3("不合格");
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.equals(one.getCollectionSource(), "value4")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue4())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue4());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue4("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue4("不合格");
-                                    }
-                                }
-                            }
-                            if (StringUtils.equals(one.getCollectionSource(), "value5")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue5())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue5());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue5("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue5("不合格");
-                                    }
-                                }
-                            }
-                            if (StringUtils.equals(one.getCollectionSource(), "value6")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue6())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue6());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue6("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue6("不合格");
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.equals(one.getCollectionSource(), "value7")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue7())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue7());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue7("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue7("不合格");
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.equals(one.getCollectionSource(), "value8")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue8())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue8());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue8("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue8("不合格");
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.equals(one.getCollectionSource(), "value9")){
-                                if (StringUtils.isEmpty(equipmentDataDetail.getValue9())){
-                                    continue;
-                                }
-                                double value = Double.parseDouble(equipmentDataDetail.getValue9());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue9("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue9("不合格");
-                                    }
-                                }
-                            }
-
-                        }
-                    }
-                }
+//                if (CollectionUtils.isNotEmpty(entityList)) {
+//                    for (EquipmentFolderDetailEntity one : entityList) {
+//                        for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) {
+//                            if (StringUtils.equals(one.getCollectionSource(), "value0")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue0())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue0());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue0("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue0("不合格");
+//                                    }
+//                                }
+//                            }
+//                            if (StringUtils.equals(one.getCollectionSource(), "value1")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue1())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue1());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue1("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue1("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                            if (StringUtils.equals(one.getCollectionSource(), "value2")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue2())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue2());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue2("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue2("不合格");
+//                                    }
+//                                }
+//                            }
+//                            if (StringUtils.equals(one.getCollectionSource(), "value3")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue3())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue3());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue3("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue3("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                            if (StringUtils.equals(one.getCollectionSource(), "value4")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue4())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue4());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue4("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue4("不合格");
+//                                    }
+//                                }
+//                            }
+//                            if (StringUtils.equals(one.getCollectionSource(), "value5")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue5())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue5());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue5("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue5("不合格");
+//                                    }
+//                                }
+//                            }
+//                            if (StringUtils.equals(one.getCollectionSource(), "value6")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue6())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue6());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue6("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue6("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                            if (StringUtils.equals(one.getCollectionSource(), "value7")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue7())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue7());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue7("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue7("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                            if (StringUtils.equals(one.getCollectionSource(), "value8")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue8())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue8());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue8("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue8("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                            if (StringUtils.equals(one.getCollectionSource(), "value9")) {
+//                                if (StringUtils.isEmpty(equipmentDataDetail.getValue9())) {
+//                                    continue;
+//                                }
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue9());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue9("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue9("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                        }
+//                    }
+//                }
                 bufferedReader.close();
             } catch (IOException e) {
                 e.printStackTrace();
             }
         }
 
-            return equipmentDataDetails;
+        return equipmentDataDetails;
 
     }
 
     //对excel(csv)文件进行操作
-    public List<EquipmentDataDetail> saveExcel(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
+    public List<EquipmentDataDetail> saveExcel(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo, String timestamp1) {
         List<EquipmentDataDetail> equipmentDataDetails = new ArrayList<>();
 
         //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
@@ -611,12 +612,18 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                 log.info("读取的文件为空,或不是excel格式的");
                 return new ArrayList<>();
             }
+            //获取复制之后的文件路径
+            //找到\\的最后索引
+            int num =1;
+            int dotIndex = s.lastIndexOf("\\");
+            String name = s.substring(dotIndex + 1);
+            String file =excel.getBackupFolderPath()+"\\"+num + timestamp1 + "$" + name;
+            num++;
             //获取TEST后面的两个值
             for (int i = 0; i < list.size(); i++) {
                 if (list.get(i).get(0) == null) {
                     continue;
                 }
-
                 if (list.get(i).get(0).equals("TEST")) {
                     EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
                     equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo());
@@ -629,59 +636,59 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setValue0(list.get(i).get(1));
                     equipmentDataDetail.setValue1(list.get(i).get(3));
                     equipmentDataDetail.setNum(index);
+                    equipmentDataDetail.setFileValue1(file);
                     equipmentDataDetails.add(equipmentDataDetail);
                     index++;
                 }
             }
-            if (CollectionUtils.isNotEmpty(entityList)){
-                for (EquipmentFolderDetailEntity one : entityList) {
-                    for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) {
-                        if (StringUtils.equals(one.getCollectionSource(), "value0")){
-                            double value = Double.parseDouble(equipmentDataDetail.getValue0());
-                            if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                //规定参数
-                                double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                if (defaultValue != value) {
-                                    equipmentDataDetail.setValue0("不合格");
-                                }
-                            } else {
-                                //获取表的最大值和最小值
-                                double max = Double.parseDouble(one.getMaxValue());
-                                double min = Double.parseDouble(one.getMinValue());
-                                if (max <= value || value <= min) {
-                                    equipmentDataDetail.setValue0("不合格");
-                                }
-                            }
-                        }
-                        if (StringUtils.equals(one.getCollectionSource(), "value1")){
-                            double value = Double.parseDouble(equipmentDataDetail.getValue1());
-                            if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                //规定参数
-                                double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                if (defaultValue != value) {
-                                    equipmentDataDetail.setValue1("不合格");
-                                }
-                            } else {
-                                //获取表的最大值和最小值
-                                double max = Double.parseDouble(one.getMaxValue());
-                                double min = Double.parseDouble(one.getMinValue());
-                                if (max <= value || value <= min) {
-                                    equipmentDataDetail.setValue1("不合格");
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+//            if (CollectionUtils.isNotEmpty(entityList)) {
+//                for (EquipmentFolderDetailEntity one : entityList) {
+//                    for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) {
+//                        if (StringUtils.equals(one.getCollectionSource(), "value0")) {
+//                            double value = Double.parseDouble(equipmentDataDetail.getValue0());
+//                            if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                //规定参数
+//                                double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                if (defaultValue != value) {
+//                                    equipmentDataDetail.setValue0("不合格");
+//                                }
+//                            } else {
+//                                //获取表的最大值和最小值
+//                                double max = Double.parseDouble(one.getMaxValue());
+//                                double min = Double.parseDouble(one.getMinValue());
+//                                if (max <= value || value <= min) {
+//                                    equipmentDataDetail.setValue0("不合格");
+//                                }
+//                            }
+//                        }
+//                        if (StringUtils.equals(one.getCollectionSource(), "value1")) {
+//                            double value = Double.parseDouble(equipmentDataDetail.getValue1());
+//                            if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                //规定参数
+//                                double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                if (defaultValue != value) {
+//                                    equipmentDataDetail.setValue1("不合格");
+//                                }
+//                            } else {
+//                                //获取表的最大值和最小值
+//                                double max = Double.parseDouble(one.getMaxValue());
+//                                double min = Double.parseDouble(one.getMinValue());
+//                                if (max <= value || value <= min) {
+//                                    equipmentDataDetail.setValue1("不合格");
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
         }
-            return equipmentDataDetails;
+        return equipmentDataDetails;
     }
 
     //对txt文件进行操作
     public List<EquipmentDataDetail> saveTxtFile(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
         int index = 1;
         List<EquipmentDataDetail> detailList = new ArrayList<>();
-        List<EquipmentDataDetail> equipmentDataDetails1 = new ArrayList<>();
         //查询EquipmentFolderDetail表,判断是否对添加的值进行校验判断是否insert
         LambdaQueryWrapper<EquipmentFolderDetailEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(EquipmentFolderDetailEntity::getBuNo, excel.getBuNo())
@@ -733,89 +740,89 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     index++;
                 }
 
-                if (CollectionUtils.isNotEmpty(entityList)){
-                    for (EquipmentFolderDetailEntity one : entityList) {
-                        for (EquipmentDataDetail equipmentDataDetail : detailList) {
-                            if (StringUtils.equals(one.getCollectionSource(), "value0")){
-
-                                double value = Double.parseDouble(equipmentDataDetail.getValue0());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue0("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue0("不合格");
-                                    }
-                                }
-                            }
-                            if (StringUtils.equals(one.getCollectionSource(), "value1")){
-                                double value = Double.parseDouble(equipmentDataDetail.getValue1());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue1("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue1("不合格");
-                                    }
-                                }
-                            }
-
-                            if (StringUtils.equals(one.getCollectionSource(), "value2")){
-                                double value = Double.parseDouble(equipmentDataDetail.getValue2());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue2("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue2("不合格");
-                                    }
-                                }
-                            }
-                            if (StringUtils.equals(one.getCollectionSource(), "value3")){
-                                double value = Double.parseDouble(equipmentDataDetail.getValue3());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue3("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue3("不合格");
-                                    }
-                                }
-                            }
-
-                        }
-                    }
-                }
+//                if (CollectionUtils.isNotEmpty(entityList)) {
+//                    for (EquipmentFolderDetailEntity one : entityList) {
+//                        for (EquipmentDataDetail equipmentDataDetail : detailList) {
+//                            if (StringUtils.equals(one.getCollectionSource(), "value0")) {
+//
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue0());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue0("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue0("不合格");
+//                                    }
+//                                }
+//                            }
+//                            if (StringUtils.equals(one.getCollectionSource(), "value1")) {
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue1());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue1("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue1("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                            if (StringUtils.equals(one.getCollectionSource(), "value2")) {
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue2());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue2("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue2("不合格");
+//                                    }
+//                                }
+//                            }
+//                            if (StringUtils.equals(one.getCollectionSource(), "value3")) {
+//                                double value = Double.parseDouble(equipmentDataDetail.getValue3());
+//                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+//                                    //规定参数
+//                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
+//                                    if (defaultValue != value) {
+//                                        equipmentDataDetail.setValue3("不合格");
+//                                    }
+//                                } else {
+//                                    //获取表的最大值和最小值
+//                                    double max = Double.parseDouble(one.getMaxValue());
+//                                    double min = Double.parseDouble(one.getMinValue());
+//                                    if (max <= value || value <= min) {
+//                                        equipmentDataDetail.setValue3("不合格");
+//                                    }
+//                                }
+//                            }
+//
+//                        }
+//                    }
+//                }
 
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
-            return detailList;
+        return detailList;
     }
 
     //对图片进行保存