From fe512841e70c9dae6097251aa65708fe18314ae2 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:41:57 +0800
Subject: [PATCH] 对象存储地址修改为bendudu的&一个接口--将原本存在本地的文件图片上传到存储桶中

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
index aa5e2a4..8f87f85 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
@@ -9,13 +9,17 @@
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZSelfNote;
+import com.ruoyi.service.ZSelfNoteDownloadService;
 import com.ruoyi.service.ZSelfNoteService;
+import com.ruoyi.service.ZSelfNoteShareService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.websocket.server.PathParam;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -38,6 +42,15 @@
     @Autowired
     private ZSelfNoteService zSelfNoteService;
 
+    @Autowired
+    private ZSelfNoteShareService zSelfNoteShareService;
+
+    @Autowired
+    private ZSelfNoteDownloadService zSelfNoteDownloadService;
+
+
+
+
     /**
      * 鏌ヨ鎵�鏈夎褰�
      */
@@ -52,14 +65,14 @@
      * 鏍规嵁id鏌ヨ
      */
     @GetMapping()
-    public AjaxResult listById(Long id){
+    public AjaxResult listById(@PathParam("id") Long id){
         return AjaxResult.success(zSelfNoteService.getById(id));
     }
 
     /**
      * 妯℃澘
      */
-    @GetMapping("/model")
+    @PostMapping("/model")
     public void getModel(HttpServletResponse response){
         ZSelfNote zSelfNote = new ZSelfNote();
         List<ZSelfNote> emptyList = Collections.singletonList(zSelfNote);
@@ -72,8 +85,20 @@
      */
 //    @PreAuthorize("@ss.hasPermi('system:property:export')")
     @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.EXPORT)
-    @PostMapping("/export/{ids}")
-    public void export(HttpServletResponse response,@PathVariable Long[] ids)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response)
+    {
+        List<ZSelfNote> list = zSelfNoteService.selectByCondition();
+        log.info("瀵煎嚭璁板綍涓�:{}",list);
+        log.info("瀵煎嚭璁板綍涓�:{}",list);
+
+        ExcelUtil<ZSelfNote> util = new ExcelUtil<>(ZSelfNote.class);
+        util.exportExcel(response, list, "涓汉璁颁簨鏈褰曟暟鎹�");
+    }
+
+    @Log(title = "涓汉璁颁簨鏈褰�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export1/{ids}")
+    public void export1(HttpServletResponse response,@PathVariable Long[] ids)
     {
         List<ZSelfNote> list = zSelfNoteService.selectByIds(ids);
         log.info("瀵煎嚭璁板綍涓�:{}",list);
@@ -121,6 +146,9 @@
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        if (! (zSelfNoteDownloadService.deleteData(ids) && zSelfNoteShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         return toAjax(zSelfNoteService.removeByIds(Arrays.asList(ids)));
     }
 

--
Gitblit v1.9.1