From 7f94132ce1e9abe5a1ed9bcf94ca8e8196772f17 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 1 Apr 2022 10:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=BA=93=E7=BC=96=E8=BE=91=E6=96=87=E4=BB=B6=E5=90=8Ees?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 1b0476151..bcbc097bd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1828,7 +1828,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //删除文件
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll((String) map.get("id"));
 
-        List<String> connectIdList = new ArrayList<>();
+        List<String> connectIdList = new ArrayList<>();//已删除的文件关联id
         for (OnlCgformField onlCgformField : fieldFileList) {
             String connectId = (String) mapList.get(0).get(onlCgformField.getDbFieldName());
             //如果文件没有修改则不用删除
@@ -1836,7 +1836,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 connectIdList.add(connectId);
             }
         }
-
+        //查询已删除的文件id(用于es删除)
+        List<String> fileIdListDelete = new ArrayList<>();
+        if(connectIdList.size() != 0){
+            List<OSSFile> fileInfosByConnectId = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectIdList, ","));
+            fileIdListDelete = fileInfosByConnectId.stream().map(OSSFile::getId).collect(Collectors.toList());
+        }
         //删除文件
         iOSSFileService.deleteByConnectIdList(connectIdList);
         //删除文档库数据
@@ -1870,6 +1875,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             for (Map<String, Object> objectMap : mapListTempEn) {
                 jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), (String) objectMap.get("id"));
             }
+            //处理编辑时已删除的文件(在es中同步删除文件单独生成的一条数据)
+            if(fileIdListDelete.size() != 0){
+                for (String fileId : fileIdListDelete) {
+                    jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(),
+                            SearchEnum.FULL_TEXT_SEARCH_CN.getValue(),
+                            (String) map.get("id")+fileId);
+                    jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(),
+                            SearchEnum.FULL_TEXT_SEARCH_EN.getValue(),
+                            (String) map.get("id")+fileId);
+                }
+            }
             jeroElasticsearchTemplate.saveOrUpdate(SearchEnum.INDEX_NAME_DOCUMENT.getValue(), SearchEnum.TYPE_NAME_DOCUMENT.getValue(), (String) map.get("id"), jsonObject);
             //添加全文
             jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), arrayCn);