图片处理储存位置和批次号的修改

src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java

@@ -28,7 +28,7 @@ public class EquipmentDataDetail {
     private String value8;
     private String value9;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String createDate;
+    private Date createDate;
     private Date createBy;
     private String photoValue1;
     //批次号

src/main/java/com/xujie/sys/modules/reader/entity/EquipmentFolderLocation.java

@@ -18,7 +18,7 @@ public class EquipmentFolderLocation {
     private String buNo;
     private String itemNo;
     private String backupFolderPath;
-
+    private String batchDate;
     //文件编号
     private String fileNo;
 

src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java

@@ -11,6 +11,7 @@ import com.xujie.sys.modules.reader.service.EquipmentFolderLocationService;
 import com.xujie.sys.modules.reader.service.GetInformationForExcelService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +22,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -97,7 +99,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                         // 图片类型文件
                         // 处理图片文件的逻辑
                         deleteFile.add(folderFiler + "\\" + file1.getName());
-                        imageFiles.add(folderFiler + "\\" + renamedFile.getName());
+                        imageFiles.add(excel.getBackupPhotoPath() + "\\" + renamedFile.getName());
                     } else {
                         excelFiles.add(file1);
                     }
@@ -121,7 +123,17 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
         if (CollectionUtils.isEmpty(equipments)) {
             batchNo = 1;
         } else {
-            batchNo = equipments.get(equipments.size() - 1).getBatchNo() + 1;
+            Date createDate = equipments.get(equipments.size() - 1).getCreateDate();//获取最近新增一条信息的时间
+            Date date = new Date();
+            if (StringUtils.isEmpty(excel.getBatchDate())){
+                excel.setBatchDate("1");
+            }
+            int time = Integer.parseInt(excel.getBatchDate());
+            if (createDate.getTime()-date.getTime()/1000>time){
+                batchNo = equipments.get(equipments.size() - 1).getBatchNo() + 1;
+            }else {
+                batchNo = equipments.get(equipments.size() - 1).getBatchNo();
+            }
         }
         //对图片保存
         if (CollectionUtils.isNotEmpty(imageFiles)){
@@ -276,6 +288,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setBatchNo(batchNo);
                     equipmentDataDetail.setItemNo(excel.getItemNo());
                     equipmentDataDetail.setFileNo(excel.getFileNo());
+                    equipmentDataDetail.setCreateDate(new Date());
                     equipmentDataDetail.setValue0(data[0]);
                     equipmentDataDetail.setValue1(data[1]);
                     equipmentDataDetail.setValue2(data[2]);
@@ -330,6 +343,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setBatchNo(batchNo);
                     equipmentDataDetail.setItemNo(excel.getItemNo());
                     equipmentDataDetail.setFileNo(excel.getFileNo());
+                    equipmentDataDetail.setCreateDate(new Date());
                     equipmentDataDetail.setValue0(list.get(i).get(1));
                     equipmentDataDetail.setValue1(list.get(i).get(3));
                     equipmentDataDetails.add(equipmentDataDetail);
@@ -366,6 +380,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setBatchNo(batchNo);
                     equipmentDataDetail.setItemNo(excel.getItemNo());
                     equipmentDataDetail.setFileNo(excel.getFileNo());
+                    equipmentDataDetail.setCreateDate(new Date());
                     equipmentDataDetail.setValue0(data[0]);
                     equipmentDataDetail.setValue1(data[1]);
                     equipmentDataDetail.setValue2(data[2]);
@@ -391,6 +406,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             equipmentDataDetail.setItemNo(excel.getItemNo());
             equipmentDataDetail.setFileNo(excel.getFileNo());
             equipmentDataDetail.setPhotoValue1(s);
+            equipmentDataDetail.setCreateDate(new Date());
             detailList.add(equipmentDataDetail);
         }
         return detailList;