From a10b8715cefc329743dd9bbf99f61175745d2017 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 18 Mar 2021 16:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=AD=E6=96=87=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/domain/SysIngredentFile.java       |  2 ++
 .../impl/SysIngredientServiceImpl.java        |  4 ++--
 .../src/views/custom/ingredient/index.vue     | 20 ++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java
index 88effbaf9..1dd391cd6 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java
@@ -13,6 +13,8 @@ public class SysIngredentFile {
 
     String url;
 
+    String previewUrl;
+
     String name;
 
     Integer delFlag;
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java
index e785c9022..d12714b31 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java
@@ -40,7 +40,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
             List<SysIngredentFile> imgList = ingredient.getImgList();
             if (StringUtils.isNotEmpty(imgList)) {
                 for (SysIngredentFile file : imgList) {
-                    file.setUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl()));
+                    file.setPreviewUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl()));
                 }
             }
         }
@@ -61,7 +61,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
                 List<SysIngredentFile> imgList = ingredient.getImgList();
                 if (StringUtils.isNotEmpty(imgList)) {
                     for (SysIngredentFile file : imgList) {
-                        file.setUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl()));
+                        file.setPreviewUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl()));
                     }
                 }
             }
diff --git a/stdiet-ui/src/views/custom/ingredient/index.vue b/stdiet-ui/src/views/custom/ingredient/index.vue
index a191c825d..37e214f60 100644
--- a/stdiet-ui/src/views/custom/ingredient/index.vue
+++ b/stdiet-ui/src/views/custom/ingredient/index.vue
@@ -592,6 +592,11 @@ export default {
                   ).dictValue
               )
           : [];
+        this.form.imgList = this.form.imgList.map((obj) => ({
+          url: obj.previewUrl,
+          name: obj.name,
+          fileUrl: obj.url,
+        }));
         this.open = true;
         this.title = "修改食材";
       });
@@ -604,7 +609,7 @@ export default {
           params.imgList = params.imgList.reduce((arr, cur) => {
             if (cur.url) {
               arr.push({
-                url: cur.url.substring(0, cur.url.indexOf("?")),
+                url: cur.fileUrl,
                 name: cur.name,
               });
             }
@@ -668,11 +673,15 @@ export default {
     },
     handleOnUploadSuccess(res, file, fileList) {
       this.form.imgList = fileList.map((data) => {
-        const { name, url, response } = data;
+        const { name, url, fileUrl, response } = data;
         if (response) {
-          return { url: response.previewUrl, name: response.fileName };
+          return {
+            url: response.previewUrl,
+            fileUrl: response.fileUrl,
+            name: response.fileName,
+          };
         }
-        return { url, name };
+        return { url, name, fileUrl };
       });
       // console.log({
       //   res,
@@ -682,9 +691,10 @@ export default {
       // });
     },
     handleOnUploadRemove(file, fileList) {
-      this.form.imgList = fileList.map(({ url, name }) => ({
+      this.form.imgList = fileList.map(({ url, fileUrl, name }) => ({
         url,
         name,
+        fileUrl,
       }));
       // console.log({ file, fileList, form: this.form });
     },