From a007fb77d5fd44b5c9b52c5d6a5f057f4dabedb1 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Fri, 25 Oct 2024 17:17:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E8=AF=81=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/police/dto/EvidenceDirectoryDTO.java |  9 ++++-----
 .../police/service/CaseEvidenceService.java          |  2 +-
 .../police/service/impl/CaseEvidenceServiceImpl.java | 12 ++++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java b/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java
index c07f087..d5df6c2 100644
--- a/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java
+++ b/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java
@@ -196,11 +196,10 @@ public class EvidenceDirectoryDTO {
         if (CollUtil.isNotEmpty(evidenceFileDTOS)){
             evidenceFileDTOS.sort(Comparator.comparingInt(EvidenceFileDTO::getRank));
             this.fileInfoList.addAll(evidenceFileDTOS);
-        }else {
-            if (CollUtil.isNotEmpty(this.getChild())){
-                for (EvidenceDirectoryDTO directoryDTO : this.child) {
-                    directoryDTO.appendChildFile(fileMap);
-                }
+        }
+        if (CollUtil.isNotEmpty(this.getChild())){
+            for (EvidenceDirectoryDTO directoryDTO : this.child) {
+                directoryDTO.appendChildFile(fileMap);
             }
         }
 
diff --git a/src/main/java/com/supervision/police/service/CaseEvidenceService.java b/src/main/java/com/supervision/police/service/CaseEvidenceService.java
index 74f3ec7..f712c0b 100644
--- a/src/main/java/com/supervision/police/service/CaseEvidenceService.java
+++ b/src/main/java/com/supervision/police/service/CaseEvidenceService.java
@@ -125,7 +125,7 @@ public interface CaseEvidenceService  extends IService<CaseEvidence> {
     String ocrAndExtract(String caseId, List<EvidenceDirectoryDTO> evidenceFileDTOS);
 
 
-    String updateCaseEvidence4NewTransaction(List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOList);
+    String updateCaseEvidence(List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOList);
 
     /**
      * 证据识别并提取列表
diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
index 1e630f9..db0edbf 100644
--- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
@@ -478,9 +477,10 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
 
         List<CaseEvidenceDetailDTO> operationalEvidenceList = findChangedEvidence(oldEvidences, newEvidences);
 
-        String batchId = ((CaseEvidenceService) AopContext.currentProxy()).updateCaseEvidence4NewTransaction(operationalEvidenceList);
+        String batchId = updateCaseEvidence(operationalEvidenceList);
 
-        syncEvidenceAnalysis(operationalEvidenceList);
+        // 异步调用
+        ((CaseEvidenceService) AopContext.currentProxy()).syncEvidenceAnalysis(operationalEvidenceList);
 
         return batchId;
 
@@ -531,8 +531,8 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
      * @return
      */
     @Override
-    @Transactional(transactionManager = "dataSourceTransactionManager", propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
-    public String updateCaseEvidence4NewTransaction(List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOList) {
+    @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class)
+    public String updateCaseEvidence(List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOList) {
 
         String batchNo = DateTime.now().toString("yyyyMMddHHmmss");
         for (CaseEvidenceDetailDTO evidence : caseEvidenceDetailDTOList) {
@@ -629,7 +629,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
                     .set(CaseEvidence::getTitle, CollUtil.getFirst(value).getTitle())
                     .set(CaseEvidence::getProvider, CollUtil.getFirst(value).getProvider())
                     .set(CaseEvidence::getProcessStatus, EvidenceConstants.PROCESS_STATUS_VERIFIED)// 设置状态为已核实
-                    .set(CaseEvidence::getTitle, CollUtil.getFirst(value).getEvidenceName())
+                    .set(CaseEvidence::getEvidenceName, CollUtil.getFirst(value).getEvidenceName())
                     .update();
 
             // 修改ocr内容