From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 25 十月 2024 23:11:30 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 5f85dcb..c75e147 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
@@ -9,7 +9,9 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZSecret;
+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 +40,12 @@
@Autowired
private ZSecretService zSecretService;
+ @Autowired
+ private ZSecretShareService zSecretShareService;
+
+ @Autowired
+ private ZSecretDownloadService zSecretDownloadService;
+
/**
* 鏌ヨ鎵�鏈夎褰�
*/
@@ -46,6 +54,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();
}
/**
@@ -59,7 +72,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZSecret zSecret = new ZSecret();
List<ZSecret> emptyList = Collections.singletonList(zSecret);
@@ -67,13 +80,23 @@
util.exportExcel(response, emptyList, "钘忓績瀵嗚璁板綍鏁版嵁");
}
+ @Log(title = "钘忓績瀵嗚璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZSecret> list = zSecretService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZSecret> util = new ExcelUtil<>(ZSecret.class);
+ util.exportExcel(response, list, "钘忓績瀵嗚璁板綍鏁版嵁");
+ }
+
/**
* 瀵煎嚭钘忓績瀵嗚璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "钘忓績瀵嗚璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export/{ids}")
- public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response,@PathVariable Long[] ids)
{
List<ZSecret> list = zSecretService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}",list);
@@ -121,6 +144,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (zSecretDownloadService.deleteData(ids) && zSecretShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
return toAjax(zSecretService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.1