From b4959b96ff1322f7269adbc4871240fcc0ab3ba7 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Fri, 20 Sep 2024 10:36:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91ocr?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E8=AF=81=E6=8D=AE=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supervision/police/dto/CaseEvidenceDTO.java  | 8 ++++++++
 .../police/service/impl/CaseEvidenceServiceImpl.java      | 3 +--
 .../police/service/impl/OCREvidenceServiceImpl.java       | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java b/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java
index 19388aa..fecbcdf 100644
--- a/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java
+++ b/src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java
@@ -1,5 +1,7 @@
 package com.supervision.police.dto;
 
+import cn.hutool.core.util.StrUtil;
+import com.supervision.constant.EvidencePropertyName;
 import com.supervision.police.domain.CaseEvidence;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -53,4 +55,10 @@ public class CaseEvidenceDTO {
         caseEvidence.setPartyB(this.partyB);
         return caseEvidence;
     }
+
+    public void setTitleProperty(){
+        if (StrUtil.isNotEmpty(this.evidenceName)){
+            this.property.put(EvidencePropertyName.TITLE.getName(), this.evidenceName);
+        }
+    }
 }
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 6f3865f..cedd47f 100644
--- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
@@ -1,13 +1,11 @@
 package com.supervision.police.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.supervision.police.domain.FileEvidenceProperty;
 import com.supervision.police.dto.RecordFileDTO;
 import com.supervision.police.service.*;
 import com.supervision.police.domain.CaseEvidence;
@@ -97,6 +95,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
 
         // 更新证据属性信息
         for (String fileId : caseEvidenceDTO.getFileIdList()) {
+            caseEvidenceDTO.setTitleProperty();
             ocrEvidenceService.saveEvidenceProperty(caseEvidence.getId(),fileId,caseEvidenceDTO.getProperty());
         }
 
diff --git a/src/main/java/com/supervision/police/service/impl/OCREvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/OCREvidenceServiceImpl.java
index 750830b..1dbe3ba 100644
--- a/src/main/java/com/supervision/police/service/impl/OCREvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/OCREvidenceServiceImpl.java
@@ -336,6 +336,7 @@ public class OCREvidenceServiceImpl implements OCREvidenceService {
         return EvidencePropertyName.getByNames(propertyMap)
                 .stream().map(evidence ->
                         new FileEvidenceProperty(evidenceId, fileId, evidence.getName(), propertyMap.get(evidence.getName())))
+                .filter(property -> StrUtil.isNotEmpty(property.getPropertyValue()))
                 .toList();
 
     }