From b4adbd6f8bf6a7c4cd8661a0dbd12c429b9f5d52 Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Tue, 20 Jun 2023 15:46:11 +0800
Subject: [PATCH] =?UTF-8?q?71060=E4=BF=AE=E6=94=B9,=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=20=E6=96=87=E6=A1=A3=E5=BA=93=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=9C=88=E6=8A=A5=20=E7=9F=A5=E8=AF=86=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=20=20=E5=88=A0=E9=99=A4=E5=90=8E=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=80=E8=BF=91=E6=B5=8F=E8=A7=88=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java |  9 +++++++++
 .../modules/phone/service/IRecentBrowseService.java    |  7 +++++++
 .../phone/service/impl/RecentBrowseServiceImpl.java    |  9 +++++++++
 .../impl/ProblemKnowledgeBaseEOServiceImpl.java        | 10 ++++++++++
 .../impl/LawsMonthlyReportManageEOServiceImpl.java     |  8 ++++++++
 5 files changed, 43 insertions(+)

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 a01f25fa6..eec1324ca 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
@@ -56,6 +56,9 @@ import com.jero.modules.message.websocket.WebSocket;
 import com.jero.modules.ocr.service.IOcrRecordEOService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.phone.entity.RecentBrowse;
+import com.jero.modules.phone.enums.BrowseTypeEnum;
+import com.jero.modules.phone.service.IRecentBrowseService;
 import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum;
 import com.jero.modules.split.common.FileUnZip;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
@@ -195,6 +198,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     private OnlCgformSubscribeMapper onlCgformSubscribeMapper;
     @Autowired
     private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService;
+    @Autowired
+    private IRecentBrowseService recentBrowseService;
 
     @Value(value = "${jero.path.upload}")
     private String uploadpath;
@@ -214,6 +219,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     @Override
     public void deleteById(String id) {
         removeById(id);
+        // 删除文档库浏览记录表信息.
+        this.recentBrowseService.deleteByBrowseTypeAndBrowseDataIdList(BrowseTypeEnum.WDK.getValue(),Arrays.asList(id.split(",")));
     }
 
     /**
@@ -352,6 +359,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             e.printStackTrace();
             log.error("文档库删除es失败");
         }
+        // 删除文档库浏览记录表信息.
+        this.recentBrowseService.deleteByBrowseTypeAndBrowseDataIdList(BrowseTypeEnum.WDK.getValue(),ids);
     }
 
     private void updateDeletedDate(List<String> ids) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/IRecentBrowseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/IRecentBrowseService.java
index 1b78bdfb8..82df0706b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/IRecentBrowseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/IRecentBrowseService.java
@@ -63,4 +63,11 @@ public interface IRecentBrowseService extends IService<RecentBrowse> {
     List<RecentBrowse> queryList();
 
     Result<?> queryPageList(RecentBrowse recentBrowse, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+	/**
+	 * 根据浏览类型和浏览数据id删除数据
+	 * @param browseType
+	 * @param browseDataIdList
+	 */
+    void deleteByBrowseTypeAndBrowseDataIdList(String browseType, List<String> browseDataIdList);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/RecentBrowseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/RecentBrowseServiceImpl.java
index b85670da0..a6dd0f077 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/RecentBrowseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/RecentBrowseServiceImpl.java
@@ -215,4 +215,13 @@ public class RecentBrowseServiceImpl extends ServiceImpl<RecentBrowseMapper, Rec
             }
         }
     }
+
+
+    @Override
+    public void deleteByBrowseTypeAndBrowseDataIdList(String browseType, List<String> browseDataIdList) {
+        QueryWrapper<RecentBrowse> rbRemoveWrap = new QueryWrapper<>();
+        rbRemoveWrap.lambda().eq(RecentBrowse::getBrowseType, browseType);
+        rbRemoveWrap.lambda().in(RecentBrowse::getBrowseDataId, browseDataIdList);
+        this.remove(rbRemoveWrap);
+    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index d1d3f636a..1efb0c122 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -23,6 +23,8 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.message.websocket.WebSocket;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.phone.enums.BrowseTypeEnum;
+import com.jero.modules.phone.service.IRecentBrowseService;
 import com.jero.modules.problemKnowledgeBase.entity.*;
 import com.jero.modules.problemKnowledgeBase.enums.CollectStatusEnum;
 import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum;
@@ -99,6 +101,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 	private ISysDepartService sysDepartService;
 	@Autowired
 	private ISysUserService sysUserService;
+	@Autowired
+	private IRecentBrowseService recentBrowseService;
 
 
 	public static final String SEARCH_FLAG = "魑";
@@ -473,6 +477,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 	@Override
     public void deleteById(String id) {
         removeById(id);
+
+		// 删除知识分享浏览记录表信息.
+		this.recentBrowseService.deleteByBrowseTypeAndBrowseDataIdList(BrowseTypeEnum.ZSFX.getValue(),Arrays.asList(id.split(",")));
     }
 
 	/**
@@ -497,6 +504,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
         this.problemKnowledgeBaseCommentEOService.remove(deleteWrapper);
 
+		// 删除知识分享浏览记录表信息.
+		this.recentBrowseService.deleteByBrowseTypeAndBrowseDataIdList(BrowseTypeEnum.ZSFX.getValue(),ids);
+
 		for (String problemKnowledgeBaseId : ids) {
 			this.deleteElasticsearchData(problemKnowledgeBaseId);
 		}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
index 3a4660935..c3fc79ea7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
@@ -16,6 +16,8 @@ import com.jero.modules.document.utils.ReadWordUtil;
 import com.jero.modules.dummy.enums.InventoryStateEnum;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.phone.enums.BrowseTypeEnum;
+import com.jero.modules.phone.service.IRecentBrowseService;
 import com.jero.modules.report.entity.LawsMonthlyReportManageEO;
 import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper;
 import com.jero.modules.report.service.ILawsMonthlyReportManageEOService;
@@ -52,6 +54,8 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 
 	public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据)
 
+	@Autowired
+	private IRecentBrowseService recentBrowseService;
 
 	/**
 	 * 保存
@@ -90,6 +94,8 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 	@Override
     public void deleteById(String id) {
         removeById(id);
+		// 删除法规月报浏览记录表信息.
+		this.recentBrowseService.deleteByBrowseTypeAndBrowseDataIdList(BrowseTypeEnum.FGYB.getValue(),Arrays.asList(id.split(",")));
     }
 
 	/**
@@ -101,6 +107,8 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 	@Override
     public void deleteByIds(List<String> ids) {
         removeByIds(ids);
+		// 删除法规月报浏览记录表信息.
+		this.recentBrowseService.deleteByBrowseTypeAndBrowseDataIdList(BrowseTypeEnum.FGYB.getValue(),ids);
     }
 
 	/**