|
|
|
@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
|
|
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
|
|
|
|
@ -941,6 +942,8 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
|
|
|
|
|
if (directory.getLevel() == 1 || directory.getLevel() == 2) {
|
|
|
|
|
for (String fileId : evidenceFile.getFileIdList()) {
|
|
|
|
|
CaseEvidenceDetailDTO caseEvidenceDetailDTO = new CaseEvidenceDetailDTO();
|
|
|
|
|
// 预先生成证据id
|
|
|
|
|
caseEvidenceDetailDTO.setId(DefaultIdentifierGenerator.getInstance().nextId(null).toString());
|
|
|
|
|
caseEvidenceDetailDTO.setEvidenceType(directory.getCategoryId());
|
|
|
|
|
caseEvidenceDetailDTO.setDirectoryId(directoryId);
|
|
|
|
|
EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO();
|
|
|
|
@ -953,6 +956,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
|
|
|
|
|
caseEvidenceDetailDTO.setEvidenceName(minioFile.getFilename().split("\\.")[0]);
|
|
|
|
|
evidenceFileDTO.setFileType(minioFile.getFileType());
|
|
|
|
|
evidenceFileDTO.setFileName(minioFile.getFilename());
|
|
|
|
|
evidenceFileDTO.setEvidenceId(caseEvidenceDetailDTO.getId());
|
|
|
|
|
}
|
|
|
|
|
caseEvidenceDetailDTO.setFileList(List.of(evidenceFileDTO));
|
|
|
|
|
caseEvidenceDetailDTOS.add(caseEvidenceDetailDTO);
|
|
|
|
|