From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index 2d130bd..9b965a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -8,8 +8,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.MemoBook;
import com.ruoyi.domain.ZSecret;
+import com.ruoyi.service.MemoBookService;
+import com.ruoyi.service.ZSecretDownloadService;
import com.ruoyi.service.ZSecretService;
+import com.ruoyi.service.ZSecretShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -38,6 +42,15 @@
@Autowired
private ZSecretService zSecretService;
+ @Autowired
+ private ZSecretShareService zSecretShareService;
+
+ @Autowired
+ private ZSecretDownloadService zSecretDownloadService;
+
+ @Autowired
+ private MemoBookService memoBookService;
+
/**
* 鏌ヨ鎵�鏈夎褰�
*/
@@ -46,6 +59,11 @@
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zSecretService.selectDataList(zSecret,pageNum,pageSize);
+ }
+
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zSecretService.listType();
}
/**
@@ -131,6 +149,14 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ for (Long id: ids) {
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2031L);
+ if (!memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
+ }
+ if (! (zSecretDownloadService.deleteData(ids) && zSecretShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
return toAjax(zSecretService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.1