Yaxin
/
fu-hsi-service
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修复bug

Browse Source
topo_dev
xueqingkun 6 months ago
parent 1d9dc1a417
commit c494ecc203
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java
Unescape Escape View File

@ -86,6 +86,8 @@ public class CaseEvidenceDetailDTO {
private String fileId;
private int directoryLevel;
public CaseEvidenceDetailDTO() {
}

2
src/main/java/com/supervision/police/service/CaseEvidenceService.java
Unescape Escape View File

@ -154,5 +154,5 @@ public interface CaseEvidenceService extends IService<CaseEvidence> {
void syncEvidenceAnalysis(List<CaseEvidenceDetailDTO> evidenceList);
void updateEvidenceAppendProcessingNewTransaction(String evidenceId, String appendProcessing);
void updateEvidenceAppendProcessingNewTransaction(String evidenceId, String status,String appendProcessing);
}

17
src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
Unescape Escape View File

@ -586,6 +586,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
List<EvidenceFileDTO> ocrFileDTOList = evidenceList.stream().filter(
// 当前目录下不是所有文件都是新增
evidenceDetail-> !evidenceDetail.getFileList().stream().allMatch(file -> StrUtil.equalsAny(file.getUpdateStatus(), "1", "-1"))
|| evidenceDetail.getDirectoryLevel() < 3
)
.flatMap(evidenceDetailDTO -> evidenceDetailDTO.getFileList().stream().filter(file -> StrUtil.equals(file.getUpdateStatus(), "1"))).toList();
if (CollUtil.isNotEmpty(ocrFileDTOList)){
@ -596,7 +597,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
for (Map.Entry<String, List<EvidenceFileDTO>> entry : evidenceMap.entrySet()) {
String evidenceId = entry.getKey();
// 首先统一更新为正在处理
updateEvidenceAppendProcessingNewTransaction(evidenceId,"1");
CaseEvidence one = this.lambdaQuery().eq(CaseEvidence::getId, evidenceId).one();
updateEvidenceAppendProcessingNewTransaction(evidenceId,one.getProcessStatus(),"1");
}
for (Map.Entry<String, List<EvidenceFileDTO>> entry : evidenceMap.entrySet()) {
@ -605,13 +608,15 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
for (EvidenceFileDTO evidenceFileDTO : value) {
fileOcrProcessService.multipleTypeOcrProcess(List.of(evidenceFileDTO.getFileId()),evidenceFileDTO.getFileType());
}
updateEvidenceAppendProcessingNewTransaction(evidenceId,"0");
log.info("ocrAndExtract:证据:{} 文件内容识别完成", evidenceId);
updateEvidenceAppendProcessingNewTransaction(evidenceId,EvidenceConstants.PROCESS_STATUS_SUCCESS,"0");
}
}
Set<String> evidenceIds = evidenceList.stream().filter(
// 当前目录下不是所有文件都是新增
evidenceDetail -> evidenceDetail.getFileList().stream().allMatch(file -> StrUtil.equalsAny(file.getUpdateStatus(), "1", "-1"))
&& evidenceDetail.getDirectoryLevel() == 3
)
.flatMap(evidenceDetailDTO -> evidenceDetailDTO.getFileList().stream().filter(file -> StrUtil.equals(file.getUpdateStatus(), "1"))
.map(EvidenceFileDTO::getEvidenceId)).collect(Collectors.toSet());
@ -625,8 +630,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
@Override
@Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
public void updateEvidenceAppendProcessingNewTransaction(String evidenceId, String appendProcessing) {
public void updateEvidenceAppendProcessingNewTransaction(String evidenceId, String status,String appendProcessing) {
this.lambdaUpdate().eq(CaseEvidence::getId, evidenceId)
.set(StrUtil.isNotEmpty(status),CaseEvidence::getProcessStatus, status)
.set(CaseEvidence::getAppendProcessing, appendProcessing)
.set(CaseEvidence::getUpdateTime, LocalDateTime.now()).update();
}
@ -946,6 +952,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
caseEvidenceDetailDTO.setId(DefaultIdentifierGenerator.getInstance().nextId(null).toString());
caseEvidenceDetailDTO.setEvidenceType(directory.getCategoryId());
caseEvidenceDetailDTO.setDirectoryId(directoryId);
caseEvidenceDetailDTO.setDirectoryLevel(directory.getLevel());
EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO();
evidenceFileDTO.setFileId(fileId);
evidenceFileDTO.setProcessStatus(EvidenceConstants.PROCESS_STATUS_UNPROCESSED);
@ -974,6 +981,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
caseEvidenceDetailDTO.setEvidenceName(evidenceFile.getDirectoryName());
caseEvidenceDetailDTO.setEvidenceType(directory.getCategoryId());
caseEvidenceDetailDTO.setDirectoryId(directoryId);
caseEvidenceDetailDTO.setDirectoryLevel(directory.getLevel());
List<EvidenceFileDTO> evidenceFileDTOS = new ArrayList<>();
for (String fileId : evidenceFile.getFileIdList()) {
EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO();
@ -1101,7 +1109,8 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
for (CaseEvidenceDetailDTO newEvidence : newEvidenceList) {
if (StrUtil.isEmpty(newEvidence.getId())) {
if (StrUtil.isEmpty(newEvidence.getId()) ||
oldEvidenceList.stream().noneMatch(i -> StrUtil.equals(i.getId(), newEvidence.getId()))) {
newEvidence.setUpdateStatus("1");
List<String> newFileIds = newEvidence.getFileList().stream().map(EvidenceFileDTO::getFileId).toList();
for (EvidenceFileDTO evidenceFileDTO : newEvidence.getFileList()) {

2
src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java
Unescape Escape View File

@ -208,7 +208,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
.eq(ModelAtomicIndex::getDataStatus, DataStatus.AVAILABLE.getCode()).last("limit 1").one();
if (ObjectUtil.isNotEmpty(existIndex) && !StringUtils.equals(modelAtomicIndex.getId(), existIndex.getId())) {
throw new RuntimeException("已存在相同名称的原子指标");
throw new IllegalArgumentException("已存在相同名称的原子指标");
}
boolean success = modelAtomicIndexService.saveOrUpdate(modelAtomicIndex);

Write Preview
Loading…
Cancel
Save