71060修改,最近浏览文档库法规月报知识分享删除后同时删除最近浏览信息.

2023-06-20 15:46:11 +08:00
parent b6206043e0
commit b4adbd6f8b
5 changed files with 43 additions and 0 deletions
@@ -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) {
@@ -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);
 }
@@ -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);
+    }
 }
@@ -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);
 		}
@@ -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);
    }

 	/**