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/ZfEventDownloadServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventDownloadServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventDownloadServiceImpl.java
index 22e1f7f..1a19e33 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventDownloadServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventDownloadServiceImpl.java
@@ -81,7 +81,7 @@
String uuid = UUID.randomUUID().toString().replace("-", "");
esModel.setId(uuid);
esModel.setCtId(Long.valueOf(inte));
- esModel.setCtTableName("瀹跺涵灏忓尰鐢�");
+ esModel.setCtTableName("瀹跺ぇ浜嬭");
esModel.setBy1(String.valueOf(zfDownload.getDownloadId()));
esModel.setBy2(String.valueOf(zfDownload.getDownloadContent()));
@@ -95,17 +95,30 @@
}
@Override
- public AjaxResult deleteData(Long[] ids) {
- List<ZfDownload> zfDownloads = listByIds(Arrays.asList(ids));
+ public Boolean deleteData(Long[] ids) {
+ List<Long> id = new ArrayList<>();
- if (zfEventShareService.removeByIds(Arrays.asList(ids))) {
+ LambdaQueryWrapper<ZfDownload> lqw = new LambdaQueryWrapper<>();
+ lqw.in(ids != null, ZfDownload::getDownloadContent, ids)
+ .eq(ZfDownload::getSysMenuId, 2013L);
+ List<ZfDownload> zfDownloads = list(lqw);
+ System.out.println(zfDownloads);
+ if (zfDownloads.size() == 0){
+ return true;
+ }
+ for (ZfDownload zfDownload: zfDownloads) {
+ id.add(zfDownload.getId());
+ }
+
+ System.out.println(id);
+ if (removeByIds(id)) {
//鍒犻櫎es涓殑鏁版嵁
- zfDownloads.stream().forEach(zfDoctorDownload -> {
- EsModel esModel = esService.findByCtId(zfDoctorDownload.getId().intValue(), "瀹跺涵灏忓尰鐢熶笅杞�");
-
+ zfDownloads.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) {
@@ -113,9 +126,9 @@
}
}
});
- return AjaxResult.success();
+ return true;
} else {
- return AjaxResult.error();
+ return false;
}
}
--
Gitblit v1.9.1