From c3a99b122b7484704b71588a26583afcc58b6270 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 24 七月 2024 09:45:45 +0800
Subject: [PATCH] 不良品推送修改
---
src/main/java/com/whyc/pojo/DefectiveProductsHistory.java | 5 +++++
src/main/java/com/whyc/pojo/DefectiveProducts.java | 4 ++++
src/main/java/com/whyc/service/DefectiveProductsHistoryService.java | 2 +-
src/main/java/com/whyc/service/DefectiveProductsService.java | 20 +++++++++++++++++++-
src/main/java/com/whyc/util/FileUtil.java | 17 +++++++++++++++++
5 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/DefectiveProducts.java b/src/main/java/com/whyc/pojo/DefectiveProducts.java
index 78f32bc..45966cb 100644
--- a/src/main/java/com/whyc/pojo/DefectiveProducts.java
+++ b/src/main/java/com/whyc/pojo/DefectiveProducts.java
@@ -52,6 +52,10 @@
@ApiModelProperty(value = "闄勪欢url")
private String fileUrl;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闄勪欢url鐨勬枃浠跺悕")
+ private List nameList;
+
@ApiModelProperty(value = "鍨嬪彿")
private String type;
diff --git a/src/main/java/com/whyc/pojo/DefectiveProductsHistory.java b/src/main/java/com/whyc/pojo/DefectiveProductsHistory.java
index d6bae04..4331bb2 100644
--- a/src/main/java/com/whyc/pojo/DefectiveProductsHistory.java
+++ b/src/main/java/com/whyc/pojo/DefectiveProductsHistory.java
@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -65,5 +66,9 @@
@ApiModelProperty(value = "澶勭悊鐨勬枃浠惰矾寰�")
private String delUrl;
+ @ApiModelProperty(value = "澶勭悊鐨勬枃浠�")
+ @TableField(exist = false)
+ private List hisNameList;
+
}
diff --git a/src/main/java/com/whyc/service/DefectiveProductsHistoryService.java b/src/main/java/com/whyc/service/DefectiveProductsHistoryService.java
index 70fad7c..44be447 100644
--- a/src/main/java/com/whyc/service/DefectiveProductsHistoryService.java
+++ b/src/main/java/com/whyc/service/DefectiveProductsHistoryService.java
@@ -67,7 +67,7 @@
e.printStackTrace();
}
}
- defectiveHis.setDelUrl("doc_file" + File.separator + defectiveDirSuffix);
+ defectiveHis.setDelUrl( File.separator + defectiveDirSuffix);
}
mapper.insert(defectiveHis);
}
diff --git a/src/main/java/com/whyc/service/DefectiveProductsService.java b/src/main/java/com/whyc/service/DefectiveProductsService.java
index 600f129..88ed06e 100644
--- a/src/main/java/com/whyc/service/DefectiveProductsService.java
+++ b/src/main/java/com/whyc/service/DefectiveProductsService.java
@@ -15,6 +15,7 @@
import com.whyc.pojo.DocUser;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
+import com.whyc.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -82,7 +83,7 @@
multipartFile.transferTo(file);
}
//ZipUtils.toZip(fileList,new FileOutputStream(new File(rootFile+feedbackZipPath)));
- defective.setFileUrl("doc_file" + File.separator + defectiveDirSuffix);
+ defective.setFileUrl( File.separator + defectiveDirSuffix);
}
@@ -131,6 +132,23 @@
public Response getDefectiveLimit(DefectiveDto defectiveDto) {
PageHelper.startPage(defectiveDto.getPageCurr(),defectiveDto.getPageSize());
List<DefectiveProducts> list=mapper.getDefectiveLimit(defectiveDto);
+ String rootFile = CommonUtil.getRootFile();//涓昏矾寰�
+ for (DefectiveProducts defective:list) {
+ String filePath=defective.getFileUrl();
+ if(filePath!=null&&!filePath.isEmpty()){
+ defective.setNameList(FileUtil.getFileNameWithOutDirectory(rootFile+filePath));
+ }
+ List<DefectiveProductsHistory> hisList=defective.getHisList();
+ if(hisList!=null&&hisList.size()>0){
+ for (DefectiveProductsHistory his:defective.getHisList()) {
+ String hisDelPath=his.getDelUrl();
+ if(hisDelPath!=null&&!hisDelPath.isEmpty()){
+ his.setHisNameList(FileUtil.getFileNameWithOutDirectory(rootFile+hisDelPath));
+ }
+ }
+
+ }
+ }
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"涓嶈壇鍝侀椤垫帹閫�");
}
diff --git a/src/main/java/com/whyc/util/FileUtil.java b/src/main/java/com/whyc/util/FileUtil.java
index 54c8c83..1b548ec 100644
--- a/src/main/java/com/whyc/util/FileUtil.java
+++ b/src/main/java/com/whyc/util/FileUtil.java
@@ -9,10 +9,12 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
public class FileUtil {
+
public static List<String> getStaticFilePath(File file, List<String> list){
@@ -265,6 +267,21 @@
proc.waitFor();
}
+ //璇诲彇鏂囦欢澶逛笅鐨勬墍鏈夋枃浠讹紙涓嶈鍙栨枃浠跺す鍐呯殑鏂囦欢锛�
+ public static List getFileNameWithOutDirectory(String filePath) {
+ File folder = new File(filePath); // 鏂囦欢澶硅矾寰�
+ List nameList=new ArrayList();
+ File[] listOfFiles = folder.listFiles();
+ if (listOfFiles != null) {
+ for (File file : listOfFiles) {
+ if (file.isFile()) {
+ nameList.add(file.getName());
+ }
+ }
+ }
+ return nameList;
+ }
+
//private static void decompressRar(File file, String outputFolder) throws IOException, RarException {
// Archive archive = new Archive(file);
// FileHeader fileHeader = archive.nextFileHeader();
--
Gitblit v1.9.1