From 4215ced06b40268e9f3c8ef6915998fbe64013b4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 24 十月 2024 09:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteShareServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteShareServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteShareServiceImpl.java
index 673e8ff..6bc2da6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteShareServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteShareServiceImpl.java
@@ -5,19 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfShareMapper;
-import com.ruoyi.service.ZSelfNoteService;
+import com.ruoyi.service.*;
import com.ruoyi.service.ZSelfNoteShareService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZSelfNoteShareService;
+import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -32,6 +35,13 @@
@Resource
private ZInfoUserService zInfoUserService;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
+
+ @Resource
+ EsService esService;
+
private LambdaQueryWrapper<ZfShare> uniqueCondition(ZfShare zfShare) {
LambdaQueryWrapper<ZfShare> lqw = new LambdaQueryWrapper<>();
@@ -189,6 +199,41 @@
}
}
+ @Override
+ public Boolean deleteByContentId(Long[] ids) {
+ List<Long> id = new ArrayList<>();
+ LambdaQueryWrapper<ZfShare> lqw = new LambdaQueryWrapper<>();
+ lqw.in(ids != null, ZfShare::getShareContent, ids)
+ .eq(ZfShare::getSysMenuId, 2010L);
+ List<ZfShare> zfShares = list(lqw);
+ if (zfShares.size() == 0) {
+ return true;
+ }
+ for (ZfShare zfShare : zfShares) {
+ id.add(zfShare.getId());
+ }
+
+ System.out.println(id);
+ if (removeByIds(id)) {
+ //鍒犻櫎es涓殑鏁版嵁
+ zfShares.forEach(zfDoctorDownload -> {
+ EsModel esModel = esService.findByCtId(zfDoctorDownload.getId().intValue(), "涓汉璁颁簨鏈垎浜垹闄�");
+ if (esModel != null) {
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ System.out.println(deleteRequest);
+ try {
+ restHighLevelClient.delete(deleteRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ return true;
+ } else {
+ return false;
+ }
+
+ }
}
--
Gitblit v1.9.1