SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化导入压缩包功能 #147

Merged
qtz merged 2 commits from qtz3 into dev 2023-10-25 06:21:45 +00:00
Conversation 0 Commits 2 Files Changed 2
+45 -39
2 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class CaseApplicationController extends BaseController {
* @param id 案件申请id * @param id 案件申请id
* @return * @return
*/ */
@PostMapping("/upload") @PostMapping("/uploadZipFile")
public AjaxResult uploadZipFile(@RequestParam("file") MultipartFile file, Long id) { public AjaxResult uploadZipFile(@RequestParam("file") MultipartFile file, Long id) {
String username = this.getUsername(); String username = this.getUsername();
Long userId = this.getUserId(); Long userId = this.getUserId();
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+44 -38
View File
@@ -272,9 +272,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if (file.isEmpty()) { if (file.isEmpty()) {
return AjaxResult.error("请选择要上传的文件"); return AjaxResult.error("请选择要上传的文件");
} }
// String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile"; String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile";
// String targetPath = "F:\\testZip\\unzipFile"; // String targetPath = "F:\\testZip\\uploadPath\\upload\\upload1\\unzipFile";
String targetPath = "F:\\testZip\\unzipFile";
File zipFile = null; File zipFile = null;
InputStream ins = null; InputStream ins = null;
try { try {
@@ -289,8 +288,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
//得到解压缩的所有文件 //得到解压缩的所有文件
String zipName = file.getOriginalFilename(); String zipName = file.getOriginalFilename();
String zipPath = "F:\\testZip\\unzipFile\\"+zipName; String subzipName = zipName.substring(0,zipName.indexOf(".zip"));
// String zipPath = "/home/ruoyi/uploadPath/upload/unzipFile"+zipName; // String zipPath = "F:\\testZip\\uploadPath\\upload\\upload1\\unzipFile\\"+subzipName;
String zipPath = "/home/ruoyi/uploadPath/upload/unzipFile/"+subzipName;
File dirUnzipPath = new File(zipPath); File dirUnzipPath = new File(zipPath);
List<File> allFiles = new ArrayList<>(); List<File> allFiles = new ArrayList<>();
List<String> allFilestr = new ArrayList<>(); List<String> allFilestr = new ArrayList<>();
@@ -306,25 +307,27 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if(allFilestr!=null&&allFilestr.size()>0){ if(allFilestr!=null&&allFilestr.size()>0){
for (String filestr : allFilestr) { for (String filestr : allFilestr) {
List<Integer> allindex = new ArrayList<>(); List<Integer> allindex = new ArrayList<>();
int indexKey = filestr.indexOf("\\"); // int indexKey = filestr.indexOf("\\");
int indexKey = filestr.indexOf("/");
// System.out.println("filestr:------------"+filestr);
allindex.add(indexKey); allindex.add(indexKey);
while (indexKey != -1) { while (indexKey != -1) {
indexKey = filestr.indexOf("\\", indexKey + 1); // indexKey = filestr.indexOf("\\", indexKey + 1);
indexKey = filestr.indexOf("/", indexKey + 1);
allindex.add(indexKey); allindex.add(indexKey);
} }
if(allindex!=null&&allindex.size()>0){ if(allindex!=null&&allindex.size()>0){
String substrOne = filestr.substring(allindex.get(2)+1,allindex.get(3)); String substrOne = filestr.substring(allindex.get(6)+1,allindex.get(7));
Integer series = null; Integer series = null;
for (int i = 0; i < allindex.size()-2; i++) { for (int i = 0; i < allindex.size()-7; i++) {
String substr = filestr.substring(allindex.get(i+2)+1,allindex.get(i+3)); String substr = filestr.substring(allindex.get(i+5)+1,allindex.get(i+6));
series = i + 1; series = i + 1;
if(series==1){ if(series==1){
//查询这个级数的目录是否存在，若不存在，则新建这个目录 //查询这个级数的目录是否存在，若不存在，则新建这个目录
CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory(); CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory();
caseEvidenceDirectoryselect.setCaseId(id); caseEvidenceDirectoryselect.setCaseId(id);
caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+2)+1,allindex.get(i+3))); caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+5)+1,allindex.get(i+6)));
caseEvidenceDirectoryselect.setSeries(series); caseEvidenceDirectoryselect.setSeries(series);
List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect); List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect);
if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){ if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){
@@ -333,19 +336,16 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
CaseEvidenceDirectory caseEvidenceDirectory = new CaseEvidenceDirectory(); CaseEvidenceDirectory caseEvidenceDirectory = new CaseEvidenceDirectory();
caseEvidenceDirectory.setEvidenceName(substr); caseEvidenceDirectory.setEvidenceName(substr);
caseEvidenceDirectory.setSeries(series); caseEvidenceDirectory.setSeries(series);
caseEvidenceDirectory.setCaseId(id); caseEvidenceDirectory.setCaseId(id);
caseEvidenceDirectory.setCreateBy(username); caseEvidenceDirectory.setCreateBy(username);
caseEvidenceDirectory.setCreateTime(new Date()); caseEvidenceDirectory.setCreateTime(new Date());
caseEvidenceDirectoryMapper.save(caseEvidenceDirectory); caseEvidenceDirectoryMapper.save(caseEvidenceDirectory);
} }
}else { }else {
//查询这个级数的目录是否存在，若不存在，则新建这个目录 //查询这个级数的目录是否存在，若不存在，则新建这个目录
CaseEvidenceDirectory directoryselect = new CaseEvidenceDirectory(); CaseEvidenceDirectory directoryselect = new CaseEvidenceDirectory();
directoryselect.setCaseId(id); directoryselect.setCaseId(id);
directoryselect.setEvidenceName(filestr.substring(allindex.get(i+2)+1,allindex.get(i+3))); directoryselect.setEvidenceName(filestr.substring(allindex.get(i+5)+1,allindex.get(i+6)));
directoryselect.setSeries(series); directoryselect.setSeries(series);
List<CaseEvidenceDirectory> evidenceDirectorys = caseEvidenceDirectoryMapper.selectList(directoryselect); List<CaseEvidenceDirectory> evidenceDirectorys = caseEvidenceDirectoryMapper.selectList(directoryselect);
if(evidenceDirectorys!=null&&evidenceDirectorys.size()>0){ if(evidenceDirectorys!=null&&evidenceDirectorys.size()>0){
@@ -354,7 +354,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
Long parentId = null; Long parentId = null;
CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory(); CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory();
caseEvidenceDirectoryselect.setCaseId(id); caseEvidenceDirectoryselect.setCaseId(id);
caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+1)+1,allindex.get(i+2))); caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+4)+1,allindex.get(i+5)));
caseEvidenceDirectoryselect.setSeries(series-1); caseEvidenceDirectoryselect.setSeries(series-1);
List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect); List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect);
if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){ if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){
@@ -367,47 +367,54 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseEvidenceDirectory.setCreateBy(username); caseEvidenceDirectory.setCreateBy(username);
caseEvidenceDirectory.setCreateTime(new Date()); caseEvidenceDirectory.setCreateTime(new Date());
caseEvidenceDirectory.setCaseId(id); caseEvidenceDirectory.setCaseId(id);
caseEvidenceDirectory.setParentId(parentId); caseEvidenceDirectory.setParentId(parentId);
caseEvidenceDirectoryMapper.save(caseEvidenceDirectory); caseEvidenceDirectoryMapper.save(caseEvidenceDirectory);
} }
} }
} }
//得到最后1级的目录，即文件 //得到最后1级的目录，即文件
int lastIndex = allindex.size()-2; int lastIndex = allindex.get(7);
String substrfile = filestr.substring(lastIndex+1); String substrfile = filestr.substring(lastIndex+1);
//保存到附件表 //保存到附件表
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear()); String year = Integer.toString(now.getYear());
String month = String.format("%02d", now.getMonthValue()); String month = String.format("%02d", now.getMonthValue());
String day = String.format("%02d", now.getDayOfMonth()); String day = String.format("%02d", now.getDayOfMonth());
// String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; // String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day;
String fileName = UUID.randomUUID().toString().replace("-", "")+ "_" + substrfile; String fileName = UUID.randomUUID().toString().replace("-", "")+ "_" + substrfile;
String resultFilePath = saveFolderPath + "/" + fileName; String resultFilePath = saveFolderPath + "/" + fileName;
try { try {
FileInputStream fis = new FileInputStream(new File(filestr)); File resultFilePathFile = new File(resultFilePath);
FileOutputStream fos = new FileOutputStream(new File(resultFilePath)); File parentFilePathFile = resultFilePathFile.getParentFile();
byte b[] = new byte[1024]; if (!parentFilePathFile.exists()) {
int len=0; parentFilePathFile.mkdirs();
while((len=fis.read(b))!=-1){
fos.write(b);
} }
if (!resultFilePathFile.exists()) {
resultFilePathFile.createNewFile();
}
FileInputStream fis = new FileInputStream(new File(filestr));
FileOutputStream fos = new FileOutputStream(resultFilePathFile);
byte[] btyeBuf = new byte[1024];
int len=0;
while((len=fis.read(btyeBuf))!=-1){
fos.write(btyeBuf,0,len);
}
fis.close();
fos.close();
} catch (IOException e) { } catch (IOException e) {
AjaxResult.error("文件解压异常",e); AjaxResult.error("文件解压异常",e);
} }
String substrTwo = filestr.substring(allindex.get(6)+1,allindex.get(7));
Integer annexType = null; Integer annexType = null;
if("申请书".equals(substrOne)){ if("申请书".equals(substrTwo)){
annexType = 1; annexType = 1;
}else if("证据材料".equals(substrOne)){ }else if("证据材料".equals(substrTwo)){
annexType = 2; annexType = 2;
} }
String savePath = "/home/ruoyi/uploadPath/upload"; String savePath = "/home/ruoyi/uploadPath/upload";
@@ -420,15 +427,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
.annexType(annexType) .annexType(annexType)
.build(); .build();
int i = caseAttachMapper.save(caseAttach); int i = caseAttachMapper.save(caseAttach);
Integer annexId = caseAttach.getAnnexId(); Integer annexId = caseAttach.getAnnexId();
//保存到目录表 //保存到目录表
Long parentId = null; Long parentId = null;
CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory(); CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory();
caseEvidenceDirectoryselect.setCaseId(id); caseEvidenceDirectoryselect.setCaseId(id);
caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(lastIndex)+1,allindex.get(lastIndex+1))); caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(6)+1,allindex.get(7)));
caseEvidenceDirectoryselect.setSeries(series-1); caseEvidenceDirectoryselect.setSeries(series);
List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect); List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect);
if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){ if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){
parentId = caseEvidenceDirectorys.get(0).getId(); parentId = caseEvidenceDirectorys.get(0).getId();
@@ -436,7 +442,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
CaseEvidenceDirectory caseEvidenceDirectory = new CaseEvidenceDirectory(); CaseEvidenceDirectory caseEvidenceDirectory = new CaseEvidenceDirectory();
caseEvidenceDirectory.setEvidenceName(substrfile); caseEvidenceDirectory.setEvidenceName(substrfile);
caseEvidenceDirectory.setSeries(series); caseEvidenceDirectory.setSeries(series+1);
caseEvidenceDirectory.setCreateBy(username); caseEvidenceDirectory.setCreateBy(username);
caseEvidenceDirectory.setCreateTime(new Date()); caseEvidenceDirectory.setCreateTime(new Date());
caseEvidenceDirectory.setAnnexId(annexId); caseEvidenceDirectory.setAnnexId(annexId);