|
|
@@ -273,6 +273,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
273
|
273
|
return AjaxResult.error("请选择要上传的文件");
|
|
274
|
274
|
}
|
|
275
|
275
|
// String targetPath = "/home/ruoyi/uploadPath/upload/unzipFile";
|
|
|
276
|
+// String targetPath = "F:\\testZip\\unzipFile";
|
|
276
|
277
|
String targetPath = "F:\\testZip\\unzipFile";
|
|
277
|
278
|
File zipFile = null;
|
|
278
|
279
|
InputStream ins = null;
|
|
|
@@ -315,15 +316,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
315
|
316
|
String substrOne = filestr.substring(allindex.get(2)+1,allindex.get(3));
|
|
316
|
317
|
Integer series = null;
|
|
317
|
318
|
for (int i = 0; i < allindex.size()-2; i++) {
|
|
318
|
|
- String substr = filestr.substring(allindex.get(i+1)+1,allindex.get(i+2));
|
|
|
319
|
+ String substr = filestr.substring(allindex.get(i+2)+1,allindex.get(i+3));
|
|
319
|
320
|
series = i + 1;
|
|
320
|
321
|
|
|
321
|
322
|
if(series==1){
|
|
322
|
323
|
|
|
323
|
324
|
//查询这个级数的目录是否存在,若不存在,则新建这个目录
|
|
324
|
325
|
CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory();
|
|
325
|
|
-// caseEvidenceDirectoryselect.setCaseid(id);
|
|
326
|
|
- caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+1)+1,allindex.get(i+2)));
|
|
|
326
|
+ caseEvidenceDirectoryselect.setCaseId(id.intValue());
|
|
|
327
|
+ caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+2)+1,allindex.get(i+3)));
|
|
327
|
328
|
caseEvidenceDirectoryselect.setSeries(series);
|
|
328
|
329
|
List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect);
|
|
329
|
330
|
if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){
|
|
|
@@ -333,7 +334,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
333
|
334
|
caseEvidenceDirectory.setEvidenceName(substr);
|
|
334
|
335
|
caseEvidenceDirectory.setSeries(series);
|
|
335
|
336
|
|
|
336
|
|
- //caseEvidenceDirectory.setCaseid(id);
|
|
|
337
|
+ caseEvidenceDirectory.setCaseId(id.intValue());
|
|
337
|
338
|
caseEvidenceDirectory.setCreateBy(username);
|
|
338
|
339
|
caseEvidenceDirectory.setCreateTime(new Date());
|
|
339
|
340
|
|
|
|
@@ -343,8 +344,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
343
|
344
|
}else {
|
|
344
|
345
|
//查询这个级数的目录是否存在,若不存在,则新建这个目录
|
|
345
|
346
|
CaseEvidenceDirectory directoryselect = new CaseEvidenceDirectory();
|
|
346
|
|
-// directoryselect.setCaseid(id);
|
|
347
|
|
- directoryselect.setEvidenceName(filestr.substring(allindex.get(i+1)+1,allindex.get(i+2)));
|
|
|
347
|
+ directoryselect.setCaseId(id.intValue());
|
|
|
348
|
+ directoryselect.setEvidenceName(filestr.substring(allindex.get(i+2)+1,allindex.get(i+3)));
|
|
348
|
349
|
directoryselect.setSeries(series);
|
|
349
|
350
|
List<CaseEvidenceDirectory> evidenceDirectorys = caseEvidenceDirectoryMapper.selectList(directoryselect);
|
|
350
|
351
|
if(evidenceDirectorys!=null&&evidenceDirectorys.size()>0){
|
|
|
@@ -352,8 +353,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
352
|
353
|
}else {
|
|
353
|
354
|
Integer parentId = null;
|
|
354
|
355
|
CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory();
|
|
355
|
|
-// caseEvidenceDirectoryselect.setCaseid(id);
|
|
356
|
|
- caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i)+1,allindex.get(i+1)));
|
|
|
356
|
+ caseEvidenceDirectoryselect.setCaseId(id.intValue());
|
|
|
357
|
+ caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(i+1)+1,allindex.get(i+2)));
|
|
357
|
358
|
caseEvidenceDirectoryselect.setSeries(series-1);
|
|
358
|
359
|
List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect);
|
|
359
|
360
|
if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){
|
|
|
@@ -365,7 +366,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
365
|
366
|
caseEvidenceDirectory.setSeries(series);
|
|
366
|
367
|
caseEvidenceDirectory.setCreateBy(username);
|
|
367
|
368
|
caseEvidenceDirectory.setCreateTime(new Date());
|
|
368
|
|
- //caseEvidenceDirectory.setCaseid(id);
|
|
|
369
|
+ caseEvidenceDirectory.setCaseId(id.intValue());
|
|
369
|
370
|
|
|
370
|
371
|
caseEvidenceDirectory.setParentId(parentId);
|
|
371
|
372
|
|
|
|
@@ -425,8 +426,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
425
|
426
|
//保存到目录表
|
|
426
|
427
|
Integer parentId = null;
|
|
427
|
428
|
CaseEvidenceDirectory caseEvidenceDirectoryselect = new CaseEvidenceDirectory();
|
|
428
|
|
-// caseEvidenceDirectoryselect.setCaseid(id);
|
|
429
|
|
- caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(lastIndex-1)+1,allindex.get(lastIndex)));
|
|
|
429
|
+ caseEvidenceDirectoryselect.setCaseId(id.intValue());
|
|
|
430
|
+ caseEvidenceDirectoryselect.setEvidenceName(filestr.substring(allindex.get(lastIndex)+1,allindex.get(lastIndex+1)));
|
|
430
|
431
|
caseEvidenceDirectoryselect.setSeries(series-1);
|
|
431
|
432
|
List<CaseEvidenceDirectory> caseEvidenceDirectorys = caseEvidenceDirectoryMapper.selectList(caseEvidenceDirectoryselect);
|
|
432
|
433
|
if(caseEvidenceDirectorys!=null&&caseEvidenceDirectorys.size()>0){
|
|
|
@@ -439,7 +440,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|
439
|
440
|
caseEvidenceDirectory.setCreateBy(username);
|
|
440
|
441
|
caseEvidenceDirectory.setCreateTime(new Date());
|
|
441
|
442
|
caseEvidenceDirectory.setAnnexId(annexId);
|
|
442
|
|
- //caseEvidenceDirectory.setCaseid(id);
|
|
|
443
|
+ caseEvidenceDirectory.setCaseId(id.intValue());
|
|
443
|
444
|
|
|
444
|
445
|
caseEvidenceDirectory.setParentId(parentId);
|
|
445
|
446
|
|