From 07571aaad1e920b5f9824e0475c8f156e53fd541 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 22 Jul 2025 13:42:07 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=20=E7=94=BB=E5=B8=83=E6=95=B0=E6=8D=AE=20?=
 =?UTF-8?q?=E5=9B=9E=E5=8F=82=E5=A4=84=E7=90=86=E4=B8=8D=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84minio=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/UserLikeGroupServiceImpl.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 0cd58cd7..42aadcf2 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -919,7 +919,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                         String type = jsonObjectLevel1.getString("type");
                         if (type.equals("image")) {
                             String minioUrl = jsonObjectLevel1.getString("minioUrl");
-                            jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                            if (!StringUtil.isNullOrEmpty(minioUrl)) jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
                         }
                         if (type.equals("group")) {
                             JSONArray objectJSONArrayLevel2 = jsonObjectLevel1.getJSONArray("objects");
@@ -934,7 +934,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                             }
                             jsonObjectLevel1.put("objects", objectJSONArrayLevel2);
                         }
-                        if (type.equals("rect")) {
+                        /*if (type.equals("rect")) {
                             JSONObject custom = jsonObjectLevel1.getJSONObject("custom");
                             if (custom.getString("type").equals("init")) {
                                 String minioUrl = jsonObjectLevel1.getString("minioUrl");
@@ -944,7 +944,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                     jsonObjectLevel1.put("fill", fill);
                                 }
                             }
-                        }
+                        }*/
                         objectJSONArrayLevel1.set(i, jsonObjectLevel1);
                     }
                     canvas.put("objects", objectJSONArrayLevel1);
@@ -956,7 +956,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                         String type = jsonObjectLevel1.getString("type");
                         if (type.equals("image")) {
                             String minioUrl = jsonObjectLevel1.getString("minioUrl");
-                            jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                            if (!StringUtil.isNullOrEmpty(minioUrl)) jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
                         }
                         if (type.equals("group")) {
                             JSONArray objectJSONArrayLevel2 = jsonObjectLevel1.getJSONArray("objects");
@@ -971,7 +971,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                             }
                             jsonObjectLevel1.put("objects", objectJSONArrayLevel2);
                         }
-                        if (type.equals("rect")) {
+                        /*if (type.equals("rect")) {
                             JSONObject custom = jsonObjectLevel1.getJSONObject("custom");
                             if (custom.getString("type").equals("init")) {
                                 String minioUrl = jsonObjectLevel1.getString("minioUrl");
@@ -981,13 +981,14 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                     jsonObjectLevel1.put("fill", fill);
                                 }
                             }
-                        }
+                        }*/
                         objectJSONArrayLevel1.set(i, jsonObjectLevel1);
                     }
                     jsonObject.put("objects", objectJSONArrayLevel1);
                 }
                 return jsonObject;
             }catch (Exception e){
+                log.error(e.getMessage());
                 return null;
             }
         }else {