From 5feabe5bf3ac7be09dd3dd533f13f2b8a95fe3cb Mon Sep 17 00:00:00 2001
From: hello-hao <923453645@qq.com>
Date: Fri, 8 Apr 2022 19:07:50 +0800
Subject: [PATCH] =?UTF-8?q?:art:=E5=AE=8C=E5=96=84=E6=96=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hellohao/controller/AdminController.java  |  4 ++--
 .../hellohao/controller/AlbumController.java  | 19 +++++++++++++++++++
 .../hellohao/controller/IndexController.java  |  4 ++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/hellohao/controller/AdminController.java b/src/main/java/cn/hellohao/controller/AdminController.java
index af25fb0..03174c3 100644
--- a/src/main/java/cn/hellohao/controller/AdminController.java
+++ b/src/main/java/cn/hellohao/controller/AdminController.java
@@ -473,7 +473,7 @@ public class AdminController {
                 try {
                     imgTempService.delImgAndExp(image.getImguid());
                     imgService.deleimg(imgid);
-                    imgAndAlbumService.deleteImgAndAlbum(imgname);
+                    imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
                 } catch (Exception e) {
                     e.printStackTrace();
                     msg.setInfo("图片记录删除失败，请重试");
@@ -484,7 +484,7 @@ public class AdminController {
             }else{
                 imgTempService.delImgAndExp(image.getImguid());
                 imgService.deleimg(imgid);
-                imgAndAlbumService.deleteImgAndAlbum(imgname);
+                imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
                 msg.setInfo("图片记录已删除，但是图片源删除失败");
             }
         }
diff --git a/src/main/java/cn/hellohao/controller/AlbumController.java b/src/main/java/cn/hellohao/controller/AlbumController.java
index 1bc6327..c5b2b37 100644
--- a/src/main/java/cn/hellohao/controller/AlbumController.java
+++ b/src/main/java/cn/hellohao/controller/AlbumController.java
@@ -100,6 +100,25 @@ public class AlbumController {
 
     }
 
+    //后台列表要修改时的查询表单
+    @PostMapping("/admin/getAlbumListForKey") //new
+    @ResponseBody
+    public Msg getAlbumListForKey(@RequestParam(value = "data", defaultValue = "") String data){
+        Msg msg = new Msg();
+        try{
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            String key = jsonObject.getString("key");
+            List<Images> imagesList =  imgAndAlbumService.selectImgForAlbumkey(key);
+            msg.setData(imagesList);
+        }catch (Exception e){
+            e.printStackTrace();
+            msg.setCode("500");
+            msg.setInfo("获取画廊数据错误");
+        }
+        return msg;
+
+    }
+
     @PostMapping("/getAlbumImgList") //new
     @ResponseBody
     public Msg getAlbumImgList(@RequestParam("data") String data) {
diff --git a/src/main/java/cn/hellohao/controller/IndexController.java b/src/main/java/cn/hellohao/controller/IndexController.java
index 3a3d446..fb44748 100644
--- a/src/main/java/cn/hellohao/controller/IndexController.java
+++ b/src/main/java/cn/hellohao/controller/IndexController.java
@@ -300,7 +300,7 @@ public class IndexController {
         //删除库
         if(isDele){
             try {
-                imgAndAlbumService.deleteImgAndAlbum(imgname);
+                imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
                 imgTempService.delImgAndExp(image.getImguid());
                 imgService.deleimg(image.getId());
             } catch (Exception e) {
@@ -311,7 +311,7 @@ public class IndexController {
             }
             msg.setInfo("删除成功");
         }else{
-            imgAndAlbumService.deleteImgAndAlbum(imgname);
+            imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());
             imgTempService.delImgAndExp(image.getImguid());
             imgService.deleimg(image.getId());
             msg.setInfo("图片记录已删除，但是图片源删除失败");