1. 修复证据改造bug

topo_dev
xueqingkun 6 months ago
parent e62774775c
commit 4ca07fc95b

@ -1,5 +1,6 @@
package com.supervision.common.constant; package com.supervision.common.constant;
import java.util.List;
import java.util.Map; import java.util.Map;
public class EvidenceConstants { public class EvidenceConstants {
@ -49,4 +50,9 @@ public class EvidenceConstants {
PROCESS_STATUS_FAILED,"3", PROCESS_STATUS_FAILED,"3",
PROCESS_STATUS_VERIFIED,"4"); PROCESS_STATUS_VERIFIED,"4");
public static final List<String> PROCESS_STATUS_UNFINISHED = List.of(PROCESS_STATUS_UNPROCESSED,
PROCESS_STATUS_OCR_OK,
PROCESS_STATUS_TITLE_EXTRACT_OK,
PROCESS_STATUS_ATTR_EXTRACT_OK);
} }

@ -62,7 +62,7 @@ public class EvidenceProcessDTO {
private String attachmentSize; private String attachmentSize;
/** /**
* * 0: 1 2
*/ */
private String status; private String status;
@ -86,10 +86,14 @@ public class EvidenceProcessDTO {
} }
this.evidenceType = caseEvidence.getEvidenceType(); this.evidenceType = caseEvidence.getEvidenceType();
if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())) { if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())) {
if (StrUtil.isEmpty(caseEvidence.getAppendProcessing()) || StrUtil.equals(caseEvidence.getAppendProcessing(),"0")){ if (EvidenceConstants.PROCESS_STATUS_UNFINISHED.contains(caseEvidence.getProcessStatus())){
this.status = "2";// 处理完成
}else if (StrUtil.equals(caseEvidence.getAppendProcessing(),"1")){
this.status = "1";// 处理中 this.status = "1";// 处理中
}else {
if (StrUtil.isEmpty(caseEvidence.getAppendProcessing()) || StrUtil.equals(caseEvidence.getAppendProcessing(),"0")){
this.status = "2";// 处理完成
}else if (StrUtil.equals(caseEvidence.getAppendProcessing(),"1")){
this.status = "1";// 处理中
}
} }
}else { }else {
this.status = EvidenceConstants.PROCESS_STATUS_UNPROCESSED; this.status = EvidenceConstants.PROCESS_STATUS_UNPROCESSED;

@ -1,7 +1,6 @@
package com.supervision.police.dto.indexRule; package com.supervision.police.dto.indexRule;
import lombok.Data; import lombok.Data;
import org.springframework.context.ApplicationContext;
import java.util.Map; import java.util.Map;
@ -22,7 +21,4 @@ public class AtomicResultContent {
private Map<String, Object> properties; private Map<String, Object> properties;
ApplicationContext applicationContext;
} }

Loading…
Cancel
Save